From 06b9bd13019d5aed51397a4a54c05cc6d101bc13 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Wed, 7 Aug 2024 11:09:31 -0700 Subject: [PATCH 1/2] Move to central package pinning This should make it much easier for us to respond to CG alerts in the future. All that will need to be done is add an entry in Directory.Packages.props and it will automatically impact all consumers of it. Consider this example in Roslyn for how to respond to a CG issue https://github.com/dotnet/roslyn/pull/74653 --- Directory.Build.props | 1 + Directory.Packages.props | 8 ++++---- ...Microsoft.AspNetCore.Razor.Language.Legacy.Test.csproj | 3 +++ .../test/Microsoft.AspNetCore.Razor.Language.Test.csproj | 3 +++ ...soft.AspNetCore.Razor.Microbenchmarks.Generator.csproj | 5 +++-- .../Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj | 2 ++ 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index d2e322d1332..69a3cd1524c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -26,6 +26,7 @@ $(MSBuildThisFileDirectory) true true + true $(MSBuildThisFileDirectory)src\Shared\ diff --git a/Directory.Packages.props b/Directory.Packages.props index 4e2bdea802f..9e3cc942a0e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -16,7 +16,7 @@ <_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.11.0-beta1.24170.2 <_MicrosoftVisualStudioLanguageServicesPackageVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion) <_XunitPackageVersion>2.6.3 - <_MicrosoftBuildPackageVersion>17.3.0-preview-22364-05 + <_MicrosoftBuildPackageVersion>17.11.0-preview-24309-01 @@ -89,7 +89,7 @@ - + @@ -110,12 +110,12 @@ - + - + diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/Microsoft.AspNetCore.Razor.Language.Legacy.Test.csproj b/src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/Microsoft.AspNetCore.Razor.Language.Legacy.Test.csproj index 7b16714b910..160c21c8ca7 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/Microsoft.AspNetCore.Razor.Language.Legacy.Test.csproj +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/Microsoft.AspNetCore.Razor.Language.Legacy.Test.csproj @@ -21,6 +21,9 @@ + + + diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj index f60fafca607..c0579b84329 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj @@ -21,6 +21,9 @@ + + + diff --git a/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj b/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj index 67034ffdb99..40b7f832275 100644 --- a/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj +++ b/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj @@ -21,8 +21,9 @@ - - + + + diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj index 73ee7b956d3..4d1acf312b7 100644 --- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj +++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj @@ -25,6 +25,8 @@ + + From 9cbc17bf4a93e6ca54d176db302d351f099901e8 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Thu, 8 Aug 2024 16:01:35 -0700 Subject: [PATCH 2/2] more --- Directory.Packages.props | 4 ++-- ...icrosoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9e3cc942a0e..86b4aa1bca0 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -109,11 +109,11 @@ - + - + diff --git a/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj b/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj index 40b7f832275..aebe9633fef 100644 --- a/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj +++ b/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj @@ -24,6 +24,7 @@ +