Skip to content

Commit 81782d5

Browse files
SimonZhao888SimonZhao888
authored
[release/8.0.4xx] Update dependencies from dotnet/arcade (#20504)
2 parents 0010c21 + fcbbec9 commit 81782d5

5 files changed

Lines changed: 10 additions & 27 deletions

File tree

‎NuGet.config‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,16 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-emsdk -->
10-
<add key="darc-pub-dotnet-emsdk-976b101" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-976b101e/nuget/v3/index.json" />
11-
<add key="darc-pub-dotnet-emsdk-976b101-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-976b101e-1/nuget/v3/index.json" />
1210
<!-- End: Package sources from dotnet-emsdk -->
1311
<!-- Begin: Package sources from dotnet-aspnetcore -->
14-
<add key="darc-int-dotnet-aspnetcore-cea5fa6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cea5fa61/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-aspnetcore-cea5fa6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cea5fa61-1/nuget/v3/index.json" />
1612
<!-- End: Package sources from dotnet-aspnetcore -->
1713
<!-- Begin: Package sources from dotnet-windowsdesktop -->
18-
<add key="darc-int-dotnet-windowsdesktop-c4a3ad7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a3ad74/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-windowsdesktop-c4a3ad7-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a3ad74-1/nuget/v3/index.json" />
2014
<!-- End: Package sources from dotnet-windowsdesktop -->
2115
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
22-
<add key="darc-pub-DotNet-msbuild-Trusted-bb7294f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bb7294f7-1/nuget/v3/index.json" />
2316
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2417
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-ef853a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-runtime-ef853a7-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71-1/nuget/v3/index.json" />
2718
<!-- End: Package sources from dotnet-runtime -->
2819
<!-- Begin: Package sources from dotnet-sdk -->
29-
<add key="darc-int-dotnet-sdk-8192651" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8192651b/nuget/v3/index.json" />
3020
<!-- End: Package sources from dotnet-sdk -->
3121
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3222
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -45,21 +35,14 @@
4535
<disabledPackageSources>
4636
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4737
<!-- Begin: Package sources from dotnet-aspnetcore -->
48-
<add key="darc-int-dotnet-aspnetcore-cea5fa6-1" value="true" />
49-
<add key="darc-int-dotnet-aspnetcore-cea5fa6" value="true" />
5038
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
5139
<!-- End: Package sources from DotNet-msbuild-Trusted -->
5240
<!-- End: Package sources from dotnet-aspnetcore -->
5341
<!-- Begin: Package sources from dotnet-runtime -->
54-
<add key="darc-int-dotnet-runtime-ef853a7-1" value="true" />
55-
<add key="darc-int-dotnet-runtime-ef853a7" value="true" />
5642
<!-- End: Package sources from dotnet-runtime -->
5743
<!-- Begin: Package sources from dotnet-sdk -->
58-
<add key="darc-int-dotnet-sdk-8192651" value="true" />
5944
<!-- End: Package sources from dotnet-sdk -->
6045
<!-- Begin: Package sources from dotnet-windowsdesktop -->
61-
<add key="darc-int-dotnet-windowsdesktop-c4a3ad7-1" value="true" />
62-
<add key="darc-int-dotnet-windowsdesktop-c4a3ad7" value="true" />
6346
<!-- End: Package sources from dotnet-windowsdesktop -->
6447
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6548
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
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.25326.1">
217+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25366.2">
218218
<Uri>https://github.com/dotnet/arcade</Uri>
219-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
219+
<Sha>a73c08ec0de5a6e5e2a8668837df67edecb3a3da</Sha>
220220
<SourceBuild RepoName="arcade" ManagedOnly="true" />
221221
</Dependency>
222-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25326.1">
222+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25366.2">
223223
<Uri>https://github.com/dotnet/arcade</Uri>
224-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
224+
<Sha>a73c08ec0de5a6e5e2a8668837df67edecb3a3da</Sha>
225225
</Dependency>
226-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25326.1">
226+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25366.2">
227227
<Uri>https://github.com/dotnet/arcade</Uri>
228-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
228+
<Sha>a73c08ec0de5a6e5e2a8668837df67edecb3a3da</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‎

Lines changed: 1 addition & 1 deletion
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.25326.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25366.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
417417

418418
# Locate Visual Studio installation or download x-copy msbuild.
419419
$vsInfo = LocateVisualStudio $vsRequirements
420-
if ($vsInfo -ne $null) {
420+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
421421
# Ensure vsInstallDir has a trailing slash
422422
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
423423
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

‎global.json‎

Lines changed: 2 additions & 2 deletions
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.25326.1",
15-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25326.1"
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2",
15+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25366.2"
1616
}
1717
}

0 commit comments

Comments
 (0)