change BouncyCastle.NetCore to Portable.BouncyCastle

nissl-lab · Mar 30, 2020 · 1dbd3d0 · 1dbd3d0
1 parent 5d7e25d
commit 1dbd3d0
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 37 deletions.
diff --git a/OpenXmlFormats/NPOI.OpenXmlFormats.csproj b/OpenXmlFormats/NPOI.OpenXmlFormats.csproj
@@ -35,8 +35,8 @@
     </TargetFrameworkProfile>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>npoi.snk</AssemblyOriginatorKeyFile>
-	<PackageId>NPOI</PackageId>
-	<RepositoryUrl>https://github.com/tonyqus/npoi</RepositoryUrl>	
+    <PackageId>NPOI</PackageId>
+    <RepositoryUrl>https://github.com/tonyqus/npoi</RepositoryUrl>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -297,6 +297,7 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="npoi.snk" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\openxml4Net\NPOI.OpenXml4Net.csproj">

diff --git a/OpenXmlFormats/packages.config b/OpenXmlFormats/packages.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+</packages>
diff --git a/main/NPOI.Core.csproj b/main/NPOI.Core.csproj
@@ -8,31 +8,18 @@
 	<SignAssembly>true</SignAssembly>
 	<AssemblyOriginatorKeyFile>npoi.snk</AssemblyOriginatorKeyFile>
 	<PackageId>NPOI</PackageId>
-	<RepositoryUrl>https://github.com/tonyqus/npoi</RepositoryUrl>	
+	<RepositoryUrl>https://github.com/tonyqus/npoi</RepositoryUrl>
+  <OutputPath>..\solution\Lib</OutputPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>D:\github\npoi\main\NPOI.xml</DocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\solution\Lib</OutputPath>
-    <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Resources\font_metrics.properties" />
-    <None Remove="Resources\functionMetadata.txt" />
-  </ItemGroup>
-
-
+
   <ItemGroup>
     <EmbeddedResource Include="Resources\font_metrics.properties" />
     <EmbeddedResource Include="Resources\functionMetadata.txt" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BouncyCastle.NetCore" Version="1.8.5" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.6" />
     <PackageReference Include="SharpZipLib" Version="1.2.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.0" />

diff --git a/main/NPOI.csproj b/main/NPOI.csproj
@@ -34,8 +34,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-	<PackageId>NPOI</PackageId>
-	<RepositoryUrl>https://github.com/tonyqus/npoi</RepositoryUrl>
+    <PackageId>NPOI</PackageId>
+    <RepositoryUrl>https://github.com/tonyqus/npoi</RepositoryUrl>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -90,8 +90,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\solution\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>..\solution\packages\Portable.BouncyCastle.1.8.6\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\solution\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>

diff --git a/main/packages.config b/main/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.5" targetFramework="net40" />
+  <package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net45" />
   <package id="SharpZipLib" version="1.2.0" targetFramework="net45" />
 </packages>
diff --git a/ooxml/NPOI.OOXML.Core.csproj b/ooxml/NPOI.OOXML.Core.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BouncyCastle.NetCore" Version="1.8.5" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.6" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/ooxml/NPOI.OOXML.csproj b/ooxml/NPOI.OOXML.csproj
@@ -35,8 +35,8 @@
     </TargetFrameworkProfile>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\main\npoi.snk</AssemblyOriginatorKeyFile>
-	<PackageId>NPOI</PackageId>
-	<RepositoryUrl>https://github.com/tonyqus/npoi</RepositoryUrl>	
+    <PackageId>NPOI</PackageId>
+    <RepositoryUrl>https://github.com/tonyqus/npoi</RepositoryUrl>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -91,8 +91,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\solution\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>..\solution\packages\Portable.BouncyCastle.1.8.6\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\solution\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>

diff --git a/ooxml/packages.config b/ooxml/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.5" targetFramework="net45" />
+  <package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net45" />
   <package id="SharpZipLib" version="1.2.0" targetFramework="net45" />
 </packages>
diff --git a/openxml4Net/NPOI.OpenXml4Net.csproj b/openxml4Net/NPOI.OpenXml4Net.csproj
@@ -35,8 +35,8 @@
     </TargetFrameworkProfile>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>npoi.snk</AssemblyOriginatorKeyFile>
-	<PackageId>NPOI</PackageId>
-	<RepositoryUrl>https://github.com/tonyqus/npoi</RepositoryUrl>	
+    <PackageId>NPOI</PackageId>
+    <RepositoryUrl>https://github.com/tonyqus/npoi</RepositoryUrl>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -91,9 +91,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\solution\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
-    </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\solution\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>

diff --git a/openxml4Net/packages.config b/openxml4Net/packages.config
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.5" targetFramework="net45" />
-  <package id="SharpZipLib" version="1.2.0" targetFramework="net45" />
 </packages>