Skip to content

Update to latest maintenance-packages #11655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ViktorHofer wants to merge 21 commits into from
Closed

Update to latest maintenance-packages #11655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f7ad583
Update to latest maintenance-packages
ViktorHofer Apr 1, 2025
93b0cd9
Merge branch 'main' into UpdateToLatestMaintenancePackages
ViktorHofer Apr 7, 2025
6fc59d1
Update binding redirects
ViktorHofer Apr 7, 2025
f56ea08
Update bindingRedirect comments in config files
ViktorHofer Apr 7, 2025
523d1a6
Keep conditionals
ViktorHofer Apr 7, 2025
7d717c8
Add condition to PropertyGroup in Versions.props
ViktorHofer Apr 7, 2025
6187f91
fiiiix
ViktorHofer Apr 7, 2025
9b71e92
Merge branch 'main' into UpdateToLatestMaintenancePackages
YuliiaKovalova Jul 8, 2025
317cfcf
Merge branch 'main' into UpdateToLatestMaintenancePackages
JanProvaznik Aug 18, 2025
039ec9a
fix merge
JanProvaznik Aug 18, 2025
9a5c180
Merge branch 'main' into UpdateToLatestMaintenancePackages
JanProvaznik Aug 19, 2025
e1e300d
Merge remote-tracking branch 'origin/main' into UpdateToLatestMainten…
YuliiaKovalova Feb 2, 2026
17a2723
add missed import
YuliiaKovalova Feb 2, 2026
c2ab908
cleanup
YuliiaKovalova Feb 3, 2026
5fa0afa
update binding redirects
YuliiaKovalova Feb 3, 2026
95b3ed9
update binding redirects
YuliiaKovalova Feb 3, 2026
fc10670
Update bindingRedirect and codeBase for System.Buffers
YuliiaKovalova Feb 4, 2026
eab4f1e
Update bindingRedirect for System.Buffers version
YuliiaKovalova Feb 4, 2026
88141dc
Update app.config
YuliiaKovalova Feb 4, 2026
c129e33
Update bindingRedirect and codeBase for System.Numerics.Vectors
YuliiaKovalova Feb 4, 2026
e39f4f6
Update Directory.Build.targets
YuliiaKovalova Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
<SystemThreadingTasksExtensionsVersion>4.6.3</SystemThreadingTasksExtensionsVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<MicrosoftIORedistVersion>6.1.0</MicrosoftIORedistVersion>
<!-- manually maintained versions -->
<MicrosoftIORedistVersion>6.1.3</MicrosoftIORedistVersion>
<!--
Modifying the version of System.Memory is very high impact and causes downstream breaks in third-party tooling that uses the MSBuild API.
As a result, we CONTINUE TO REFERENCE the old versions at build time, so those are the versions that get embedded into MSBuild assemblies.
Expand Down
6 changes: 3 additions & 3 deletions src/MSBuild/app.amd64.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@

<dependentAssembly>
<assemblyIdentity name="Microsoft.IO.Redist" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
<bindingRedirect oldVersion="0.0.0.0-6.1.0.0" newVersion="6.1.0.0" />
<codeBase version="6.1.0.0" href="..\Microsoft.IO.Redist.dll"/>
<bindingRedirect oldVersion="0.0.0.0-6.1.3.0" newVersion="6.1.3.0" />
<codeBase version="6.1.3.0" href="..\Microsoft.IO.Redist.dll"/>
</dependentAssembly>

<!-- Redirects for assemblies redistributed by MSBuild (in the .vsix). -->
Expand Down Expand Up @@ -167,7 +167,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<!-- It is unusual to redirect down, but in this case it's ok: 4.0.3.0 forwards
<!-- It is unusual to redirect down, but in this case it's ok: 4.0.5.0 forwards
to 4.0.0.0 in the GAC, so this just removes the need to redistribute a file
and makes that resolution faster. -->
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.0.0" />
Expand Down
6 changes: 3 additions & 3 deletions src/MSBuild/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="msbuildToolsets" type="Microsoft.Build.Evaluation.ToolsetConfigurationSection, Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
Expand Down Expand Up @@ -41,7 +41,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IO.Redist" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
<bindingRedirect oldVersion="0.0.0.0-6.1.0.0" newVersion="6.1.0.0" />
<bindingRedirect oldVersion="0.0.0.0-6.1.3.0" newVersion="6.1.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.NET.StringTools" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand Down Expand Up @@ -114,7 +114,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<!-- It is unusual to redirect down, but in this case it's ok: 4.0.3.0 forwards
<!-- It is unusual to redirect down, but in this case it's ok: 4.0.5.0 forwards
to 4.0.0.0 in the GAC, so this just removes the need to redistribute a file
and makes that resolution faster. -->
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.0.0" />
Expand Down