From 8f576b8caaec7d3e10d7012f2bfd10a0472d7939 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 13 Dec 2024 11:03:42 -0600 Subject: [PATCH 1/8] Update .NET Framework references to 9.0.0 --- eng/Versions.props | 20 ++++++++++---------- src/MSBuild/app.amd64.config | 36 ++++++++++++++++++------------------ src/MSBuild/app.config | 16 ++++++++-------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6523774e70a..bf8ddb13238 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,19 +41,19 @@ 6.0.1 1.0.9 - 8.0.0 - 8.0.0 - 8.0.1 + 9.0.0 + 9.0.0 + 9.0.0 4.3.4 - 8.0.0 - 8.0.0 - 8.0.0 + 9.0.0 + 9.0.0 + 9.0.0 5.0.0 - 7.0.0 + 9.0.0 4.3.1 - 8.0.5 - 8.0.0 - 8.0.0 + 9.0.0 + 9.0.0 + 9.0.0 diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 339dfe620bf..f3dc5d39265 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -62,8 +62,8 @@ - - + + @@ -88,8 +88,8 @@ - - + + @@ -103,18 +103,18 @@ - - + + - - + + - - + + @@ -123,23 +123,23 @@ - - + + - - + + - - + + - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 9bc9a4c595c..ef3a933d8ef 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -33,7 +33,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -66,15 +66,15 @@ - + - + - + @@ -82,15 +82,15 @@ - + - + - + From 7db938057ee801c395f5adf3e1f87518f41701b5 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 13 Dec 2024 11:42:45 -0600 Subject: [PATCH 2/8] OK fine update sourcebuild too --- eng/SourceBuildPrebuiltBaseline.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 6693866df16..ed400cfed9e 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -4,20 +4,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + From 27d273b62080f1c0c74ab7e51b5b6ef25e28bd22 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 13 Dec 2024 11:51:48 -0600 Subject: [PATCH 3/8] fixup! OK fine update sourcebuild too --- eng/SourceBuildPrebuiltBaseline.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index ed400cfed9e..ea4a7685aa6 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -4,17 +4,19 @@ - + + + From 2aa4da7fce465c41a65c9ed78e290e230422686f Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 13 Dec 2024 11:59:58 -0600 Subject: [PATCH 4/8] fixup! OK fine update sourcebuild too --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index ea4a7685aa6..8c3bcdd592c 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -9,7 +9,7 @@ - + From 3cea87c8396874470f2a446c24b9ea1e7365a747 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Tue, 17 Dec 2024 17:07:36 -0600 Subject: [PATCH 5/8] Add new dependencies --- src/MSBuild/app.amd64.config | 9 +++++++++ src/MSBuild/app.config | 8 ++++++++ src/Package/MSBuild.VSSetup/files.swr | 4 ++++ 3 files changed, 21 insertions(+) diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index f3dc5d39265..8093c85ad4b 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -92,6 +92,15 @@ + + + + + + + + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index ef3a933d8ef..069b47ec076 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -56,6 +56,14 @@ + + + + + + + + diff --git a/src/Package/MSBuild.VSSetup/files.swr b/src/Package/MSBuild.VSSetup/files.swr index fcd8630dbd6..9db10947ae0 100644 --- a/src/Package/MSBuild.VSSetup/files.swr +++ b/src/Package/MSBuild.VSSetup/files.swr @@ -42,6 +42,8 @@ folder InstallDir:\MSBuild\Current\Bin file source=$(X86BinPath)Microsoft.VisualStudio.SolutionPersistence.dll file source=$(X86BinPath)RuntimeContracts.dll file source=$(X86BinPath)System.Buffers.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 + file source=$(X86BinPath)System.Formats.Nrbf.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 + file source=$(X86BinPath)System.IO.Pipelines.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 file source=$(X86BinPath)System.Memory.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 file source=$(X86BinPath)System.Reflection.Metadata.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 file source=$(X86BinPath)System.Reflection.MetadataLoadContext.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 @@ -189,6 +191,8 @@ folder InstallDir:\MSBuild\Current\Bin\amd64 file source=$(X86BinPath)Microsoft.Build.Tasks.Core.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)Microsoft.Build.Utilities.Core.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Buffers.dll vs.file.ngenArchitecture=all + file source=$(X86BinPath)System.Formats.Nrbf.dll vs.file.ngenArchitecture=all + file source=$(X86BinPath)System.IO.Pipelines.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Memory.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Reflection.Metadata.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Reflection.MetadataLoadContext.dll vs.file.ngenArchitecture=all From d2070b11f236f477308ade3364534de21e149dc2 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Wed, 18 Dec 2024 11:25:38 -0600 Subject: [PATCH 6/8] Formats.Nrbf depends on Bcl.HashCode --- src/MSBuild/app.amd64.config | 5 +++++ src/MSBuild/app.config | 4 ++++ src/Package/MSBuild.VSSetup/files.swr | 2 ++ 3 files changed, 11 insertions(+) diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 8093c85ad4b..4b577b26437 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -65,6 +65,11 @@ + + + + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 069b47ec076..50f13c0972f 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -35,6 +35,10 @@ + + + + diff --git a/src/Package/MSBuild.VSSetup/files.swr b/src/Package/MSBuild.VSSetup/files.swr index 9db10947ae0..ff91c8bcb96 100644 --- a/src/Package/MSBuild.VSSetup/files.swr +++ b/src/Package/MSBuild.VSSetup/files.swr @@ -58,6 +58,7 @@ folder InstallDir:\MSBuild\Current\Bin file source=$(X86BinPath)System.Runtime.CompilerServices.Unsafe.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 file source=$(X86BinPath)System.Threading.Tasks.Dataflow.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 file source=$(X86BinPath)System.Collections.Immutable.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 + file source=$(X86BinPath)Microsoft.Bcl.HashCode.dll file source=$(X86BinPath)Microsoft.NET.StringTools.dll vs.file.ngenArchitecture=all file source=$(TaskHostBinPath)Microsoft.NET.StringTools.net35.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)Microsoft.Common.CurrentVersion.targets @@ -207,6 +208,7 @@ folder InstallDir:\MSBuild\Current\Bin\amd64 file source=$(X86BinPath)System.Runtime.CompilerServices.Unsafe.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Threading.Tasks.Dataflow.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Collections.Immutable.dll vs.file.ngenArchitecture=all + file source=$(X86BinPath)Microsoft.Bcl.HashCode.dll file source=$(X86BinPath)Microsoft.NET.StringTools.dll vs.file.ngenArchitecture=all file source=$(TaskHostBinPath)Microsoft.NET.StringTools.net35.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)Microsoft.Common.CurrentVersion.targets From 34225d66ec9ea123f35b7dc83631b055b4801fea Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 20 Dec 2024 09:33:43 -0600 Subject: [PATCH 7/8] Don't ngen S.Resources.Extensions This is ngen-ing in vsn context but it shouldn't ever be used from the amd64 directory; that copy is for compat with badly-written API users only. --- src/Package/MSBuild.VSSetup/files.swr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Package/MSBuild.VSSetup/files.swr b/src/Package/MSBuild.VSSetup/files.swr index ff91c8bcb96..baec2785738 100644 --- a/src/Package/MSBuild.VSSetup/files.swr +++ b/src/Package/MSBuild.VSSetup/files.swr @@ -204,7 +204,7 @@ folder InstallDir:\MSBuild\Current\Bin\amd64 file source=$(X86BinPath)System.Threading.Tasks.Extensions.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.ValueTuple.dll file source=$(X86BinPath)System.Numerics.Vectors.dll vs.file.ngenArchitecture=all - file source=$(X86BinPath)System.Resources.Extensions.dll vs.file.ngenArchitecture=all + file source=$(X86BinPath)System.Resources.Extensions.dll file source=$(X86BinPath)System.Runtime.CompilerServices.Unsafe.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Threading.Tasks.Dataflow.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Collections.Immutable.dll vs.file.ngenArchitecture=all From b9f8ed7607261c4b11280b45f57b8cbc6bba1460 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Tue, 7 Jan 2025 15:54:08 -0600 Subject: [PATCH 8/8] SRE pkgdef version bump too --- src/Tasks/System.Resources.Extensions.pkgdef | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tasks/System.Resources.Extensions.pkgdef b/src/Tasks/System.Resources.Extensions.pkgdef index 62579ad4643..4e811b44871 100644 --- a/src/Tasks/System.Resources.Extensions.pkgdef +++ b/src/Tasks/System.Resources.Extensions.pkgdef @@ -3,5 +3,5 @@ "codeBase"="$BaseInstallDir$\MSBuild\Current\Bin\System.Resources.Extensions.dll" "publicKeyToken"="cc7b13ffcd2ddd51" "culture"="neutral" -"oldVersion"="0.0.0.0-99.9.9.9" -"newVersion"="8.0.0.0" +"oldVersion"="0.0.0.0-9.0.0.0" +"newVersion"="9.0.0.0"