diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 6693866df16..8c3bcdd592c 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -5,19 +5,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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..4b577b26437 100644
--- a/src/MSBuild/app.amd64.config
+++ b/src/MSBuild/app.amd64.config
@@ -62,8 +62,13 @@
-
-
+
+
+
+
+
+
+
@@ -88,10 +93,19 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -103,18 +117,18 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -123,23 +137,23 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config
index 9bc9a4c595c..50f13c0972f 100644
--- a/src/MSBuild/app.config
+++ b/src/MSBuild/app.config
@@ -33,7 +33,11 @@
-
+
+
+
+
+
@@ -54,7 +58,15 @@
-
+
+
+
+
+
+
+
+
+
@@ -66,15 +78,15 @@
-
+
-
+
-
+
@@ -82,15 +94,15 @@
-
+
-
+
-
+
diff --git a/src/Package/MSBuild.VSSetup/files.swr b/src/Package/MSBuild.VSSetup/files.swr
index fcd8630dbd6..baec2785738 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
@@ -56,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
@@ -189,6 +192,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
@@ -199,10 +204,11 @@ 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
+ 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
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"