Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit ef8ed75

Browse files
pakrympakrym
authored
Cross compile Pipelines and retarget ref to netstandard1.1 (#27166)
Cross compile Pipelines and retarget ref to netstandard1.1
1 parent e153e40 commit ef8ed75

File tree

8 files changed

+37
-13
lines changed

8 files changed

+37
-13
lines changed

‎src/System.IO.Pipelines/System.IO.Pipelines.sln‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.27325.3006
2+
# Visual Studio 14
3+
VisualStudioVersion = 14.0.25420.1
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipelines.Tests", "tests\System.IO.Pipelines.Tests.csproj", "{9E984EB2-827E-4029-9647-FB5F8B67C553}"
66
ProjectSection(ProjectDependencies) = postProject
@@ -26,10 +26,14 @@ Global
2626
Release|Any CPU = Release|Any CPU
2727
EndGlobalSection
2828
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29-
{9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
30-
{9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
31-
{9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
32-
{9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
29+
{9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
30+
{9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
31+
{9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
32+
{9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
33+
{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
34+
{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
35+
{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
36+
{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
3337
{9C524CA0-92FF-437B-B568-BCE8A794A69A}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
3438
{9C524CA0-92FF-437B-B568-BCE8A794A69A}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
3539
{9C524CA0-92FF-437B-B568-BCE8A794A69A}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
@@ -43,7 +47,4 @@ Global
4347
{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
4448
{9C524CA0-92FF-437B-B568-BCE8A794A69A} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
4549
EndGlobalSection
46-
GlobalSection(ExtensibilityGlobals) = postSolution
47-
SolutionGuid = {895BDE3D-0E51-485D-908E-16FB1A74FA64}
48-
EndGlobalSection
4950
EndGlobal

‎src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
44
<ItemGroup>
55
<ProjectReference Include="..\ref\System.IO.Pipelines.csproj">
6-
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
6+
<SupportedFramework>wpa81;net45;netcoreapp1.0;netcore45;$(AllXamarinFrameworks)</SupportedFramework>
77
</ProjectReference>
88
<ProjectReference Include="..\src\System.IO.Pipelines.csproj" />
99
</ItemGroup>

‎src/System.IO.Pipelines/ref/Configurations.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4+
<PackageConfigurations>
5+
netstandard1.1;
6+
</PackageConfigurations>
47
<BuildConfigurations>
8+
$(PackageConfigurations);
59
netstandard;
610
</BuildConfigurations>
711
</PropertyGroup>

‎src/System.IO.Pipelines/ref/System.IO.Pipelines.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,18 @@
66
</PropertyGroup>
77
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
88
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Debug|AnyCPU'" />
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Release|AnyCPU'" />
911
<ItemGroup>
1012
<Compile Include="System.IO.Pipelines.cs" />
1113
</ItemGroup>
12-
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
14+
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.1'">
15+
<Reference Include="System.Runtime" />
16+
<Reference Include="System.Threading.Tasks" />
17+
</ItemGroup>
18+
<ItemGroup>
1319
<ProjectReference Include="..\..\System.Memory\ref\System.Memory.csproj" />
1420
<ProjectReference Include="..\..\System.Buffers\ref\System.Buffers.csproj" />
1521
</ItemGroup>
1622
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
17-
</Project>
23+
</Project>

‎src/System.IO.Pipelines/src/Configurations.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<BuildConfigurations>
5+
netstandard1.1;
56
netstandard;
67
netcoreapp;
78
</BuildConfigurations>

‎src/System.IO.Pipelines/src/System.IO.Pipelines.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<ProjectGuid>{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}</ProjectGuid>
66
<DocumentationFile>$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile>
77
</PropertyGroup>
8+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Debug|AnyCPU'" />
13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Release|AnyCPU'" />
814
<ItemGroup>
915
<Compile Include="Properties\InternalsVisibleTo.cs" />
1016
<Compile Include="System\IO\Pipelines\BufferSegment.cs" />
@@ -48,7 +54,7 @@
4854
<Reference Include="System.Runtime.Extensions" />
4955
<Reference Include="System.Threading" />
5056
<Reference Include="System.Threading.Tasks" />
51-
<Reference Include="System.Threading.ThreadPool" />
57+
<Reference Include="System.Threading.ThreadPool" Condition="'$(TargetGroup)' != 'netstandard1.1'" />
5258
</ItemGroup>
5359
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
5460
</Project>

‎src/System.IO.Pipelines/tests/Configurations.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<PropertyGroup>
44
<BuildConfigurations>
55
netcoreapp;
6+
netfx-Windows_NT;
7+
uap-Windows_NT;
68
</BuildConfigurations>
79
</PropertyGroup>
810
</Project>

‎src/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
</PropertyGroup>
77
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
88
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" />
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
913
<ItemGroup>
1014
<Compile Include="BackpressureTests.cs" />
1115
<Compile Include="FlushAsyncCancellationTests.cs" />

0 commit comments

Comments
 (0)