Skip to content

[release/7.0.1xx] Update dependencies to ensure coherency #14365

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

Merged
wtgodbe merged 3 commits into from
Aug 24, 2022
Merged

[release/7.0.1xx] Update dependencies to ensure coherency #14365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
832471b
Dependency coherency updates
dotnet-maestro[bot] Aug 22, 2022
ed93f5a
Resolve source-build patch conflict
MichaelSimons Aug 23, 2022
3883007
Merge branch 'release/7.0.1xx' of https://github.com/dotnet/installer…
Aug 24, 2022
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
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
<Sha>754d13817d834b716d339183e21aac7d2489c496</Sha>
Copy link
Member

@wtgodbe wtgodbe Aug 22, 2022

Choose a reason for hiding this comment

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

@mmitche why is it updating SHA but not version?

Copy link
Member

@mmitche mmitche Aug 22, 2022

Choose a reason for hiding this comment

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

The sha was incorrect: https://github.com/dotnet/runtime/blob/f52d8c59bb49360eb2cbeeb863c5856ebd62adda/eng/Version.Details.xml#L33

<SourceBuildTarball RepoName="llvm-project" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22422.12" CoherentParentDependency="Microsoft.NET.Sdk">
Expand Down
4 changes: 2 additions & 2 deletions ...ball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ index df77e9a199d6..19b99be1f71b 100644
+++ b/global.json
@@ -5,6 +5,6 @@
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22405.6",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22405.6",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3",
- "Microsoft.Build.Traversal": "2.0.2"
+ "Microsoft.Build.Traversal": "2.0.34"
}
Expand Down