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 msbuild version to 17.3.4 #73283

Merged
merged 6 commits into from
May 14, 2024
Merged

Conversation

marcpopMSFT
Copy link
Member

No description provided.

@marcpopMSFT marcpopMSFT requested a review from a team as a code owner April 30, 2024 21:34
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead labels Apr 30, 2024
@dotnet-policy-service dotnet-policy-service bot added the Community The pull request was submitted by a contributor who is not a Microsoft employee. label Apr 30, 2024
@jaredpar
Copy link
Member

@marcpopMSFT you broke source build

@mthalman
Copy link
Member

mthalman commented May 6, 2024

This MSBuild version doesn't exist in nuget.org. Why is that?

@marcpopMSFT
Copy link
Member Author

@mthalman msbuild doesn't push every build to nuget.org but only on-demand (so usually only the .0 releases). I don't believe this version has even shipped in an SDK or VS yet (that should happen next week).

@marcpopMSFT
Copy link
Member Author

@mthalman I tried to update the source build reference package in this branch but darc failed. thoughts? First off, it seems this branch is using the 9.0 reference packages. Secondly, it appears to be expecting an additional set of dependencies in the version.details.xml file. I wanted to make sure I was doing the right thing her.

PS C:\repos\roslyn> darc update-dependencies --id 224796
Looking up build with BAR id 224796
Updating 'Microsoft.SourceBuild.Intermediate.source-build-reference-packages': '9.0.0-alpha.1.24161.2' => '8.0.0-alpha.1.24257.1' (from build '20240507.1' of 'https://github.com/dotnet/source-build-reference-packages')
Checking for coherency updates...
Coherency updates failed for the following dependencies:
  Unable to update Microsoft.SourceBuild.Intermediate.xliff-tasks to have coherency with Microsoft.DotNet.Arcade.Sdk: https://github.com/dotnet/arcade @ 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 does not contain dependency Microsoft.SourceBuild.Intermediate.xliff-tasks

@mthalman
Copy link
Member

mthalman commented May 7, 2024

@mthalman I tried to update the source build reference package in this branch but darc failed. thoughts? First off, it seems this branch is using the 9.0 reference packages. Secondly, it appears to be expecting an additional set of dependencies in the version.details.xml file. I wanted to make sure I was doing the right thing her.

PS C:\repos\roslyn> darc update-dependencies --id 224796
Looking up build with BAR id 224796
Updating 'Microsoft.SourceBuild.Intermediate.source-build-reference-packages': '9.0.0-alpha.1.24161.2' => '8.0.0-alpha.1.24257.1' (from build '20240507.1' of 'https://github.com/dotnet/source-build-reference-packages')
Checking for coherency updates...
Coherency updates failed for the following dependencies:
  Unable to update Microsoft.SourceBuild.Intermediate.xliff-tasks to have coherency with Microsoft.DotNet.Arcade.Sdk: https://github.com/dotnet/arcade @ 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 does not contain dependency Microsoft.SourceBuild.Intermediate.xliff-tasks

That error seems unrelated to the SBRP dependency. Is the Version.Details file already misconfigured in the repo currently?

You should just be able to apply the changes from #73325 to this branch.

@marcpopMSFT
Copy link
Member Author

You should just be able to apply the changes from #73325 to this branch.
I'm not sure that'll help as my changes were just merged today and were to the release/8 branch. I'll see if I can mess around with the version.details.xml and ping the first responders if I can't get it working.

Remove the xliff-tasks coherency as that dependency doesn't exist in arcade
@marcpopMSFT
Copy link
Member Author

Based on the error, I removed the coherency dependency as that allowed my darc command to run. Let's see if the build works.

@marcpopMSFT
Copy link
Member Author

@MichaelSimons the source build leg is now failing with even more listed prebuilts that have nothing to do with my change. I did move from the 9 to 8 source build package so I wonder if that's related. I think I need some help from source build folks at this point.

@marcpopMSFT marcpopMSFT requested a review from a team as a code owner May 13, 2024 17:33
@jaredpar jaredpar merged commit 9160b63 into dotnet:release/dev17.10 May 14, 2024
24 of 30 checks passed
@marcpopMSFT
Copy link
Member Author

/backport to main

@ericstj
Copy link
Member

ericstj commented May 16, 2024

@marcpopMSFT - I had a look at the package from this build and see it still reference the old version of PKCS:

"Microsoft.Build.Tasks.Core/17.3.4": {
  "dependencies": {
    "Microsoft.Build.Framework": "17.3.4",
    "Microsoft.Build.Utilities.Core": "17.3.4",
    "Microsoft.NET.StringTools": "17.3.4",
    "System.CodeDom": "7.0.0",
    "System.Collections.Immutable": "8.0.0",
    "System.Reflection.Metadata": "8.0.0",
    "System.Resources.Extensions": "8.0.0",
    "System.Security.Cryptography.Pkcs": "7.0.0",
    "System.Security.Cryptography.Xml": "7.0.1",
    "System.Security.Permissions": "8.0.0",
    "System.Threading.Tasks.Dataflow": "8.0.0"
  }
},

@marcpopMSFT
Copy link
Member Author

@ericstj per offline conversation, the xml version is pinned to 7.0.1 by CPM and that's bringing in the 7.0.0 pkcs. Here's one option for a fix. You mentioned it might be possible to fix in the sdk as well: #73515

@RikkiGibson
Copy link
Contributor

RikkiGibson commented May 16, 2024

/backport to main

Roslyn repo doesn't have this bot configured. We have an automatic job which merges the release branch forward. (though, tbh, maybe switching from doing that to using the bot would be a good thing for us.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-IDE Community The pull request was submitted by a contributor who is not a Microsoft employee. untriaged Issues and PRs which have not yet been triaged by a lead
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants