Skip to content

Commit 11e07bc

Browse files
v-wuzhaiv-wuzhai
authored
[release/8.0.4xx] Update dependencies from dotnet/arcade (#20303)
2 parents b580b56 + 6bc2412 commit 11e07bc

File tree

6 files changed

+23
-28
lines changed

6 files changed

+23
-28
lines changed

‎NuGet.config

+11-16
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<!-- End: Package sources from dotnet-aspnetcore -->
2121
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2222
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
23+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
24+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
2326
<!-- End: Package sources from dotnet-windowsdesktop -->
2427
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
2528
<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" />
@@ -29,14 +32,10 @@
2932
<add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
3033
<!-- End: Package sources from dotnet-runtime -->
3134
<!-- Begin: Package sources from dotnet-sdk -->
32-
<add key="darc-int-dotnet-sdk-55a73a0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e/nuget/v3/index.json" />
33-
<add key="darc-int-dotnet-sdk-55a73a0-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-7/nuget/v3/index.json" />
34-
<add key="darc-int-dotnet-sdk-55a73a0-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-6/nuget/v3/index.json" />
35-
<add key="darc-int-dotnet-sdk-55a73a0-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-5/nuget/v3/index.json" />
36-
<add key="darc-int-dotnet-sdk-55a73a0-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-4/nuget/v3/index.json" />
37-
<add key="darc-int-dotnet-sdk-55a73a0-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-3/nuget/v3/index.json" />
38-
<add key="darc-int-dotnet-sdk-55a73a0-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-2/nuget/v3/index.json" />
39-
<add key="darc-int-dotnet-sdk-55a73a0-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-1/nuget/v3/index.json" />
35+
<add key="darc-int-dotnet-sdk-f6ad34c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0/nuget/v3/index.json" />
36+
<add key="darc-int-dotnet-sdk-f6ad34c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-3/nuget/v3/index.json" />
37+
<add key="darc-int-dotnet-sdk-f6ad34c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-2/nuget/v3/index.json" />
38+
<add key="darc-int-dotnet-sdk-f6ad34c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f6ad34c0-1/nuget/v3/index.json" />
4039
<!-- End: Package sources from dotnet-sdk -->
4140
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4241
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -65,14 +64,10 @@
6564
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
6665
<!-- End: Package sources from dotnet-runtime -->
6766
<!-- Begin: Package sources from dotnet-sdk -->
68-
<add key="darc-int-dotnet-sdk-55a73a0-1" value="true" />
69-
<add key="darc-int-dotnet-sdk-55a73a0-2" value="true" />
70-
<add key="darc-int-dotnet-sdk-55a73a0-3" value="true" />
71-
<add key="darc-int-dotnet-sdk-55a73a0-4" value="true" />
72-
<add key="darc-int-dotnet-sdk-55a73a0-5" value="true" />
73-
<add key="darc-int-dotnet-sdk-55a73a0-6" value="true" />
74-
<add key="darc-int-dotnet-sdk-55a73a0-7" value="true" />
75-
<add key="darc-int-dotnet-sdk-55a73a0" value="true" />
67+
<add key="darc-int-dotnet-sdk-f6ad34c-1" value="true" />
68+
<add key="darc-int-dotnet-sdk-f6ad34c-2" value="true" />
69+
<add key="darc-int-dotnet-sdk-f6ad34c-3" value="true" />
70+
<add key="darc-int-dotnet-sdk-f6ad34c" value="true" />
7671
<!-- End: Package sources from dotnet-sdk -->
7772
<!-- Begin: Package sources from dotnet-windowsdesktop -->
7873
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />

‎eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,18 @@
214214
</Dependency>
215215
</ProductDependencies>
216216
<ToolsetDependencies>
217-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25064.11">
217+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
218218
<Uri>https://github.com/dotnet/arcade</Uri>
219-
<Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
219+
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
220220
<SourceBuild RepoName="arcade" ManagedOnly="true" />
221221
</Dependency>
222-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25064.11">
222+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25066.6">
223223
<Uri>https://github.com/dotnet/arcade</Uri>
224-
<Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
224+
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
225225
</Dependency>
226-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25064.11">
226+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25066.6">
227227
<Uri>https://github.com/dotnet/arcade</Uri>
228-
<Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
228+
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
229229
</Dependency>
230230
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
231231
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/arcade -->
42-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25064.11</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25066.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

‎eng/common/sdk-task.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
384384

385385
# If the version of msbuild is going to be xcopied,
386386
# use this version. Version matches a package here:
387-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
388-
$defaultXCopyMSBuildVersion = '17.8.1-2'
387+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0
388+
$defaultXCopyMSBuildVersion = '17.12.0'
389389

390390
if (!$vsRequirements) {
391391
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cmake": "3.21.0"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11",
15-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25064.11"
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6",
15+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25066.6"
1616
}
1717
}

0 commit comments

Comments
 (0)