From 851feee00986b622fadcc856c1399d0c453c4c0f Mon Sep 17 00:00:00 2001
From: Peter Dettman <peter.dettman@bouncycastle.org>
Date: Sat, 18 Feb 2023 22:43:50 +0700
Subject: Fix symbols, add SourceLink, deterministic build

---
 crypto/Readme.html                    |  9 +++++++++
 crypto/src/BouncyCastle.Crypto.csproj | 33 ++++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/crypto/Readme.html b/crypto/Readme.html
index 38de4bd1e..ea8acaf7a 100644
--- a/crypto/Readme.html
+++ b/crypto/Readme.html
@@ -31,6 +31,8 @@
                             <li>
                                 <a href="#mozTocId3413">Notes:</a>
                                 <ol>
+                                    <li>
+                                        <a href="#mozTocId85328">Release 2.1.1</a>
                                     <li>
                                         <a href="#mozTocId85327">Release 2.1.0</a>
                                     <li>
@@ -321,6 +323,13 @@
         <hr style="WIDTH: 100%; HEIGHT: 2px">
         <h3><a class="mozTocH3" name="mozTocId3413"></a>Notes:</h3>
 
+        <h4><a class="mozTocH4" name="mozTocId85328"></a>Release 2.1.1, Saturday February 18, 2023</h4>
+        <p>
+            This is a hotfix release to fix the missing symbols for the 2.1.0 release.
+            We have now added an snupkg with symbols, enabled SourceLink, and made the build deterministic.
+            There was no change to functionality.
+        </p>
+
         <h4><a class="mozTocH4" name="mozTocId85327"></a>Release 2.1.0, Saturday February 18, 2023</h4>
         <h5>Defects Fixed</h5>
         <ul>
diff --git a/crypto/src/BouncyCastle.Crypto.csproj b/crypto/src/BouncyCastle.Crypto.csproj
index afdb875c4..a22f71335 100644
--- a/crypto/src/BouncyCastle.Crypto.csproj
+++ b/crypto/src/BouncyCastle.Crypto.csproj
@@ -22,23 +22,26 @@
     <PackageReleaseNotes>https://www.bouncycastle.org/csharp/</PackageReleaseNotes>
     <PackageTags>bouncycastle cryptography dtls encryption open-source openpgp post-quantum security tls</PackageTags>
 	<Product>BouncyCastle.NET</Product>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/bcgit/bc-csharp</RepositoryUrl>
+	<PublishRepositoryUrl>true</PublishRepositoryUrl>
     <Title>BouncyCastle.NET Cryptography</Title>
   </PropertyGroup>
 
-  <!-- Debugging-->
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-      <DebugType>full</DebugType>
-      <DebugSymbols>true</DebugSymbols>
-      <IncludeSymbols>true</IncludeSymbols>
-      <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  <!-- CI systems other than GitLab might need different conditions -->
+  <PropertyGroup Condition="'$(CI)' != ''">
+    <!-- Deterministic build. -->
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-      <DebugType>pdbonly</DebugType>
-      <DebugSymbols>true</DebugSymbols>
-      <IncludeSymbols>true</IncludeSymbols>
-      <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+  <!--Source-Level Debugging-->
+  <PropertyGroup>
+	<!-- Any custom target adding things to the Compile item group needs BeforeTargets="BeforeCompile".	-->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
+    <!-- Tell SourceLink to use this remote to derive the published git repository URL and source links. -->
+    <GitRepositoryRemoteName>public</GitRepositoryRemoteName>
+
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <!--Package Validation-->
@@ -84,6 +87,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-- 
cgit 1.4.1