Ver código fonte

Update csproj to match file -> new project version

Oren Novotny 9 anos atrás
pai
commit
5090cbe1b7
19 arquivos alterados com 40 adições e 37 exclusões
  1. 2 2
      Ix.NET/Source/System.Interactive.Async.Providers/System.Interactive.Async.Providers.xproj
  2. 2 2
      Ix.NET/Source/System.Interactive.Async/System.Interactive.Async.xproj
  3. 2 2
      Ix.NET/Source/System.Interactive.Providers/System.Interactive.Providers.xproj
  4. 2 2
      Ix.NET/Source/System.Interactive/System.Interactive.xproj
  5. 2 2
      Ix.NET/Source/Tests/System.Interactive.Tests.xproj
  6. 2 2
      Rx.NET/Source/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.xproj
  7. 2 2
      Rx.NET/Source/System.Reactive.Core/System.Reactive.Core.xproj
  8. 2 2
      Rx.NET/Source/System.Reactive.Experimental/System.Reactive.Experimental.xproj
  9. 2 2
      Rx.NET/Source/System.Reactive.Interfaces/System.Reactive.Interfaces.xproj
  10. 2 2
      Rx.NET/Source/System.Reactive.Linq/System.Reactive.Linq.xproj
  11. 2 2
      Rx.NET/Source/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.xproj
  12. 2 2
      Rx.NET/Source/System.Reactive.PlatformServices/System.Reactive.PlatformServices.xproj
  13. 2 2
      Rx.NET/Source/System.Reactive.Providers/System.Reactive.Providers.xproj
  14. 2 2
      Rx.NET/Source/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.xproj
  15. 2 2
      Rx.NET/Source/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.xproj
  16. 2 2
      Rx.NET/Source/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.xproj
  17. 2 2
      Rx.NET/Source/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.xproj
  18. 2 2
      Rx.NET/Source/Tests.System.Reactive/Tests.System.Reactive.xproj
  19. 4 1
      Rx.NET/Source/global.json

+ 2 - 2
Ix.NET/Source/System.Interactive.Async.Providers/System.Interactive.Async.Providers.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>33691bb5-dd5b-4fed-8ee3-52cee0de2550</ProjectGuid>
     <RootNamespace>System.Linq</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

+ 2 - 2
Ix.NET/Source/System.Interactive.Async/System.Interactive.Async.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>a9f6d09b-15b9-4ce8-867f-6f3383c5f247</ProjectGuid>
     <RootNamespace>System.Linq</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

+ 2 - 2
Ix.NET/Source/System.Interactive.Providers/System.Interactive.Providers.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>ca7b7136-13ee-4f01-bc22-722875ee8569</ProjectGuid>
     <RootNamespace>System.Linq</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

+ 2 - 2
Ix.NET/Source/System.Interactive/System.Interactive.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>ff97cd0f-8108-4b66-8a34-42190b459180</ProjectGuid>
     <RootNamespace>System.Linq</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

+ 2 - 2
Ix.NET/Source/Tests/System.Interactive.Tests.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>592e774e-d5be-44c5-9e4d-e096bec01552</ProjectGuid>
     <RootNamespace>System.Linq</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

+ 2 - 2
Rx.NET/Source/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>a0fa7fb5-bc2b-4e9f-9807-40bc26894ad5</ProjectGuid>
     <RootNamespace>Microsoft.Reactive.Testing</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.Core/System.Reactive.Core.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>fda62c35-4174-44b0-bebe-61e80b2515ba</ProjectGuid>
     <RootNamespace>System.Reactive</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.Experimental/System.Reactive.Experimental.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>fb2db31d-fcfa-45ce-a3a8-7b7c14ecd77a</ProjectGuid>
     <RootNamespace>System.Reactive.Experimental</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.Interfaces/System.Reactive.Interfaces.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>430061b8-8504-483f-a532-ceb69ff04128</ProjectGuid>
     <RootNamespace>System.Reactive</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.Linq/System.Reactive.Linq.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>a5508ff0-93b9-4241-b666-07b05189c435</ProjectGuid>
     <RootNamespace>System.Reactive</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>5965a929-c3e5-42ad-8328-3641f8967e72</ProjectGuid>
     <RootNamespace>System.Reactive.Observable.Aliases</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.PlatformServices/System.Reactive.PlatformServices.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>7dd3dda0-0b73-4a7f-acaf-15111ac2eb93</ProjectGuid>
     <RootNamespace>System.Reactive.PlatformServices</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.Providers/System.Reactive.Providers.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>845e4fbf-a6c0-4870-9d1a-c832e262d956</ProjectGuid>
     <RootNamespace>System.Reactive.Observable.Aliases</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>a22f3131-6d20-4d67-9a9f-314fe3691ea1</ProjectGuid>
     <RootNamespace>System.Reactive.Observable.Aliases</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>c17d3bd1-222f-4dcc-bbf8-44a04399701b</ProjectGuid>
     <RootNamespace>System.Reactive</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>c18c6fe5-7408-4f3b-b562-7a563e01701e</ProjectGuid>
     <RootNamespace>System.Reactive</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>4b697be9-1d48-4855-9070-c9c5c3bd341c</ProjectGuid>
     <RootNamespace>System.Reactive</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 2 - 2
Rx.NET/Source/Tests.System.Reactive/Tests.System.Reactive.xproj

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>78c7dad3-d706-4d0a-a4f9-5c7ea1cb9d6d</ProjectGuid>
     <RootNamespace>System.Reactive</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

+ 4 - 1
Rx.NET/Source/global.json

@@ -1,3 +1,6 @@
 {
-    "sources": [ ".", "Tests.System.Reactive" ]
+    "sources": [ ".", "Tests.System.Reactive" ],
+    "sdk": {
+      "version": "1.0.0-preview1-002702"
+  }
 }