Including Security and Duplex for net461 support.

dotnet · May 11, 2017 · 37b15e3 · 37b15e3
1 parent 37021cd
commit 37b15e3
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 14 deletions.
diff --git a/src/System.ServiceModel.Duplex/src/System.ServiceModel.Duplex.builds b/src/System.ServiceModel.Duplex/src/System.ServiceModel.Duplex.builds
@@ -3,6 +3,9 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <Project Include="System.ServiceModel.Duplex.csproj" />
+    <Project Include="System.ServiceModel.Duplex.csproj">
+      <TargetGroup>net461</TargetGroup>
+    </Project>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>
diff --git a/src/System.ServiceModel.Duplex/src/System.ServiceModel.Duplex.csproj b/src/System.ServiceModel.Duplex/src/System.ServiceModel.Duplex.csproj
@@ -10,10 +10,12 @@
   <!-- Help VS understand available configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" />
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)System.Private.ServiceModel\src\System.Private.ServiceModel.csproj">
+    <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net461'" />
+    <TargetingPackReference Include="System.ServiceModel" Condition="'$(TargetGroup)' == 'net461'" />
+    <ProjectReference Include="$(SourceDir)System.Private.ServiceModel\src\System.Private.ServiceModel.csproj" Condition="'$(TargetGroup)' != 'net461'">
       <AdditionalProperties>OSGroup=Windows_NT</AdditionalProperties>
     </ProjectReference>
   </ItemGroup>

diff --git a/src/System.ServiceModel.Duplex/src/project.json b/src/System.ServiceModel.Duplex/src/project.json
@@ -7,6 +7,11 @@
         "System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
+    },
+    "net461": {
+      "dependencies": {
+        "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1"
+      }
     }
   }
 }
diff --git a/src/System.ServiceModel.Http/src/System.ServiceModel.Http.csproj b/src/System.ServiceModel.Http/src/System.ServiceModel.Http.csproj
@@ -10,8 +10,8 @@
   <!-- Help VS understand available configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" />
   <ItemGroup>
     <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net461'" />
     <TargetingPackReference Include="System.ServiceModel" Condition="'$(TargetGroup)' == 'net461'" />

diff --git a/src/System.ServiceModel.NetTcp/src/System.ServiceModel.NetTcp.csproj b/src/System.ServiceModel.NetTcp/src/System.ServiceModel.NetTcp.csproj
@@ -10,8 +10,8 @@
   <!-- Help VS understand available configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" />
   <ItemGroup>
     <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net461'" />
     <TargetingPackReference Include="System.ServiceModel" Condition="'$(TargetGroup)' == 'net461'" />

diff --git a/src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj b/src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj
@@ -10,8 +10,8 @@
   <!-- Help VS understand available configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" />
   <ItemGroup>
     <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net46'" />
     <TargetingPackReference Include="System.IdentityModel" Condition="'$(TargetGroup)' == 'net461'" />

diff --git a/src/System.ServiceModel.Security/src/System.ServiceModel.Security.builds b/src/System.ServiceModel.Security/src/System.ServiceModel.Security.builds
@@ -3,6 +3,9 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <Project Include="System.ServiceModel.Security.csproj" />
+    <Project Include="System.ServiceModel.Security.csproj">
+      <TargetGroup>net461</TargetGroup>
+    </Project>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>
diff --git a/src/System.ServiceModel.Security/src/System.ServiceModel.Security.csproj b/src/System.ServiceModel.Security/src/System.ServiceModel.Security.csproj
@@ -10,12 +10,12 @@
   <!-- Help VS understand available configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461_Release|AnyCPU'" />
   <ItemGroup>
-    <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net46'" />
-    <TargetingPackReference Include="System.ServiceModel" Condition="'$(TargetGroup)' == 'net46'" />
-    <ProjectReference Include="$(SourceDir)System.Private.ServiceModel\src\System.Private.ServiceModel.csproj" Condition="'$(TargetGroup)' != 'net46'">
+    <TargetingPackReference Include="mscorlib" Condition="'$(TargetGroup)' == 'net461'" />
+    <TargetingPackReference Include="System.ServiceModel" Condition="'$(TargetGroup)' == 'net461'" />
+    <ProjectReference Include="$(SourceDir)System.Private.ServiceModel\src\System.Private.ServiceModel.csproj" Condition="'$(TargetGroup)' != 'net461'">
       <AdditionalProperties>OSGroup=Windows_NT</AdditionalProperties>
     </ProjectReference>
   </ItemGroup>

diff --git a/src/System.ServiceModel.Security/src/project.json b/src/System.ServiceModel.Security/src/project.json
@@ -7,6 +7,11 @@
         "System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
+    },
+    "net461": {
+      "dependencies": {
+        "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1"
+      }
     }
   }
 }