Skip to content

Commit 37021cd

Browse files
StephenBonikowskyzhenlan
StephenBonikowsky
authored and
zhenlan
committed
Adding support for net 4.6.1
1 parent 7873693 commit 37021cd

File tree

14 files changed

+37
-15
lines changed

14 files changed

+37
-15
lines changed

‎src/System.ServiceModel.Duplex/pkg/System.ServiceModel.Duplex.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.ServiceModel.Duplex.csproj">
6-
<SupportedFramework>netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
6+
<SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
77
</ProjectReference>
88
<ProjectReference Include="..\src\System.ServiceModel.Duplex.builds" />
99
<HarvestIncludePaths Include="ref/netcore50;lib/netcore50" />

‎src/System.ServiceModel.Http/pkg/System.ServiceModel.Http.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.ServiceModel.Http.csproj">
6-
<SupportedFramework>netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
6+
<SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
77
</ProjectReference>
88
<ProjectReference Include="..\src\System.ServiceModel.Http.builds" />
99
<HarvestIncludePaths Include="ref/netcore50;lib/netcore50" />

‎src/System.ServiceModel.Http/src/System.ServiceModel.Http.builds‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
44
<ItemGroup>
55
<Project Include="System.ServiceModel.Http.csproj" />
6+
<Project Include="System.ServiceModel.Http.csproj">
7+
<TargetGroup>net461</TargetGroup>
8+
</Project>
69
</ItemGroup>
710
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
811
</Project>

‎src/System.ServiceModel.Http/src/System.ServiceModel.Http.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" />
1414
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
1515
<ItemGroup>
16-
<TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net46'" />
17-
<TargetingPackReference Include="System.ServiceModel" Condition="'$(TargetGroup)' == 'net46'" />
18-
<ProjectReference Include="$(SourceDir)System.Private.ServiceModel\src\System.Private.ServiceModel.csproj" Condition="'$(TargetGroup)' != 'net46'">
16+
<TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net461'" />
17+
<TargetingPackReference Include="System.ServiceModel" Condition="'$(TargetGroup)' == 'net461'" />
18+
<ProjectReference Include="$(SourceDir)System.Private.ServiceModel\src\System.Private.ServiceModel.csproj" Condition="'$(TargetGroup)' != 'net461'">
1919
<AdditionalProperties>OSGroup=Windows_NT</AdditionalProperties>
2020
</ProjectReference>
2121
</ItemGroup>

‎src/System.ServiceModel.Http/src/project.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
"System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
88
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
99
}
10+
},
11+
"net461": {
12+
"dependencies": {
13+
"Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1"
14+
}
1015
}
1116
}
1217
}

‎src/System.ServiceModel.NetTcp/pkg/System.ServiceModel.NetTcp.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.ServiceModel.NetTcp.csproj">
6-
<SupportedFramework>netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
6+
<SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
77
</ProjectReference>
88
<ProjectReference Include="..\src\System.ServiceModel.NetTcp.builds" />
99
<HarvestIncludePaths Include="ref/netcore50;lib/netcore50" />

‎src/System.ServiceModel.NetTcp/src/System.ServiceModel.NetTcp.builds‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
44
<ItemGroup>
5+
<Project Include="System.ServiceModel.NetTcp.csproj" />
56
<Project Include="System.ServiceModel.NetTcp.csproj">
7+
<TargetGroup>net461</TargetGroup>
68
</Project>
79
</ItemGroup>
810
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />

‎src/System.ServiceModel.NetTcp/src/System.ServiceModel.NetTcp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" />
1414
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
1515
<ItemGroup>
16-
<TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net46'" />
17-
<TargetingPackReference Include="System.ServiceModel" Condition="'$(TargetGroup)' == 'net46'" />
18-
<ProjectReference Include="$(SourceDir)System.Private.ServiceModel\src\System.Private.ServiceModel.csproj" Condition="'$(TargetGroup)' != 'net46'">
16+
<TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net461'" />
17+
<TargetingPackReference Include="System.ServiceModel" Condition="'$(TargetGroup)' == 'net461'" />
18+
<ProjectReference Include="$(SourceDir)System.Private.ServiceModel\src\System.Private.ServiceModel.csproj" Condition="'$(TargetGroup)' != 'net461'">
1919
<AdditionalProperties>OSGroup=Windows_NT</AdditionalProperties>
2020
</ProjectReference>
2121
</ItemGroup>

‎src/System.ServiceModel.NetTcp/src/project.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
"System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
88
"System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
99
}
10+
},
11+
"net461": {
12+
"dependencies": {
13+
"Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1"
14+
}
1015
}
1116
}
1217
}

‎src/System.ServiceModel.Primitives/pkg/System.ServiceModel.Primitives.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.ServiceModel.Primitives.csproj">
6-
<SupportedFramework>netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
6+
<SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
77
</ProjectReference>
88
<ProjectReference Include="..\src\System.ServiceModel.Primitives.builds" />
99
<HarvestIncludePaths Include="ref/netcore50;lib/netcore50" />

0 commit comments

Comments
 (0)