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

[main] Update dependencies from dotnet/arcade #6972

Merged
merged 38 commits into from
Oct 31, 2023
Merged

[main] Update dependencies from dotnet/arcade #6972

merged 38 commits into from
Oct 31, 2023

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Oct 5, 2023 •
edited
Loading

This pull request updates the following dependencies

Coherency Updates

The following updates ensure that dependencies with a CoherentParentDependency
attribute were produced in a build used as input to the parent dependency's build.
See Dependency Description Format

  • Coherency Updates:
    • Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23426.1 to 1.0.0-beta.23525.5 (parent: Microsoft.DotNet.Arcade.Sdk)

From https://github.com/dotnet/arcade

  • Subscription: 76dfce4f-6528-42c1-dffb-08d8df7e96ad
  • Build: 20231031.1
  • Date Produced: October 31, 2023 7:59:49 AM UTC
  • Commit: 0ebe09a5ce6665a5fe1df1c644d4f77189c4deba
  • Branch: refs/heads/main
  • Updates to .NET SDKs:
    • Updates sdk.version to 8.0.100-rtm.23506.1
    • Updates tools.dotnet to 8.0.100-rtm.23506.1

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
aa8caad 
…004.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23504.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner October 5, 2023 12:09
github-actions[bot]
github-actions bot previously requested changes Oct 5, 2023
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This PR changes the .NET SDK version. Review required from @dotnet/roslyn-infrastructure-current-swat before merging.

dotnet-maestro bot added 26 commits October 6, 2023 12:10
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
37f734d 
…006.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
97a7f75 
…006.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
2bb1ddb 
…006.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
fc30165 
…008.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23508.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
c4b7091 
…010.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
4f6c9fb 
…010.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
b6fb44b 
…010.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
bf6f4cf 
…010.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
b83d5f0 
…010.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
82a157c 
…010.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
5817fde 
…010.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
e32e24e 
…016.5

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23516.5

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
2de746a 
…017.7

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23517.7

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
31547ac 
…017.7

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23517.7

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
cd7dc65 
…018.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
a13e007 
…018.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
8b19b81 
…018.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
a0181e8 
…018.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
6cebe87 
…018.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
91b5929 
…018.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
5a3052c 
…024.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23524.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
86ca771 
…025.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23525.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
8b7f910 
…027.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23527.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23525.5 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
e5ba302 
…027.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23527.3
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
f405501 
…027.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23527.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
4a7661a 
…028.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23528.2
ViktorHofer
ViktorHofer reviewed Oct 29, 2023
View reviewed changes
eng/Version.Details.xml Outdated
Comment on lines 30 to 34
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23525.5" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
<Sha>0140d3d4a520d602a0721422eb656b78f16b5fba</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
Copy link
Member

Choose a reason for hiding this comment

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

@carlossanlop I don't have permissions in this repository. Please update these lines similar to my comment in roslyn: https://github.com/dotnet/roslyn/pull/70597/files#r1375319003

Use the latest version and commit from the Arcade.Sdk entry above.

Copy link
Member

Choose a reason for hiding this comment

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

@Evangelink helped do it before I could. Thanks!

@ViktorHofer there is a blocking review by the bot. What do we do about it?

@ViktorHofer
Copy link
Member

What I mentioned offline is that we need to update to the Windows build pool that has the VS previews installed.

@Evangelink
Copy link
Member

Maybe there is also an update to do regarding the coherency bot check.

@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 30, 2023 •
edited
Loading

@carlossanlop / @Evangelink can you please update the windows VS pool in this repo so that we are on 17.8 Preview? Might be this line:

roslyn-analyzers/azure-pipelines.yml

Line 37 in 093570e

demands: ImageOverride -equals windows.vs2022.amd64.open

@Evangelink
Copy link
Member

I have pushed to use windows.vs2022preview.amd64.open

@codecov
Copy link

codecov bot commented Oct 30, 2023 •
edited
Loading

Codecov Report

Merging #6972 (9cf7d38) into main (cf0cf55) will decrease coverage by 0.01%.
Report is 3 commits behind head on main.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             main    #6972      +/-   ##
==========================================
- Coverage   96.42%   96.42%   -0.01%     
==========================================
  Files        1412     1412              
  Lines      336409   336432      +23     
  Branches    11115    11117       +2     
==========================================
+ Hits       324398   324418      +20     
- Misses       9208     9210       +2     
- Partials     2803     2804       +1

sharwell
sharwell previously requested changes Oct 30, 2023
View reviewed changes
global.json Outdated Show resolved Hide resolved
@carlossanlop carlossanlop requested a review from sharwell October 30, 2023 20:36
ViktorHofer
ViktorHofer reviewed Oct 30, 2023
View reviewed changes
global.json Outdated Show resolved Hide resolved
@Evangelink
Copy link
Member

@mavasani @sharwell It should be good to merge but I'll let you make the call.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
85b6c01 
…031.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23531.1
@mavasani mavasani dismissed stale reviews from sharwell and github-actions[bot] October 31, 2023 12:08

Stale

@mavasani mavasani enabled auto-merge October 31, 2023 12:08
@mavasani mavasani disabled auto-merge October 31, 2023 12:09
mavasani
mavasani reviewed Oct 31, 2023
View reviewed changes
global.json Outdated Show resolved Hide resolved
@Evangelink
Copy link
Member

@mavasani It should be good now :)

@mavasani
Copy link
Contributor

@mavasani It should be good now :)

@Evangelink will this take care of #2747 (comment)?

@Evangelink
Copy link
Member

@mavasani It should be good now :)

@Evangelink will this take care of #2747 (comment)?

Not sure entirely. I tried to git clean and build and I don't have the issue.

@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 31, 2023 •
edited
Loading

Note, the Validate coherency failing leg is a known issue: dotnet/arcade-services#3036

@carlossanlop
Copy link
Member

Both global.json entries are now pointing to rc2. Merging now.

@carlossanlop carlossanlop merged commit 36797a8 into main Oct 31, 2023
14 of 15 checks passed
@carlossanlop carlossanlop deleted the darc-main-26b612c3-8f00-4779-b975-ce5ca11f99d5 branch October 31, 2023 15:59
@carlossanlop carlossanlop mentioned this pull request Oct 31, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Evangelink Evangelink Evangelink approved these changes

@mavasani mavasani mavasani left review comments

@ViktorHofer ViktorHofer ViktorHofer approved these changes

@carlossanlop carlossanlop carlossanlop left review comments

@github-actions github-actions[bot] github-actions[bot] left review comments

@sharwell sharwell Awaiting requested review from sharwell

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ViktorHofer @Evangelink @mavasani @carlossanlop @sharwell