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 #42900

Merged
merged 7 commits into from
Aug 29, 2024
Merged

[main] Update dependencies from dotnet/arcade #42900

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8971ff7
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 21, 2024
3e8def4
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 21, 2024
9957f89
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-a…
v-wuzhai Aug 22, 2024
2ad1961
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 22, 2024
8d8bc6c
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 24, 2024
e4e91f8
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 27, 2024
ccc8cdb
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-a…
v-wuzhai Aug 28, 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
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,34 +585,34 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24416.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24421.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
<Sha>9b24668b7196b9639e60770465683cf81465d89a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24416.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24421.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
<Sha>9b24668b7196b9639e60770465683cf81465d89a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24416.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24421.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
<Sha>9b24668b7196b9639e60770465683cf81465d89a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24416.2">
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24421.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
<Sha>9b24668b7196b9639e60770465683cf81465d89a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24416.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24421.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
<Sha>9b24668b7196b9639e60770465683cf81465d89a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24416.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24421.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
<Sha>9b24668b7196b9639e60770465683cf81465d89a</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24416.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24421.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
<Sha>9b24668b7196b9639e60770465683cf81465d89a</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-rc.1.24414.5">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24416.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24416.2</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24416.2</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24416.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24421.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24421.2</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24421.2</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24421.2</MicrosoftDotNetXUnitExtensionsVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
}

$dotnetVersions = @('5','6','7','8')
$dotnetVersions = @('5','6','7','8','9')

foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
PackageSources+=('dotnet3.1-internal-transport')
fi

DotNetVersions=('5' '6' '7' '8')
DotNetVersions=('5' '6' '7' '8' '9')

for DotNetVersion in ${DotNetVersions[@]} ; do
FeedPrefix="dotnet${DotNetVersion}";
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24416.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24416.2",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24421.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
}
Expand Down
Loading