Просмотр исходного кода

Revert "Simplify building ref assemblies."

This reverts commit a6a0768b8784bd269ef6b00fadc5422b18802502.
Oren Novotny 6 лет назад
Родитель
Сommit
5456436f7c

+ 0 - 2
Ix.NET/Source/Directory.build.props

@@ -17,8 +17,6 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <LangVersion>latest</LangVersion>
     <LangVersion>latest</LangVersion>
-    <Deterministic>true</Deterministic>
-    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
   </PropertyGroup>
   </PropertyGroup>
 
 
   <!-- Hack needed to make code coverage work. See https://github.com/Microsoft/vstest/issues/1748. -->
   <!-- Hack needed to make code coverage work. See https://github.com/Microsoft/vstest/issues/1748. -->

+ 2 - 1
Ix.NET/Source/System.Interactive.Providers/System.Interactive.Providers.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 
 
   <PropertyGroup>
   <PropertyGroup>
     <Description>Interactive Extensions Providers Library used to build query providers and express queries over enumerable sequences.</Description>
     <Description>Interactive Extensions Providers Library used to build query providers and express queries over enumerable sequences.</Description>
@@ -13,6 +13,7 @@
 
 
   <ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Interactive\System.Interactive.csproj" />
     <ProjectReference Include="..\System.Interactive\System.Interactive.csproj" />
+    <ReferenceAssemblyProjectReference Include="..\refs\System.Interactive.Providers.Ref\System.Interactive.Providers.Ref.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">

+ 4 - 1
Ix.NET/Source/System.Interactive/System.Interactive.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 
 
   <PropertyGroup>
   <PropertyGroup>
     <Description>Interactive Extensions Main Library used to express queries over enumerable sequences.</Description>
     <Description>Interactive Extensions Main Library used to express queries over enumerable sequences.</Description>
@@ -10,6 +10,9 @@
 
 
   <ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\System.Interactive.rd.xml" />
     <EmbeddedResource Include="Properties\System.Interactive.rd.xml" />
+    <ReferenceAssemblyProjectReference Include="..\refs\System.Interactive.Ref\System.Interactive.Ref.csproj" />
   </ItemGroup>
   </ItemGroup>
+
+
   
   
 </Project>
 </Project>

+ 5 - 0
Ix.NET/Source/global.json

@@ -0,0 +1,5 @@
+{
+  "msbuild-sdks": {
+    "MSBuild.Sdk.Extras": "1.6.55"
+  }
+}

+ 11 - 0
Ix.NET/Source/refs/Directory.build.props

@@ -0,0 +1,11 @@
+<Project>  
+  
+  <Import Project="..\Directory.Build.props" />
+  
+  <PropertyGroup>
+    <!-- This is here so we can create a fake .NET Standard 2.1 facade -->
+    <NETStandardMaximumVersion>2.1</NETStandardMaximumVersion>
+    <DefineConstants>$(DefineConstants);REFERENCE_ASSEMBLY</DefineConstants>
+  </PropertyGroup>
+
+</Project>

+ 19 - 0
Ix.NET/Source/refs/System.Interactive.Async.Providers.Ref/System.Interactive.Async.Providers.Ref.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <Description>Interactive Extensions Async Providers Library used to build query providers and express queries over enumerable sequences.</Description>
+    <AssemblyTitle>Interactive Extensions - Async Providers Library</AssemblyTitle>
+    <TargetFrameworks>netcoreapp2.0;netstandard2.1</TargetFrameworks>
+    <PackageTags>Ix;Interactive;Extensions;Enumerable;Asynchronous</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\System.Interactive.Async.Providers\**\*.cs" Exclude="..\..\System.Interactive.Async.Providers\obj\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\System.Interactive.Async.Ref\System.Interactive.Async.Ref.csproj" />
+    <ProjectReference Include="..\System.Linq.Async.Queryable.Ref\System.Linq.Async.Queryable.Ref.csproj" />
+  </ItemGroup>
+
+</Project>

+ 23 - 0
Ix.NET/Source/refs/System.Interactive.Async.Ref/System.Interactive.Async.Ref.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <Description>Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.</Description>
+    <AssemblyTitle>Interactive Extensions - Async Library</AssemblyTitle>
+    <Authors>Microsoft</Authors>
+    <TargetFrameworks>netcoreapp2.0;netstandard2.1</TargetFrameworks>
+    <PackageTags>Ix;Interactive;Extensions;Enumerable;Asynchronous</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\System.Interactive.Async\**\*.cs" Exclude="..\..\System.Interactive.Async\obj\**" />
+    <Compile Include="..\..\System.Linq.Async\System\Error.cs" Link="System\Error.cs" />
+    <Compile Include="..\..\System.Linq.Async\System\Linq\AsyncIterator.cs" Link="System\Linq\AsyncIterator.cs" />
+    <Compile Include="..\..\System.Linq.Async\System\Linq\Set.cs" Link="System\Linq\Set.cs" />
+    <Compile Include="..\..\System.Linq.Async\System\Strings.cs" Link="System\Strings.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\System.Linq.Async.Ref\System.Linq.Async.Ref.csproj" />
+  </ItemGroup>
+  
+</Project>

+ 23 - 0
Ix.NET/Source/refs/System.Interactive.Providers.Ref/System.Interactive.Providers.Ref.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <Description>Interactive Extensions Providers Library used to build query providers and express queries over enumerable sequences.</Description>
+    <AssemblyTitle>Interactive Extensions - Providers Library</AssemblyTitle>
+    <TargetFrameworks>netstandard1.0;netcoreapp2.0;netstandard2.1</TargetFrameworks>
+    <PackageTags>Ix;Interactive;Extensions;Enumerable</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\System.Interactive.Ref\System.Interactive.Ref.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\System.Interactive.Providers\**\*.cs" Exclude="..\..\System.Interactive.Providers\obj\**" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
+    <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
+  </ItemGroup>
+
+
+</Project>

+ 15 - 0
Ix.NET/Source/refs/System.Interactive.Ref/System.Interactive.Ref.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <Description>Interactive Extensions Main Library used to express queries over enumerable sequences.</Description>
+    <AssemblyTitle>Interactive Extensions - Main Library</AssemblyTitle>
+    <Authors>Microsoft</Authors>
+    <TargetFrameworks>netstandard1.0;netcoreapp2.0;netstandard2.1</TargetFrameworks>
+    <PackageTags>Ix;Interactive;Extensions;Enumerable</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\System.Interactive\**\*.cs" Exclude="..\..\System.Interactive\obj\**" />
+  </ItemGroup>
+  
+</Project>

+ 23 - 0
Ix.NET/Source/refs/System.Linq.Async.Queryable.Ref/System.Linq.Async.Queryable.Ref.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <Description>LINQ Standard Query Operators used to express queries over asynchronous enumerable sequences.</Description>
+    <AssemblyTitle>System.Linq.Async.Queryable</AssemblyTitle>
+    <Authors>Microsoft</Authors>
+    <TargetFrameworks>netstandard1.0;netcoreapp2.0;netstandard2.1</TargetFrameworks>
+    <PackageTags>Enumerable;Asynchronous;LINQ</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\System.Linq.Async.Ref\System.Linq.Async.Ref.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\System.Linq.Async.Queryable\**\*.cs" Exclude="..\..\System.Linq.Async.Queryable\obj\**" />
+  </ItemGroup>
+  
+</Project>

+ 19 - 0
Ix.NET/Source/refs/System.Linq.Async.Ref/System.Linq.Async.Ref.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <Description>LINQ Standard Query Operators used to express queries over asynchronous enumerable sequences.</Description>
+    <AssemblyTitle>System.Linq.Async</AssemblyTitle>
+    <Authors>Microsoft</Authors>
+    <TargetFrameworks>netstandard1.0;netcoreapp2.0;netstandard2.1</TargetFrameworks>
+    <PackageTags>Enumerable;Asynchronous;LINQ</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\System.Linq.Async\**\*.cs" Exclude="..\..\System.Linq.Async\obj\**" />
+  </ItemGroup>
+  
+</Project>