From dd7b7686aa36db5302c053edf106792e173a45f4 Mon Sep 17 00:00:00 2001
From: Regenhardt <marlon.r@hotmail.de>
Date: Wed, 8 Mar 2023 11:40:57 +0100
Subject: [PATCH 1/2] Consolidate SourceLink reference to shared build props

---
 Src/Directory.Build.props            | 2 +-
 Src/Fido2.AspNet/Fido2.AspNet.csproj | 4 ----
 Src/Fido2.Ctap2/Fido2.Ctap2.csproj   | 5 -----
 Src/Fido2.Models/Fido2.Models.csproj | 4 ----
 Src/Fido2/Fido2.csproj               | 4 ----
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props
index 72517e20..21aa9d11 100644
--- a/Src/Directory.Build.props
+++ b/Src/Directory.Build.props
@@ -7,7 +7,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
   <!-- Projects inside "./src" should generate packages -->
diff --git a/Src/Fido2.AspNet/Fido2.AspNet.csproj b/Src/Fido2.AspNet/Fido2.AspNet.csproj
index 53c2a7d1..1b5dcce7 100644
--- a/Src/Fido2.AspNet/Fido2.AspNet.csproj
+++ b/Src/Fido2.AspNet/Fido2.AspNet.csproj
@@ -10,10 +10,6 @@
     <ProjectReference Include="..\Fido2.Models\Fido2.Models.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
diff --git a/Src/Fido2.Ctap2/Fido2.Ctap2.csproj b/Src/Fido2.Ctap2/Fido2.Ctap2.csproj
index 1852e66a..414702cf 100644
--- a/Src/Fido2.Ctap2/Fido2.Ctap2.csproj
+++ b/Src/Fido2.Ctap2/Fido2.Ctap2.csproj
@@ -10,9 +10,4 @@
   <ItemGroup>
     <ProjectReference Include="..\Fido2\Fido2.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-  </ItemGroup>
-
 </Project>
diff --git a/Src/Fido2.Models/Fido2.Models.csproj b/Src/Fido2.Models/Fido2.Models.csproj
index b4e7edf6..f179f574 100644
--- a/Src/Fido2.Models/Fido2.Models.csproj
+++ b/Src/Fido2.Models/Fido2.Models.csproj
@@ -10,8 +10,4 @@
   <ItemGroup>
     <Compile Remove="IMetadataService.cs" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-  </ItemGroup>
 </Project>
diff --git a/Src/Fido2/Fido2.csproj b/Src/Fido2/Fido2.csproj
index 26d1cf51..c3c6055c 100644
--- a/Src/Fido2/Fido2.csproj
+++ b/Src/Fido2/Fido2.csproj
@@ -31,8 +31,4 @@
     -->
     <Content Include="build/fido2.targets" PackagePath="build/" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-  </ItemGroup>
 </Project>

From a6aaa376ee468cf48b55004d7e5b89fd2aa9b930 Mon Sep 17 00:00:00 2001
From: Regenhardt <marlon.r@hotmail.de>
Date: Wed, 8 Mar 2023 11:50:19 +0100
Subject: [PATCH 2/2] Add other Directory.Build.props to solution

---
 Directory.Build.props     | 1 +
 Src/Directory.Build.props | 1 +
 fido2-net-lib.sln         | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index e20138a1..7c0d6a97 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,3 +1,4 @@
+<!-- Root build props for the whole solution -->
 <Project>
   <!-- Package Metadata -->
   <PropertyGroup>
diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props
index 21aa9d11..780ef4cc 100644
--- a/Src/Directory.Build.props
+++ b/Src/Directory.Build.props
@@ -1,3 +1,4 @@
+<!-- Build props for the libraries (anything under Src/) -->
 <Project>
   <Import Project="..\Directory.Build.props"/>
 
diff --git a/fido2-net-lib.sln b/fido2-net-lib.sln
index 02b811d7..bc09a421 100644
--- a/fido2-net-lib.sln
+++ b/fido2-net-lib.sln
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
+		Src\Directory.Build.props = Src\Directory.Build.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.Models", "Src\Fido2.Models\Fido2.Models.csproj", "{08AA0431-3BBF-49EF-8DEF-5433B3068D92}"
@@ -21,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.AspNet", "Src\Fido2.A
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.Ctap2", "Src\Fido2.Ctap2\Fido2.Ctap2.csproj", "{5B998DB8-6E96-4012-B524-32E113815059}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fido2.Ctap2.Tests", "Tests\Fido2.Ctap2.Tests\Fido2.Ctap2.Tests.csproj", "{BB3D1D09-1506-4DF9-8211-8B284E12B0F8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2.Ctap2.Tests", "Tests\Fido2.Ctap2.Tests\Fido2.Ctap2.Tests.csproj", "{BB3D1D09-1506-4DF9-8211-8B284E12B0F8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution