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

Merge release/dev17.8 to release/dev17.10 #10946

Merged
merged 5 commits into from
Oct 3, 2024
Merged

Merge release/dev17.8 to release/dev17.10 #10946

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
145be77
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 27, 2024
b6cd3f1
[release/dev17.8] Update dependencies from dotnet/arcade (#10936)
Cosifne Oct 1, 2024
f0c1086
Merge branch 'release/dev17.10' into merges/release/dev17.8-to-releas…
davidwengier Oct 2, 2024
0085e89
Update global.json
davidwengier Oct 2, 2024
3a46bd6
Apply suggestions from code review
davidwengier Oct 2, 2024
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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24470.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24475.3">
davidwengier marked this conversation as resolved.
Show resolved Hide resolved
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ff79f814c1cd7bcc9902fb713fe016e6534418b4</Sha>
<Sha>69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0</Sha>
davidwengier marked this conversation as resolved.
Show resolved Hide resolved
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24470.2">
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"rollForward": "latestPatch"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24470.2",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24475.3",
davidwengier marked this conversation as resolved.
Show resolved Hide resolved
"Microsoft.Build.NoTargets": "2.0.1"
}
}
Loading