Skip to content

Commit 2a60e81

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250716.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25325.4 -> To Version 9.0.0-beta.25366.1
1 parent eb8e854 commit 2a60e81

File tree

5 files changed

+22
-28
lines changed

5 files changed

+22
-28
lines changed

NuGet.config

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,21 @@
2424
<!-- Begin: Package sources from dotnet-aspire -->
2525
<!-- End: Package sources from dotnet-aspire -->
2626
<!-- Begin: Package sources from dotnet-emsdk -->
27-
<add key="darc-pub-dotnet-emsdk-b567cdb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b567cdb6/nuget/v3/index.json" />
2827
<!-- End: Package sources from dotnet-emsdk -->
2928
<!-- Begin: Package sources from dotnet-aspnetcore -->
30-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f6b3a5da/nuget/v3/index.json" />
3129
<!-- End: Package sources from dotnet-aspnetcore -->
3230
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3331
<add key="darc-pub-DotNet-msbuild-Trusted-9dcc26a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-9dcc26a5/nuget/v3/index.json" />
3432
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3533
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3634
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3735
<!-- Begin: Package sources from dotnet-runtime -->
38-
<add key="darc-int-dotnet-runtime-3c298d9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3c298d9f/nuget/v3/index.json" />
3936
<!-- End: Package sources from dotnet-runtime -->
4037
<!-- Begin: Package sources from dotnet-templating -->
4138
<add key="darc-pub-dotnet-templating-861f0ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-861f0ec-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-1/nuget/v3/index.json" />
4240
<!-- End: Package sources from dotnet-templating -->
4341
<!-- Begin: Package sources from dotnet-windowsdesktop -->
44-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bd9e6e96/nuget/v3/index.json" />
4542
<!-- End: Package sources from dotnet-windowsdesktop -->
4643
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4744
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -68,15 +65,12 @@
6865
<!-- Begin: Package sources from dotnet-templating -->
6966
<!-- End: Package sources from dotnet-templating -->
7067
<!-- Begin: Package sources from dotnet-aspnetcore -->
71-
<add key="darc-int-dotnet-aspnetcore-f6b3a5d" value="true" />
7268
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
7369
<!-- End: Package sources from DotNet-msbuild-Trusted -->
7470
<!-- End: Package sources from dotnet-aspnetcore -->
7571
<!-- Begin: Package sources from dotnet-runtime -->
76-
<add key="darc-int-dotnet-runtime-3c298d9" value="true" />
7772
<!-- End: Package sources from dotnet-runtime -->
7873
<!-- Begin: Package sources from dotnet-windowsdesktop -->
79-
<add key="darc-int-dotnet-windowsdesktop-bd9e6e9" value="true" />
8074
<!-- End: Package sources from dotnet-windowsdesktop -->
8175
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
8276
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25366.1">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
594+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25325.4">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25366.1">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
598+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25325.4">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25366.1">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
602+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25325.4">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25366.1">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
606+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25325.4">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25366.1">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
610+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25325.4">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25366.1">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
614+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25325.4">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25366.1">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
619+
<Sha>1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.7">

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25325.4</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25325.4</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25325.4</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25366.1</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25366.1</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25366.1</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

eng/common/tools.ps1

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

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

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25366.1",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)