summary refs log tree commit diff
path: root/crypto
diff options
context:
space:
mode:
authorOren Novotny <oren@novotny.org>2016-06-24 18:04:21 -0400
committerOren Novotny <oren@novotny.org>2016-06-24 18:04:21 -0400
commit70bdc86b4c2179b6f369b301686922fd1d83181c (patch)
tree1de7c78ce909ac4c661c8a6f98f9b88071a22a9a /crypto
parentupdate gv cfg (diff)
downloadBouncyCastle.NET-ed25519-70bdc86b4c2179b6f369b301686922fd1d83181c.tar.xz
Convert projects to support .NET Standard
Diffstat (limited to 'crypto')
-rw-r--r--crypto/crypto.dotnet.csproj3
-rw-r--r--crypto/crypto.dotnet.project.json10
-rw-r--r--crypto/crypto.pcl.csproj1
-rw-r--r--crypto/crypto.pcl.project.json8
-rw-r--r--crypto/crypto.pcl2.csproj11
5 files changed, 21 insertions, 12 deletions
diff --git a/crypto/crypto.dotnet.csproj b/crypto/crypto.dotnet.csproj
index d9ae0db87..01ca8c040 100644
--- a/crypto/crypto.dotnet.csproj
+++ b/crypto/crypto.dotnet.csproj
@@ -77,8 +77,7 @@
     <NuSpecFile Include="$(SolutionDir)Portable.BouncyCastle.nuspec" />
   </ItemGroup>
   <PropertyGroup>
-    <!-- dotnet, uap10.0 & net46 tfms -->
-    <NuSpecTfm>dotnet;uap10.0;net46</NuSpecTfm>
+    <NuSpecTfm>netstandard1.3</NuSpecTfm>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\BouncyCastle.snk">
diff --git a/crypto/crypto.dotnet.project.json b/crypto/crypto.dotnet.project.json
index e80002612..ccb405db7 100644
--- a/crypto/crypto.dotnet.project.json
+++ b/crypto/crypto.dotnet.project.json
@@ -1,16 +1,12 @@
 {
   "supports": {
-    "net46.app": {},
-    "uwp.10.0.app": {},
-    "dnxcore50.app": {}
   },
   "dependencies": {
-    "Microsoft.NETCore": "5.0.0",
-    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
-    "NuSpec.ReferenceGenerator": "1.3.4"
+    "NETStandard.Library": "1.6.0",
+    "NuSpec.ReferenceGenerator": "2.0.0-beta-bld14"
   },
   "frameworks": {
-    "dotnet": {
+    "netstandard1.3": {
       "imports": "portable-net452+win81"
     }
   }
diff --git a/crypto/crypto.pcl.csproj b/crypto/crypto.pcl.csproj
index 1c3735177..89654816a 100644
--- a/crypto/crypto.pcl.csproj
+++ b/crypto/crypto.pcl.csproj
@@ -97,6 +97,7 @@
     <None Include="..\BouncyCastle.snk">
       <Link>BouncyCastle.snk</Link>
     </None>
+    <None Include="crypto.pcl.project.json" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <PropertyGroup>
diff --git a/crypto/crypto.pcl.project.json b/crypto/crypto.pcl.project.json
new file mode 100644
index 000000000..de46fc898
--- /dev/null
+++ b/crypto/crypto.pcl.project.json
@@ -0,0 +1,8 @@
+{
+  "supports": {},
+  "dependencies": {
+  },
+  "frameworks": {
+    ".NETPortable,Version=v4.0,Profile=Profile328": {}
+  }
+}
\ No newline at end of file
diff --git a/crypto/crypto.pcl2.csproj b/crypto/crypto.pcl2.csproj
index 4edf1139e..84d5e559a 100644
--- a/crypto/crypto.pcl2.csproj
+++ b/crypto/crypto.pcl2.csproj
@@ -19,10 +19,11 @@
     <RootNamespace>crypto</RootNamespace>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject />
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -71,6 +72,9 @@
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
+  <PropertyGroup>
+    <NuSpecTfm>netstandard1.0</NuSpecTfm>
+  </PropertyGroup>
   <ItemGroup>
     <!-- NuSpec file must be specified as name does not match dll name -->
     <NuSpecFile Include="$(SolutionDir)Portable.BouncyCastle.nuspec" />
@@ -83,6 +87,7 @@
     <None Include="..\BouncyCastle.snk">
       <Link>BouncyCastle.snk</Link>
     </None>
+    <None Include="crypto.pcl2.project.json" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <PropertyGroup>