From 6a345f39bd3f6dc4b962395cf8611bf0586de536 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Mon, 18 Nov 2024 11:16:47 -0800 Subject: [PATCH 1/5] Moving to Central package management and enabling NuGet auditing --- NuGet.config | 24 +++++++++++++++ global.json | 4 +-- samples/WindowsAuth/WindowsAuth.csproj | 1 + src/Directory.Packages.props | 22 ++++++++++++++ ...Core.SystemWebAdapters.Abstractions.csproj | 2 +- ...Core.SystemWebAdapters.CoreServices.csproj | 2 +- ...SystemWebAdapters.FrameworkServices.csproj | 10 +++---- .../Generated/GenerateApis.targets | 2 +- ...rosoft.AspNetCore.SystemWebAdapters.csproj | 8 ++--- test/Directory.Packages.props | 29 +++++++++++++++++++ .../CopyFrameworkAdapters.targets | 4 +-- ...etCore.SystemWebAdapters.Apis.Tests.csproj | 10 +++---- ...ystemWebAdapters.CoreServices.Tests.csproj | 10 +++---- ...WebAdapters.FrameworkServices.Tests.csproj | 6 ++-- ...tCore.SystemWebAdapters.NuGet.Tests.csproj | 8 ++--- ....AspNetCore.SystemWebAdapters.Tests.csproj | 8 ++--- .../Samples.MVCApp.Tests.csproj | 10 +++---- .../Samples.RemoteAuth.Forms.Tests.csproj | 10 +++---- 18 files changed, 123 insertions(+), 47 deletions(-) create mode 100644 src/Directory.Packages.props create mode 100644 test/Directory.Packages.props diff --git a/NuGet.config b/NuGet.config index 5c87115670..eb2ad1d679 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,5 +9,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/global.json b/global.json index 231fbdda68..03b9cc29b6 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "9.0.100-rc.2.24474.11" + "version": "9.0.100" }, "tools": { - "dotnet": "9.0.100-rc.2.24474.11", + "dotnet": "9.0.100", "runtimes": { "dotnet": [ "6.0.4", diff --git a/samples/WindowsAuth/WindowsAuth.csproj b/samples/WindowsAuth/WindowsAuth.csproj index 8b288ff812..bb23f8dde1 100644 --- a/samples/WindowsAuth/WindowsAuth.csproj +++ b/samples/WindowsAuth/WindowsAuth.csproj @@ -8,6 +8,7 @@ + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 0000000000..be4619d793 --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,22 @@ + + + + true + true + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.Abstractions/Microsoft.AspNetCore.SystemWebAdapters.Abstractions.csproj b/src/Microsoft.AspNetCore.SystemWebAdapters.Abstractions/Microsoft.AspNetCore.SystemWebAdapters.Abstractions.csproj index ea3eeb1585..b4fef4acc4 100644 --- a/src/Microsoft.AspNetCore.SystemWebAdapters.Abstractions/Microsoft.AspNetCore.SystemWebAdapters.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.SystemWebAdapters.Abstractions/Microsoft.AspNetCore.SystemWebAdapters.Abstractions.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj index 661d438609..6a23ed5ac3 100644 --- a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj +++ b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj b/src/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj index 7f166cfd80..6b5f7bf3c6 100644 --- a/src/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj +++ b/src/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj @@ -23,11 +23,11 @@ - - - - - + + + + + diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/Generated/GenerateApis.targets b/src/Microsoft.AspNetCore.SystemWebAdapters/Generated/GenerateApis.targets index 8a80ea65e8..4cfb600313 100644 --- a/src/Microsoft.AspNetCore.SystemWebAdapters/Generated/GenerateApis.targets +++ b/src/Microsoft.AspNetCore.SystemWebAdapters/Generated/GenerateApis.targets @@ -16,7 +16,7 @@ - + diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj b/src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj index b7d2598197..ed49fcac68 100644 --- a/src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj +++ b/src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj @@ -32,14 +32,14 @@ - + - + @@ -49,7 +49,7 @@ - + @@ -65,7 +65,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props new file mode 100644 index 0000000000..5d63e238c1 --- /dev/null +++ b/test/Directory.Packages.props @@ -0,0 +1,29 @@ + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/CopyFrameworkAdapters.targets b/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/CopyFrameworkAdapters.targets index d9827fbdab..0b0240e5e1 100644 --- a/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/CopyFrameworkAdapters.targets +++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/CopyFrameworkAdapters.targets @@ -9,7 +9,7 @@ --> - + @@ -17,7 +17,7 @@ - + false $(FrameworkAdapterDirectory)/%(RecursiveDir)%(Filename)%(Extension) diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests.csproj b/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests.csproj index d1d7eb29e4..a245e0f372 100644 --- a/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests.csproj +++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests.csproj b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests.csproj index d99fc7db9e..806c9a47f5 100644 --- a/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests.csproj +++ b/test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests.csproj @@ -3,11 +3,11 @@ net6.0;net8.0 - - - - - + + + + + diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests.csproj b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests.csproj index 22df7ab7fc..306a2cd286 100644 --- a/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests.csproj +++ b/test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj b/test/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj index 98726ef8f1..893ce04da9 100644 --- a/test/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj +++ b/test/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + - + diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Microsoft.AspNetCore.SystemWebAdapters.Tests.csproj b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Microsoft.AspNetCore.SystemWebAdapters.Tests.csproj index 050c39cd38..d0c950a8eb 100644 --- a/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Microsoft.AspNetCore.SystemWebAdapters.Tests.csproj +++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Microsoft.AspNetCore.SystemWebAdapters.Tests.csproj @@ -5,10 +5,10 @@ - - - - + + + + diff --git a/test/Samples.MVCApp.Tests/Samples.MVCApp.Tests.csproj b/test/Samples.MVCApp.Tests/Samples.MVCApp.Tests.csproj index 7fb129e72d..649e70248b 100644 --- a/test/Samples.MVCApp.Tests/Samples.MVCApp.Tests.csproj +++ b/test/Samples.MVCApp.Tests/Samples.MVCApp.Tests.csproj @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/test/Samples.RemoteAuth.Forms.Tests/Samples.RemoteAuth.Forms.Tests.csproj b/test/Samples.RemoteAuth.Forms.Tests/Samples.RemoteAuth.Forms.Tests.csproj index 7fb129e72d..649e70248b 100644 --- a/test/Samples.RemoteAuth.Forms.Tests/Samples.RemoteAuth.Forms.Tests.csproj +++ b/test/Samples.RemoteAuth.Forms.Tests/Samples.RemoteAuth.Forms.Tests.csproj @@ -9,11 +9,11 @@ - - - - - + + + + + From 5f753a3547cc757ef3f0fc1ac757fe5ee3e9e5d8 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Mon, 18 Nov 2024 11:26:38 -0800 Subject: [PATCH 2/5] Readding metadata that shouldn't have been removed --- .../CopyFrameworkAdapters.targets | 2 +- .../Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/CopyFrameworkAdapters.targets b/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/CopyFrameworkAdapters.targets index 0b0240e5e1..f773720059 100644 --- a/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/CopyFrameworkAdapters.targets +++ b/test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/CopyFrameworkAdapters.targets @@ -17,7 +17,7 @@ - + false $(FrameworkAdapterDirectory)/%(RecursiveDir)%(Filename)%(Extension) diff --git a/test/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj b/test/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj index 893ce04da9..e8d1dfba5f 100644 --- a/test/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj +++ b/test/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj @@ -14,7 +14,7 @@ - + From 38960437a31295536833af96a942197639aee0d5 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Mon, 18 Nov 2024 11:59:50 -0800 Subject: [PATCH 3/5] Fix downgrade issues --- test/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index 5d63e238c1..0f1f41b345 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -13,7 +13,7 @@ - + From 6633923933b8fbf1eccc8e23da99f1398f400c90 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Mon, 18 Nov 2024 17:05:47 -0800 Subject: [PATCH 4/5] Fix nuget warning for Microsoft.NETFramework.ReferenceAssemblies --- test/Directory.Packages.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index 0f1f41b345..40f96e9696 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -3,6 +3,8 @@ true true + + NU1009;$(NoWarn) From 762674c4ecfae70d4326020bf1e77a39641c553f Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Tue, 19 Nov 2024 17:51:17 +0000 Subject: [PATCH 5/5] Fixing Linux build --- src/Directory.Packages.props | 1 - .../Microsoft.AspNetCore.SystemWebAdapters.csproj | 1 + test/Directory.Packages.props | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index be4619d793..26f32f27cb 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -13,7 +13,6 @@ - diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj b/src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj index ed49fcac68..e2a162dcf9 100644 --- a/src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj +++ b/src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj @@ -64,6 +64,7 @@ + all diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index 40f96e9696..0f1f41b345 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -3,8 +3,6 @@ true true - - NU1009;$(NoWarn)