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.

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

Jump to bottom

Upgrade MSBuildLocator ref from 1.6.1 to 1.6.10 #35662

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Upgrade MSBuildLocator ref from 1.6.1 to 1.6.10 #35662

merged 2 commits into from
Sep 25, 2023

Conversation

mthalman
Copy link
Member

This was missed as part of the set of changes to respond to the upgrade of Microsoft.Build.Locator to 1.6.10 in source-build: dotnet/source-build-externals#214

This is needed to allow source-build to work. Without it, it causes a version conflict between 1.6.1 and 1.6.10:

    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277: Found conflicts between different versions of "Microsoft.Build.Locator" that could not be resolved. [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277: There was a conflict between "Microsoft.Build.Locator, Version=1.0.0.0, Culture=neutral, PublicKeyToken=9dff12846e04bfbd" and "Microsoft.Build.Locator, Version=1.6.10.0, Culture=neutral, PublicKeyToken=9dff12846e04bfbd". [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277:     "Microsoft.Build.Locator, Version=1.0.0.0, Culture=neutral, PublicKeyToken=9dff12846e04bfbd" was chosen because it was primary and "Microsoft.Build.Locator, Version=1.6.10.0, Culture=neutral, PublicKeyToken=9dff12846e04bfbd" was not. [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277:     References which depend on "Microsoft.Build.Locator, Version=1.0.0.0, Culture=neutral, PublicKeyToken=9dff12846e04bfbd" [/vmr/src/sdk/artifacts/source-build/self/package-cache/microsoft.build.locator/1.6.1/lib/net6.0/Microsoft.Build.Locator.dll]. [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277:         /vmr/src/sdk/artifacts/source-build/self/package-cache/microsoft.build.locator/1.6.1/lib/net6.0/Microsoft.Build.Locator.dll [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277:           Project file item includes which caused reference "/vmr/src/sdk/artifacts/source-build/self/package-cache/microsoft.build.locator/1.6.1/lib/net6.0/Microsoft.Build.Locator.dll". [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277:             /vmr/src/sdk/artifacts/source-build/self/package-cache/microsoft.build.locator/1.6.1/lib/net6.0/Microsoft.Build.Locator.dll [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277:     References which depend on "Microsoft.Build.Locator, Version=1.6.10.0, Culture=neutral, PublicKeyToken=9dff12846e04bfbd" []. [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277:         /vmr/src/sdk/artifacts/source-build/self/package-cache/microsoft.codeanalysis.workspaces.msbuild/4.8.0-3.23471.10/lib/net8.0/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.dll [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277:           Project file item includes which caused reference "/vmr/src/sdk/artifacts/source-build/self/package-cache/microsoft.codeanalysis.workspaces.msbuild/4.8.0-3.23471.10/lib/net8.0/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.dll". [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277:             /vmr/src/sdk/artifacts/source-build/self/package-cache/microsoft.codeanalysis.workspaces.msbuild/4.8.0-3.23471.10/lib/net8.0/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.dll [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]
    /vmr/.dotnet/sdk/8.0.100-rc.1.23455.8/Microsoft.Common.CurrentVersion.targets(2364,5): error MSB3277:             /vmr/src/sdk/artifacts/source-build/self/package-cache/microsoft.codeanalysis.workspaces.msbuild/4.8.0-3.23471.10/lib/net8.0/Microsoft.CodeAnalysis.Workspaces.MSBuild.dll [/vmr/src/sdk/artifacts/source-build/self/src/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj]

@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Sep 22, 2023
@mthalman mthalman merged commit 80fa503 into dotnet:release/8.0.1xx-rc2 Sep 25, 2023
16 checks passed
@mthalman mthalman deleted the msbuildlocator branch September 25, 2023 13:47
@mthalman
Copy link
Member Author

/backport to release/8.0.1xx

@github-actions
Copy link
Contributor

Started backporting to release/8.0.1xx: https://github.com/dotnet/sdk/actions/runs/6300303248

@github-actions
Copy link
Contributor

@mthalman an error occurred while backporting to release/8.0.1xx, please check the run log for details!

Validation Failed: {"resource":"PullRequest","code":"custom","message":"No commits between release/8.0.1xx and backport/pr-35662-to-release/8.0.1xx"}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichaelSimons MichaelSimons MichaelSimons approved these changes

@rainersigwald rainersigwald Awaiting requested review from rainersigwald

Assignees
No one assigned
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mthalman @MichaelSimons