diff --git a/eng/Versions.props b/eng/Versions.props index 4c2f37cec53..c2490ab70bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,12 +2,12 @@ - 17.14.50 + 17.14.51 release 17.13.9 15.1.0.0 servicing - test true @@ -31,6 +31,18 @@ As a result, we CONTINUE TO REFERENCE the old versions at build time, so those are the versions that get embedded into MSBuild assemblies. 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. + + These referenced versions are deliberately NOT bumped to the servicing build that the + net472 runtime wave ($(RuntimePackageVersion_VSDeploy)) was produced against: doing so + would change what the .NET (Core) build references and pull in new source-build prebuilts. + Instead, net472 redistributes the newer maintenance assemblies through the same + $(DeployRuntimeServicingAssemblies) swap as the runtime packages (see + src/Directory.Build.targets). Because their assembly versions move between servicing + builds, the matching redirects in src/MSBuild/app.config and app.amd64.config point at the + deployed assembly versions: System.Memory 4.6.3 -> 4.0.5.0, + System.Runtime.CompilerServices.Unsafe 6.1.2 -> 6.0.3.0, + System.Threading.Tasks.Extensions 4.6.3 -> 4.2.4.0, and the transitively redistributed + System.Buffers 4.6.1 -> 4.0.5.0 and System.Numerics.Vectors 4.6.1 -> 4.1.6.0. --> 4.6.0 4.6.0 @@ -41,20 +53,30 @@ - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 9.0.0 + + 9.0.0 + 10.0.8 diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index deba5dbaf7a..74c8b54bf25 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -158,6 +158,50 @@ + + + $(RuntimePackageVersion_VSDeploy) + $(RuntimePackageVersion_CompileTime) + + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + $(RuntimePackageVersion) + + + + + 4.6.3 + 4.6.3 + 6.1.2 + + + + + + <_DeployedRuntimeAssembly Include="System.Collections.Immutable;System.Configuration.ConfigurationManager;System.Diagnostics.DiagnosticSource;System.Diagnostics.EventLog;System.Formats.Asn1;System.Formats.Nrbf;System.Reflection.Metadata;System.Reflection.MetadataLoadContext;System.Resources.Extensions;System.Security.Cryptography.ProtectedData;System.Text.Encoding.CodePages;System.Text.Json;System.Threading.Channels;System.Threading.Tasks.Dataflow"> + $(RuntimePackageVersion_VSDeploy) + + + <_DeployedRuntimeAssembly Include="System.IO.Pipelines;System.Text.Encodings.Web;Microsoft.Bcl.AsyncInterfaces"> + $(RuntimePackageVersion_VSDeploy) + + + <_DeployedRuntimeAssembly Include="System.Memory"> + 4.6.3 + + <_DeployedRuntimeAssembly Include="System.Runtime.CompilerServices.Unsafe"> + 6.1.2 + + <_DeployedRuntimeAssembly Include="System.Threading.Tasks.Extensions"> + 4.6.3 + + <_DeployedRuntimeAssembly Include="System.Buffers"> + 4.6.1 + + <_DeployedRuntimeAssembly Include="System.Numerics.Vectors"> + 4.6.1 + + + <_DeployedRuntimeAssembly Include="Microsoft.Bcl.HashCode"> + 6.0.0 + + + + + + + + + + $(MSBuildWarningsAsMessages);MSB3277 + + + + + + + <_DeployedRuntimeAssemblyIds>;@(_DeployedRuntimeAssembly); + + <_RuntimeCopyLocalIds>;@(ReferenceCopyLocalPaths->'%(NuGetPackageId)'); + + + + <_DeployedRuntimeAssembly> + $(NuGetPackageRoot)$([System.String]::Copy('%(Identity)').ToLowerInvariant())\%(Version)\lib\net462\%(Identity).dll + + + + + + + + + %(_DeployedRuntimeAssembly.Identity) + %(_DeployedRuntimeAssembly.Version) + + + + diff --git a/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj b/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj index 4839c0dcbfa..5d4c0aab3d8 100644 --- a/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj +++ b/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj @@ -12,6 +12,12 @@ false + + + true diff --git a/src/MSBuild/MSBuild.csproj b/src/MSBuild/MSBuild.csproj index 2edca8c339b..b7f96ae2a80 100644 --- a/src/MSBuild/MSBuild.csproj +++ b/src/MSBuild/MSBuild.csproj @@ -40,6 +40,12 @@ redirect ValueTuple _down_ to match VS. --> false + + true + true contentFiles contentFiles\any\ diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 528707c3e22..a99052db34d 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -70,13 +70,13 @@ - - + + - - + + @@ -94,30 +94,30 @@ - - + + - - + + - - + + - - + + - - + + @@ -190,58 +190,63 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index cd0059bd3db..5c8aad7237f 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -33,11 +33,11 @@ - + - + @@ -57,64 +57,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + - + diff --git a/src/Tasks/System.Resources.Extensions.pkgdef b/src/Tasks/System.Resources.Extensions.pkgdef index 4e811b44871..c7b0c4cb4f8 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.0" -"newVersion"="9.0.0.0" +"oldVersion"="0.0.0.0-10.0.0.8" +"newVersion"="10.0.0.8"