Merge pull request #5318 from mellinoe/x509-netcore50

Add netcore50 configuration for X509Certificates
dotnet · Jan 12, 2016 · ee0d021 · ee0d021
2 parents 39f94ef + 0a18373
commit ee0d021
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/...ty.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.builds b/...ty.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.builds
@@ -11,6 +11,10 @@
     <Project Include="System.Security.Cryptography.X509Certificates.csproj">
       <OSGroup>Windows_NT</OSGroup>
     </Project>
+    <Project Include="System.Security.Cryptography.X509Certificates.csproj">
+      <TargetGroup>netcore50</TargetGroup>
+      <OSGroup>Windows_NT</OSGroup>
+    </Project>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/...ty.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/...ty.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
@@ -16,6 +16,10 @@
     <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
     <UsePackageTargetRuntimeDefaults>true</UsePackageTargetRuntimeDefaults>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetGroup)' == 'netcore50' and '$(ProjectJson)' == '' ">
+    <ProjectJson>netcore50\project.json</ProjectJson>
+    <ProjectLockJson>netcore50\project.lock.json</ProjectLockJson>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' and '$(ProjectJson)' == '' ">
     <ProjectJson>win\project.json</ProjectJson>
     <ProjectLockJson>win\project.lock.json</ProjectLockJson>
@@ -30,6 +34,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'OSX_Release|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50_Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50_Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(TargetGroup)' == 'netcore50'">
+    <DefineConstants>$(DefineConstants);NETNATIVE</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Internal\Cryptography\ICertificatePal.cs" />
     <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleCache.cs">

diff --git a/src/System.Security.Cryptography.X509Certificates/src/netcore50/project.json b/src/System.Security.Cryptography.X509Certificates/src/netcore50/project.json
@@ -0,0 +1,21 @@
+{
+  "dependencies": {
+    "System.Collections": "4.0.10",
+    "System.Diagnostics.Contracts": "4.0.0",
+    "System.Diagnostics.Debug": "4.0.10",
+    "System.Globalization.Calendars": "4.0.0",
+    "System.IO.FileSystem": "4.0.0",
+    "System.IO.FileSystem.Watcher": "4.0.0-rc2-23616",
+    "System.Resources.ResourceManager": "4.0.0",
+    "System.Runtime": "4.0.20",
+    "System.Runtime.InteropServices": "4.0.20",
+    "System.Runtime.Numerics": "4.0.0",
+    "System.Security.Cryptography.Cng": "4.0.0-rc2-23616",
+    "System.Security.Cryptography.Encoding": "4.0.0-rc2-23616",
+    "System.Text.Encoding": "4.0.10",
+    "System.Threading": "4.0.10"
+  },
+  "frameworks": {
+    "netcore50": {}
+  }
+}