From 00c4dc6cf75db4cb9bb7aa7de7dff13f77b2d381 Mon Sep 17 00:00:00 2001 From: joegoldman674 <147369450+joegoldman2@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:04:58 +0000 Subject: [PATCH 1/6] Align MSBuild properties across all projects --- .../Client/BlazorWasmDemo.Client.csproj | 4 +--- .../Server/BlazorWasmDemo.Server.csproj | 5 +---- Demo/Demo.csproj | 10 ++++++++-- Directory.Build.props | 9 ++++++--- Src/Fido2.AspNet/Fido2.AspNet.csproj | 9 +++++---- .../Fido2.BlazorWebAssembly.csproj | 8 ++------ Src/Fido2.Ctap2/Fido2.Ctap2.csproj | 5 +++-- Src/Fido2.Development/Fido2.Development.csproj | 6 +++--- Src/Fido2.Models/Fido2.Models.csproj | 8 +++----- Src/Fido2/Fido2.csproj | 18 +++++------------- Test/Test.csproj | 5 ++--- .../Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj | 4 +--- 12 files changed, 40 insertions(+), 51 deletions(-) diff --git a/BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj b/BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj index e4420ce1..304d0602 100644 --- a/BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj +++ b/BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj @@ -1,10 +1,8 @@ - net6.0 + $(SupportedTargetFrameworks) enable - enable - 11 diff --git a/BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj b/BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj index 2ea0a915..26cf6b4f 100644 --- a/BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj +++ b/BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj @@ -1,13 +1,11 @@ - net6.0 + $(SupportedTargetFrameworks) enable - enable d4e312c9-f55a-43e0-b3ea-699aa6421a5c Linux ..\.. - 11 @@ -22,5 +20,4 @@ - diff --git a/Demo/Demo.csproj b/Demo/Demo.csproj index 7c0c4eb2..aaa01ee3 100644 --- a/Demo/Demo.csproj +++ b/Demo/Demo.csproj @@ -1,21 +1,26 @@  + - net6.0 - 39589262-6aa1-4bde-aaa9-403a7542cf63 + $(SupportedTargetFrameworks) Fido2Demo + 39589262-6aa1-4bde-aaa9-403a7542cf63 + + + + $(IncludeRazorContentInPack) @@ -30,4 +35,5 @@ $(IncludeRazorContentInPack) + diff --git a/Directory.Build.props b/Directory.Build.props index f093eee2..a0a197bd 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,8 +3,7 @@ 4.0.0-beta3 - - + FIDO2 .NET library (WebAuthn) https://github.com/passwordless-lib/fido2-net-lib git @@ -13,15 +12,19 @@ https://github.com/passwordless-lib/fido2-net-lib MIT + net6.0 + enable true + - 10 + 11 + diff --git a/Src/Fido2.AspNet/Fido2.AspNet.csproj b/Src/Fido2.AspNet/Fido2.AspNet.csproj index 1b5dcce7..7721adf8 100644 --- a/Src/Fido2.AspNet/Fido2.AspNet.csproj +++ b/Src/Fido2.AspNet/Fido2.AspNet.csproj @@ -1,16 +1,17 @@  - net6.0 + $(SupportedTargetFrameworks) Fido2NetLib - - + - + + + diff --git a/Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj b/Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj index 13820037..3bdb4fe4 100644 --- a/Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj +++ b/Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj @@ -1,10 +1,10 @@ - + $(SupportedTargetFrameworks) + Fido2NetLib true enable - enable true $(NoWarn);CS1591 @@ -39,8 +39,4 @@ - - - - diff --git a/Src/Fido2.Ctap2/Fido2.Ctap2.csproj b/Src/Fido2.Ctap2/Fido2.Ctap2.csproj index 414702cf..d109cd20 100644 --- a/Src/Fido2.Ctap2/Fido2.Ctap2.csproj +++ b/Src/Fido2.Ctap2/Fido2.Ctap2.csproj @@ -1,8 +1,8 @@  - net6.0 - enable + $(SupportedTargetFrameworks) + Fido2NetLib enable true @@ -10,4 +10,5 @@ + diff --git a/Src/Fido2.Development/Fido2.Development.csproj b/Src/Fido2.Development/Fido2.Development.csproj index 3884241b..acdff524 100644 --- a/Src/Fido2.Development/Fido2.Development.csproj +++ b/Src/Fido2.Development/Fido2.Development.csproj @@ -1,8 +1,8 @@ - + - net6.0 - enable + $(SupportedTargetFrameworks) + Fido2NetLib enable diff --git a/Src/Fido2.Models/Fido2.Models.csproj b/Src/Fido2.Models/Fido2.Models.csproj index f179f574..fe9c0304 100644 --- a/Src/Fido2.Models/Fido2.Models.csproj +++ b/Src/Fido2.Models/Fido2.Models.csproj @@ -1,13 +1,11 @@  + $(SupportedTargetFrameworks) - true Fido2NetLib + true true $(NoWarn);CS1591 - - - - + diff --git a/Src/Fido2/Fido2.csproj b/Src/Fido2/Fido2.csproj index c2d4ecf6..95029304 100644 --- a/Src/Fido2/Fido2.csproj +++ b/Src/Fido2/Fido2.csproj @@ -1,22 +1,13 @@  + $(SupportedTargetFrameworks) - enable Fido2NetLib + enable true - IDE0057 - 11 + $(NoWarn);IDE0057 - - - - - - - - - @@ -32,4 +23,5 @@ --> - + + \ No newline at end of file diff --git a/Test/Test.csproj b/Test/Test.csproj index 846c2cb3..109a379a 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -1,9 +1,8 @@  + - net6.0 + $(SupportedTargetFrameworks) false - preview - enable CA1822,IDE0007,IDE0037,IDE0039,IDE0057,CA1825 diff --git a/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj b/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj index 64d90b65..9e64ddeb 100644 --- a/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj +++ b/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj @@ -1,11 +1,9 @@ - net6.0 + $(SupportedTargetFrameworks) enable false - enable - preview From 5540271eaa64248d5af84479236453a4eb0d0ac3 Mon Sep 17 00:00:00 2001 From: joegoldman674 <147369450+joegoldman2@users.noreply.github.com> Date: Tue, 10 Oct 2023 14:59:16 +0000 Subject: [PATCH 2/6] Revert TFM for demo projects to original value --- BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj | 2 +- BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj | 2 +- Demo/Demo.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj b/BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj index 304d0602..276c233b 100644 --- a/BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj +++ b/BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj @@ -1,7 +1,7 @@ - $(SupportedTargetFrameworks) + net6.0 enable diff --git a/BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj b/BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj index 26cf6b4f..df102a18 100644 --- a/BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj +++ b/BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj @@ -1,7 +1,7 @@ - $(SupportedTargetFrameworks) + net6.0 enable d4e312c9-f55a-43e0-b3ea-699aa6421a5c Linux diff --git a/Demo/Demo.csproj b/Demo/Demo.csproj index aaa01ee3..0eb8a2df 100644 --- a/Demo/Demo.csproj +++ b/Demo/Demo.csproj @@ -1,7 +1,7 @@  - $(SupportedTargetFrameworks) + net6.0 Fido2Demo 39589262-6aa1-4bde-aaa9-403a7542cf63 From 99e177d7598012c37b4808cf4e01d083d97e8ac8 Mon Sep 17 00:00:00 2001 From: joegoldman674 <147369450+joegoldman2@users.noreply.github.com> Date: Wed, 11 Oct 2023 18:10:18 +0000 Subject: [PATCH 3/6] Disable implicit usings on Fido2.csproj --- Src/Fido2/Fido2.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Src/Fido2/Fido2.csproj b/Src/Fido2/Fido2.csproj index 95029304..29879517 100644 --- a/Src/Fido2/Fido2.csproj +++ b/Src/Fido2/Fido2.csproj @@ -4,6 +4,7 @@ $(SupportedTargetFrameworks) Fido2NetLib enable + disable true $(NoWarn);IDE0057 From d43f7453dc66068a987859e90ca5d4f2025dc593 Mon Sep 17 00:00:00 2001 From: joegoldman674 <147369450+joegoldman2@users.noreply.github.com> Date: Fri, 13 Oct 2023 19:59:56 +0000 Subject: [PATCH 4/6] Switch from TargetFramework to TargetFrameworks on Fido2.Ctap2.Tests project --- Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj b/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj index 9e64ddeb..37ae6596 100644 --- a/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj +++ b/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj @@ -1,7 +1,7 @@ - $(SupportedTargetFrameworks) + $(SupportedTargetFrameworks) enable false From f53b30349bf13df4e5cb581cff6dc16f1041e74a Mon Sep 17 00:00:00 2001 From: joegoldman674 <147369450+joegoldman2@users.noreply.github.com> Date: Fri, 13 Oct 2023 20:00:11 +0000 Subject: [PATCH 5/6] Fix NoWarm property --- Test/Test.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Test.csproj b/Test/Test.csproj index 109a379a..5ffe3812 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -3,7 +3,7 @@ $(SupportedTargetFrameworks) false - CA1822,IDE0007,IDE0037,IDE0039,IDE0057,CA1825 + $(NoWarm);CA1822;IDE0007;IDE0037;IDE0039;IDE0057;CA1825 From 2ccd1afdaf3a8c0f3c6754c1eee69b7edc759709 Mon Sep 17 00:00:00 2001 From: joegoldman674 <147369450+joegoldman2@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:10:26 -0700 Subject: [PATCH 6/6] Switch from TargetFramework to TargetFrameworks on Fido2.BlazorWebAssembly project --- Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj b/Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj index 3bdb4fe4..796763aa 100644 --- a/Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj +++ b/Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj @@ -1,7 +1,7 @@  - $(SupportedTargetFrameworks) + $(SupportedTargetFrameworks) Fido2NetLib true enable