Skip to content
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.

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

Update assembly versions to latest for packages that recently shipped #11038

Open
wants to merge 41 commits into
base: main
Choose a base branch
from

Conversation

ViktorHofer
Copy link
Member

@ViktorHofer ViktorHofer commented Nov 25, 2024

Microsoft.IO.Redist, System.Bufferes, 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.

This change will require coordination with VS. Even more importantly, this change also updates System.Memory which according to the documentation in Versions.props is a breaking change.

Microsoft.IO.Redist, System.Bufferes, 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.

This will require coordination with VS.
@ViktorHofer ViktorHofer requested a review from a team as a code owner November 25, 2024 19:38
@ViktorHofer
Copy link
Member Author

cc @carlossanlop @ericstj

@@ -39,8 +39,8 @@

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mind explaining what this does?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 99 upper bound doesn't seem right here; we need to do that for MSBuild versions but I don't think it's right for IO.Redist.

@ViktorHofer
Copy link
Member Author

@carlossanlop looks like we need to backport the new m-p packages from SBRP main to release/9.0 as msbuild uses SBRP 9.0.

Copy link
Member

@rainersigwald rainersigwald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs the same VS coordination as #11145, and I think we can slot it in right after that one (since @MarkOsborneMS has currently gotten that one working so it's first in line).

@@ -39,8 +39,8 @@

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 99 upper bound doesn't seem right here; we need to do that for MSBuild versions but I don't think it's right for IO.Redist.

ViktorHofer and others added 14 commits December 17, 2024 12:27
…: Build ID 10720707 (#11154)

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10720707

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10720707
The latest daily build of the .NET 10 SDK fails to build the msbuild
repo due to the following build error:

```
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(1330,41): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs(875,17): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(1437,57): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(1448,41): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(1584,17): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(1806,49): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(1879,21): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(1879,66): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(2483,44): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(2484,161): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(2493,169): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
/repos/dotnet/src/msbuild/src/Build/BackEnd/BuildManager/BuildManager.cs(2976,41): error CS0104: 'ExceptionHandling' is an ambiguous reference between 'Microsoft.Build.Shared.ExceptionHandling' and 'System.Runtime.ExceptionServices.ExceptionHandling' [/repos/dotnet/src/msbuild/src/Build/Microsoft.Build.csproj]
```

This is due to a conflict in a class name with a new public class from
runtime: dotnet/runtime#109806

Fixed by explicitly defining the namespace to use.

This was found as part of the work on
dotnet/sdk#45435.
…214.4 (#11151)

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.Net.Compilers.Toolset
 From Version 4.13.0-3.24607.3 -> To Version 4.13.0-3.24614.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
…6.13.0.95 (#11150)

NuGet.Build.Tasks
 From Version 6.13.0-rc.93 -> To Version 6.13.0-rc.95

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
* telemetry onepager

* update with comments and scope section

* update

* Update telemetry-onepager.md

---------

Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
Co-authored-by: Farhad Alizada <falizada@microsoft.com>
…ence-packages build 20241219.1 (#11176)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.24604.1 -> To Version 9.0.0-alpha.1.24619.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
A quick search of the SDK installation shows that all usages of this property use the 'Output' form, not 'OutPut'. This doesn't matter from a functionality perspective, but for consistency we should clean it up.
…6.13.0.105 (#11186)

NuGet.Build.Tasks
 From Version 6.13.0-rc.95 -> To Version 6.13.0-rc.105

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…6.13.0.106 (#11198)

NuGet.Build.Tasks
 From Version 6.13.0-rc.105 -> To Version 6.13.0-rc.106

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
YuliiaKovalova and others added 21 commits January 2, 2025 15:21
Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz>
* Add IntelliSense for testing properties

* Apply suggestions from code review

Co-authored-by: Amaury Levé <amauryleve@microsoft.com>

* Apply suggestions from code review

* Address review comments

* Apply suggestions from code review

Co-authored-by: Amaury Levé <amauryleve@microsoft.com>

* Fix type

---------

Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
* changing expander regex to use code generated version instead of compiled one where applicable

* review update
Fixes #10975

Context
The stop events didn't report success or failure.

Changes Made
Pass parameter currentTargetEntry.Result.ResultCode.ToString() to the event log
…c_Tests.Timeout (#9386)

Add more processes Logs for failed case Microsoft.Build.UnitTests.Exec_Tests.Timeout
To understand why the warning #9176 (comment) occurs
…223.3 (#11220)

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24572.2 -> To Version 9.0.0-beta.24623.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…6.13.0.108 (#11219)

NuGet.Build.Tasks
 From Version 6.13.0-rc.106 -> To Version 6.13.0-rc.108

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Enum.ToString method is resulting in slow performance. Fix it.

* implementing a review suggestion

* implementing a review comment
* Upgrade Microsoft.VisualStudio.SolutionPersistence to 1.0.28

* remove prebuilt exclusion

* Add prebuilt exclusion back
…: Build ID 10809797 (#11236)

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10789186

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10796413
* profiler was repeatedly complaining about ConcurrentDictionary.Count taking locks too often. This PR introduces an approximate counter to remedy that

* Update src/StringTools/WeakStringCache.Concurrent.cs

Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>

* adding comment based on a review

---------

Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
* Update dependencies from https://github.com/dotnet/roslyn build 20241229.5

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.Net.Compilers.Toolset
 From Version 4.13.0-3.24614.4 -> To Version 4.13.0-3.24629.5

* Update dependencies from https://github.com/dotnet/roslyn build 20250105.1

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.Net.Compilers.Toolset
 From Version 4.13.0-3.24614.4 -> To Version 4.13.0-3.25055.1

* Update dependencies from https://github.com/dotnet/roslyn build 20250106.2

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.Net.Compilers.Toolset
 From Version 4.13.0-3.24614.4 -> To Version 4.13.0-3.25056.2

* Update dependencies from https://github.com/dotnet/roslyn build 20250107.3

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.Net.Compilers.Toolset
 From Version 4.13.0-3.24614.4 -> To Version 4.13.0-3.25057.3

* Update Versions.props

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
* Update release-checklist.md

* Fix edit

* Update instructuins

* Add channel association

* Update steps

* Adjust the default channel association suggestions

* Remove obsolete

* Adjust based on feedback

---------

Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz>
@rainersigwald
Copy link
Member

@AArnott is interested in doing this in VS now and we're optimistic that it's not going to mess with #11145 so I'll pick this up.

@rainersigwald
Copy link
Member

Experimental insertion (by itself): https://devdiv.visualstudio.com/DevDiv/_git/VS/pullrequest/606809

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.