Skip to content

Commit

Permalink
[release/8.0.4xx] Update dependencies from dotnet/arcade (#20179)
Browse files Browse the repository at this point in the history
  • Loading branch information
v-wuzhai authored Oct 11, 2024
2 parents eb65f18 + 378036c commit df82c02
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 13 deletions.
50 changes: 48 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,35 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-10/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-8/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-7/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-8/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-10/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
Expand All @@ -25,11 +45,17 @@
<add key="darc-pub-DotNet-msbuild-Trusted-a69bbaa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a69bbaaf/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-81cabf2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-81cabf2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28-3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-aaee17e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-10/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-aaee17e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aaee17ef-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
Expand All @@ -50,19 +76,39 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-c2a4429-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-10" value="true" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-3" value="true" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-4" value="true" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-5" value="true" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-6" value="true" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-9" value="true" />
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-81cabf2" value="true" />
<add key="darc-int-dotnet-runtime-81cabf2-3" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-aaee17e-1" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-10" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-2" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-3" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-4" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-5" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-6" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e-9" value="true" />
<add key="darc-int-dotnet-sdk-aaee17e" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f655eec-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-10" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-4" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-5" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-6" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-7" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-8" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-9" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<!-- End: Package sources from dotnet-sdk -->
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -214,18 +214,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24504.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24504.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24508.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24504.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24508.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24504.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ function IsWindowsPlatform() {
}

function Get-Darc($version) {
$darcPath = "$TempDir\darc\$(New-Guid)"
$darcPath = "$TempDir\darc\$([guid]::NewGuid())"
if ($version -ne $null) {
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
} else {
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.108",
"dotnet": "8.0.110",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
Expand All @@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24504.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24508.1"
}
}

0 comments on commit df82c02

Please sign in to comment.