Skip to content

Commit 0457980

Browse files
ViktorHoferrainersigwald
ViktorHofer
and
rainersigwald
authored
Update assembly versions to latest for packages that recently shipped (#11038)
Microsoft.IO.Redist, System.Buffers, System.Memory and more recently shipped from the dotnet/maintenance-packages repository. Update binding redirects to the latest assembly version in order for them to be available on .NET Framework msbuild. VS recently did a similar update so this is necessary to regain some perf metrics. --------- Co-authored-by: Rainer Sigwald <[email protected]>
1 parent 903614e commit 0457980

File tree

4 files changed

+25
-34
lines changed

4 files changed

+25
-34
lines changed

‎eng/Packages.props

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
3535
<PackageVersion Include="System.Threading.Channels" Version="$(SystemThreadingChannelsVersion)" />
3636
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
37+
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
3738
<PackageVersion Include="xunit.console" Version="$(XUnitVersion)" />
3839
<PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.Collector" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />
3940
<PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.ClientExtensions" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />

‎eng/Versions.props

+6-16
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,18 @@
2020
<UsingToolVSSDK>true</UsingToolVSSDK>
2121
</PropertyGroup>
2222
<!-- Production Dependencies -->
23-
<!-- Condition consumption of maintenance-packages dependencies based on source build.
24-
This is to prevent "package downgrade" errors coming from other packages that are
25-
already consuming the newest version of these same dependencies. -->
26-
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
27-
<!-- Use newest package versions. -->
28-
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
29-
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
30-
</PropertyGroup>
31-
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
32-
<!-- Keep using older versions. Upgrade carefully. -->
23+
<PropertyGroup>
24+
<!-- manually maintained versions -->
3325
<!--
3426
Modifying the version of System.Memory is very high impact and causes downstream breaks in third-party tooling that uses the MSBuild API.
3527
When updating the version of System.Memory file a breaking change here: https://github.com/dotnet/docs/issues/new?assignees=gewarren&labels=breaking-change%2CPri1%2Cdoc-idea&template=breaking-change.yml&title=%5BBreaking+change%5D%3A+
3628
and follow the guidelines written here (internal-link): https://dev.azure.com/devdiv/DevDiv/_wiki/wikis/DevDiv.wiki/1796/How-to-add-a-Known-Issue
3729
-->
38-
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
39-
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
40-
</PropertyGroup>
41-
<PropertyGroup>
42-
<!-- manually maintained versions -->
43-
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
30+
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
31+
<SystemThreadingTasksExtensionsVersion>4.6.0</SystemThreadingTasksExtensionsVersion>
32+
<MicrosoftIORedistVersion>6.1.0</MicrosoftIORedistVersion>
4433
<MicrosoftVisualStudioOpenTelemetryVersion>0.2.104-beta</MicrosoftVisualStudioOpenTelemetryVersion>
34+
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
4535
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
4636
</PropertyGroup>
4737
<PropertyGroup>

‎src/MSBuild/app.amd64.config

+12-12
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939

4040
<dependentAssembly>
4141
<assemblyIdentity name="Microsoft.IO.Redist" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
42-
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="6.0.0.1" />
43-
<codeBase version="6.0.0.1" href="..\Microsoft.IO.Redist.dll"/>
42+
<bindingRedirect oldVersion="0.0.0.0-6.1.0.0" newVersion="6.1.0.0" />
43+
<codeBase version="6.1.0.0" href="..\Microsoft.IO.Redist.dll"/>
4444
</dependentAssembly>
4545

4646
<!-- Redirects for assemblies redistributed by MSBuild (in the .vsix). -->
@@ -94,8 +94,8 @@
9494
</dependentAssembly>
9595
<dependentAssembly>
9696
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
97-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
98-
<codeBase version="4.0.3.0" href="..\System.Buffers.dll"/>
97+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
98+
<codeBase version="4.0.4.0" href="..\System.Buffers.dll"/>
9999
</dependentAssembly>
100100

101101
<!-- Pull plugins that reference SCI up to our version in case they depended on our copy of the older version -->
@@ -190,13 +190,13 @@
190190
</dependentAssembly>
191191
<dependentAssembly>
192192
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
193-
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
194-
<codeBase version="4.0.1.2" href="..\System.Memory.dll"/>
193+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.2.0" />
194+
<codeBase version="4.0.2.0" href="..\System.Memory.dll"/>
195195
</dependentAssembly>
196196
<dependentAssembly>
197197
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
198-
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
199-
<codeBase version="4.1.4.0" href="..\System.Numerics.Vectors.dll"/>
198+
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
199+
<codeBase version="4.1.5.0" href="..\System.Numerics.Vectors.dll"/>
200200
</dependentAssembly>
201201
<dependentAssembly>
202202
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -215,8 +215,8 @@
215215
</dependentAssembly>
216216
<dependentAssembly>
217217
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
218-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
219-
<codeBase version="6.0.0.0" href="..\System.Runtime.CompilerServices.Unsafe.dll"/>
218+
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
219+
<codeBase version="6.0.1.0" href="..\System.Runtime.CompilerServices.Unsafe.dll"/>
220220
</dependentAssembly>
221221
<dependentAssembly>
222222
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -240,8 +240,8 @@
240240
</dependentAssembly>
241241
<dependentAssembly>
242242
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
243-
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
244-
<codeBase version="4.2.0.1" href="..\System.Threading.Tasks.Extensions.dll"/>
243+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
244+
<codeBase version="4.2.1.0" href="..\System.Threading.Tasks.Extensions.dll"/>
245245
</dependentAssembly>
246246
<dependentAssembly>
247247
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

‎src/MSBuild/app.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</dependentAssembly>
4646
<dependentAssembly>
4747
<assemblyIdentity name="Microsoft.IO.Redist" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
48-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
48+
<bindingRedirect oldVersion="0.0.0.0-6.1.0.0" newVersion="6.1.0.0" />
4949
</dependentAssembly>
5050
<dependentAssembly>
5151
<assemblyIdentity name="Microsoft.NET.StringTools" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -57,7 +57,7 @@
5757
</dependentAssembly>
5858
<dependentAssembly>
5959
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
60-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
60+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
6161
</dependentAssembly>
6262
<!-- Pull plugins that reference SCI up to our version in case they depended on our copy of the older version -->
6363
<dependentAssembly>
@@ -78,11 +78,11 @@
7878
</dependentAssembly>
7979
<dependentAssembly>
8080
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
81-
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
81+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
8282
</dependentAssembly>
8383
<dependentAssembly>
8484
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
85-
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
85+
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
8686
</dependentAssembly>
8787
<dependentAssembly>
8888
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -98,7 +98,7 @@
9898
</dependentAssembly>
9999
<dependentAssembly>
100100
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
101-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
101+
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
102102
</dependentAssembly>
103103
<dependentAssembly>
104104
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -114,7 +114,7 @@
114114
</dependentAssembly>
115115
<dependentAssembly>
116116
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
117-
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
117+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
118118
</dependentAssembly>
119119
<dependentAssembly>
120120
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

0 commit comments

Comments
 (0)