From f7fae82061d6fdfa4f1616f26e02c3880e03d623 Mon Sep 17 00:00:00 2001
From: Peter Dettman <peter.dettman@bouncycastle.org>
Date: Wed, 2 Nov 2022 00:08:12 +0700
Subject: More release prep.

---
 BouncyCastle.NET.snk                         | Bin 0 -> 596 bytes
 BouncyCastle.sln                             |   6 ++++--
 BouncyCastle.snk                             | Bin 596 -> 0 bytes
 Directory.Build.props                        |   5 +++++
 crypto/src/BouncyCastle.Crypto.csproj        |   9 +++++++--
 crypto/test/BouncyCastle.Crypto.Tests.csproj |   1 +
 6 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 BouncyCastle.NET.snk
 delete mode 100644 BouncyCastle.snk
 create mode 100644 Directory.Build.props

diff --git a/BouncyCastle.NET.snk b/BouncyCastle.NET.snk
new file mode 100644
index 000000000..589b817da
Binary files /dev/null and b/BouncyCastle.NET.snk differ
diff --git a/BouncyCastle.sln b/BouncyCastle.sln
index 506e62ad1..b00aad57a 100644
--- a/BouncyCastle.sln
+++ b/BouncyCastle.sln
@@ -1,11 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.32602.291
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F8F54480-386E-4CE7-8C0E-537922E2A634}"
 	ProjectSection(SolutionItems) = preProject
 		.gitlab-ci.yml = .gitlab-ci.yml
+		Directory.Build.props = Directory.Build.props
+		LICENSE.md = LICENSE.md
 		README.md = README.md
 		version.json = version.json
 	EndProjectSection
diff --git a/BouncyCastle.snk b/BouncyCastle.snk
deleted file mode 100644
index f460ac3d6..000000000
Binary files a/BouncyCastle.snk and /dev/null differ
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 000000000..6284136f0
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
+  </PropertyGroup>
+</Project>
diff --git a/crypto/src/BouncyCastle.Crypto.csproj b/crypto/src/BouncyCastle.Crypto.csproj
index cdff53c70..3ef720228 100644
--- a/crypto/src/BouncyCastle.Crypto.csproj
+++ b/crypto/src/BouncyCastle.Crypto.csproj
@@ -3,10 +3,11 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;netstandard2.0;net462</TargetFrameworks>
     <RootNamespace>Org.BouncyCastle</RootNamespace>
-    <AssemblyOriginatorKeyFile>..\..\BouncyCastle.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\BouncyCastle.NET.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
 	<NoWarn>1591</NoWarn>
 
+    <AssemblyName>BouncyCastle.Cryptography</AssemblyName>
     <Authors />
     <Company>Legion of the Bouncy Castle Inc.</Company>
     <Copyright>Copyright © Legion of the Bouncy Castle Inc. 2000-2022</Copyright>
@@ -17,10 +18,10 @@
     <PackageId>BouncyCastle.Cryptography</PackageId>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageProjectUrl>https://www.bouncycastle.org/csharp/</PackageProjectUrl>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>https://www.bouncycastle.org/csharp/</PackageReleaseNotes>
     <PackageTags>bouncycastle cryptography dtls encryption security tls</PackageTags>
 	<Product>BouncyCastle.NET</Product>
-    <!--<PublishRepositoryUrl>true</PublishRepositoryUrl>-->
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/bcgit/bc-csharp</RepositoryUrl>
     <Title>BouncyCastle.NET Cryptography</Title>
@@ -45,6 +46,10 @@
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
+    <None Include="..\..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
diff --git a/crypto/test/BouncyCastle.Crypto.Tests.csproj b/crypto/test/BouncyCastle.Crypto.Tests.csproj
index 3c9b88328..7eced3c7f 100644
--- a/crypto/test/BouncyCastle.Crypto.Tests.csproj
+++ b/crypto/test/BouncyCastle.Crypto.Tests.csproj
@@ -7,6 +7,7 @@
     <SignAssembly>true</SignAssembly>
     <EnableDefaultItems>false</EnableDefaultItems>
     <NoWarn>1591</NoWarn>
+    <RootNamespace>Org.BouncyCastle</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-- 
cgit 1.4.1