diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2961c3bd5ff..ca8d09d42c3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -45,6 +45,7 @@
+
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 7e0f7bb8c69..0aa1e7bc00b 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
- 9.0.11
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
+ 10.0.0
10.0.0-beta.25605.3
10.0.0-beta.25605.3
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d63feb3370f..ade03ecccc7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,103 +3,103 @@
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
-
+
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 5ab5660455d..ae4feff9b7b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,9 +48,10 @@
However, we can update, binding-redirect to, and distribute the newest version (that matches the VS-referenced versions) in order to get the benefits of updating.
See uses of $(UseFrozenMaintenancePackageVersions) for details.
-->
- 4.6.0
- 6.1.0
- 4.6.0
+ 4.6.3
+ 6.1.2
+ 4.6.3
+ 4.6.1
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 6818b3b1965..a58a4bc167c 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -155,12 +155,39 @@
4.5.4
4.5.1
4.5.0
+ 4.5.0
+ 4.7.1
+
+
+ 9.0.11
+ $(FrozenRuntimeVersionFor9)
+ $(FrozenRuntimeVersionFor9)
+ $(FrozenRuntimeVersionFor9)
+ $(FrozenRuntimeVersionFor9)
+ $(FrozenRuntimeVersionFor9)
+ $(FrozenRuntimeVersionFor9)
+ $(FrozenRuntimeVersionFor9)
+ $(FrozenRuntimeVersionFor9)
+ $(FrozenRuntimeVersionFor9)
+ $(FrozenRuntimeVersionFor9)
+ $(FrozenRuntimeVersionFor9)
+
+
+
+
+
+
+
+
+
+
+
@@ -175,20 +202,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/MSBuild/MSBuild.csproj b/src/MSBuild/MSBuild.csproj
index e43039e8e6c..e4fbd077a17 100644
--- a/src/MSBuild/MSBuild.csproj
+++ b/src/MSBuild/MSBuild.csproj
@@ -192,6 +192,7 @@
+
diff --git a/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs b/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs
index f68a6317b66..af57996ef8d 100644
--- a/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs
+++ b/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs
@@ -20,11 +20,11 @@ public class ValidateMSBuildPackageDependencyVersions : Task
// Microsoft.Build.Conversion.Core and Microsoft.Build.Engine are deprecated, but they're still used in VS for now. This project doesn't directly reference them, so they don't appear in its output directory.
// Microsoft.NET.StringTools uses API not available in net35, but since we need it to work for TaskHosts as well, there are simpler versions implemented for that. Ensure it's the right version.
// Microsoft.Activities.Build and XamlBuildTask are loaded within an AppDomain in the XamlBuildTask after having been loaded from the GAC elsewhere. See https://github.com/dotnet/msbuild/pull/856
- private string[] assembliesToIgnore = { "Microsoft.Build.Conversion.Core", "Microsoft.NET.StringTools.net35", "Microsoft.Build.Engine", "Microsoft.Activities.Build", "XamlBuildTask" };
+ private string[] assembliesToIgnore = { "Microsoft.Build.Conversion.Core", "Microsoft.NET.StringTools.net35", "Microsoft.Build.Engine", "Microsoft.Activities.Build", "System.ValueTuple", "XamlBuildTask" };
public override bool Execute()
{
- bool foundSystemValueTuple = false;
+ // bool foundSystemValueTuple = false;
var settings = new XmlReaderSettings
{
@@ -94,7 +94,7 @@ public override bool Execute()
if (String.Equals(name, "System.ValueTuple", StringComparison.OrdinalIgnoreCase) &&
String.Equals(version, "4.0.0.0") && String.Equals(assemblyVersion, "4.0.3.0"))
{
- foundSystemValueTuple = true;
+ // foundSystemValueTuple = true;
}
else
{
@@ -113,11 +113,11 @@ public override bool Execute()
}
}
}
-
- if (!foundSystemValueTuple)
- {
- Log.LogError("Binding redirect for 'System.ValueTuple' missing.");
- }
+
+ // if (!foundSystemValueTuple)
+ // {
+ // Log.LogError("Binding redirect for 'System.ValueTuple' missing.");
+ // }
return !Log.HasLoggedErrors;
}
diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config
index 9bf8b014e38..d47240576cc 100644
--- a/src/MSBuild/app.amd64.config
+++ b/src/MSBuild/app.amd64.config
@@ -70,13 +70,13 @@
-
-
+
+
-
-
+
+
@@ -94,30 +94,30 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -190,66 +190,65 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config
index 9c41d0b862c..e8c33eb16ad 100644
--- a/src/MSBuild/app.config
+++ b/src/MSBuild/app.config
@@ -33,11 +33,11 @@
-
+
-
+
@@ -57,71 +57,75 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
+
-
+
diff --git a/src/Package/MSBuild.VSSetup/files.swr b/src/Package/MSBuild.VSSetup/files.swr
index 3b75caa7fb1..5a6c0c59356 100644
--- a/src/Package/MSBuild.VSSetup/files.swr
+++ b/src/Package/MSBuild.VSSetup/files.swr
@@ -52,7 +52,6 @@ folder InstallDir:\MSBuild\Current\Bin
file source=$(X86BinPath)Microsoft.Bcl.AsyncInterfaces.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=2
file source=$(X86BinPath)System.Text.Encodings.Web.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=2
file source=$(X86BinPath)System.Threading.Tasks.Extensions.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=2
- file source=$(X86BinPath)System.ValueTuple.dll
file source=$(X86BinPath)System.Numerics.Vectors.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=2
file source=$(X86BinPath)System.Resources.Extensions.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=3
file source=$(X86BinPath)System.Runtime.CompilerServices.Unsafe.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=2
@@ -221,7 +220,6 @@ folder InstallDir:\MSBuild\Current\Bin\amd64
file source=$(X86BinPath)Microsoft.IO.Redist.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)System.Text.Encodings.Web.dll vs.file.ngenArchitecture=all
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
file source=$(X86BinPath)System.Runtime.CompilerServices.Unsafe.dll vs.file.ngenArchitecture=all
diff --git a/src/Tasks/System.Resources.Extensions.pkgdef b/src/Tasks/System.Resources.Extensions.pkgdef
index a90ae6d001b..1bada34a686 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-9.0.0.11"
-"newVersion"="9.0.0.11"
+"oldVersion"="0.0.0.0-10.0.0.0"
+"newVersion"="10.0.0.0"