Skip to content

Commit 15adb0b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250314.2 (#6131)
[main] Update dependencies from dotnet/arcade - Merge branch 'main' into darc-main-289350a0-a0a2-46cd-9ff0-6b70b2a619ee
1 parent 5310768 commit 15adb0b

File tree

6 files changed

+13
-29
lines changed

6 files changed

+13
-29
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
7-
<add key="darc-int-dotnet-aspnetcore-b96167f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b96167fb-2/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-aspnetcore -->
98
<!-- Begin: Package sources from dotnet-efcore -->
10-
<add key="darc-int-dotnet-efcore-68c7e19" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-68c7e194/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-efcore-68c7e19-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-68c7e194-2/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-efcore-68c7e19-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-68c7e194-1/nuget/v3/index.json" />
139
<!-- End: Package sources from dotnet-efcore -->
1410
<!-- Begin: Package sources from dotnet-runtime -->
15-
<add key="darc-int-dotnet-runtime-831d23e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-runtime-831d23e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-2/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-runtime-831d23e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-1/nuget/v3/index.json" />
1811
<!-- End: Package sources from dotnet-runtime -->
1912
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2013
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
@@ -50,17 +43,10 @@
5043
<disabledPackageSources>
5144
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
5245
<!-- Begin: Package sources from dotnet-aspnetcore -->
53-
<add key="darc-int-dotnet-aspnetcore-b96167f-2" value="true" />
5446
<!-- Begin: Package sources from dotnet-efcore -->
55-
<add key="darc-int-dotnet-efcore-68c7e19-1" value="true" />
56-
<add key="darc-int-dotnet-efcore-68c7e19-2" value="true" />
57-
<add key="darc-int-dotnet-efcore-68c7e19" value="true" />
5847
<!-- End: Package sources from dotnet-efcore -->
5948
<!-- End: Package sources from dotnet-aspnetcore -->
6049
<!-- Begin: Package sources from dotnet-runtime -->
61-
<add key="darc-int-dotnet-runtime-831d23e-1" value="true" />
62-
<add key="darc-int-dotnet-runtime-831d23e-2" value="true" />
63-
<add key="darc-int-dotnet-runtime-831d23e" value="true" />
6450
<!-- End: Package sources from dotnet-runtime -->
6551
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6652
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,17 +194,17 @@
194194
</Dependency>
195195
</ProductDependencies>
196196
<ToolsetDependencies>
197-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25161.4">
197+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25164.2">
198198
<Uri>https://github.com/dotnet/arcade</Uri>
199-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
199+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
200200
</Dependency>
201-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25161.4">
201+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25164.2">
202202
<Uri>https://github.com/dotnet/arcade</Uri>
203-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
203+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
204204
</Dependency>
205-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25161.4">
205+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25164.2">
206206
<Uri>https://github.com/dotnet/arcade</Uri>
207-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
207+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
208208
</Dependency>
209209
</ToolsetDependencies>
210210
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<!-- Dependencies from https://github.com/dotnet/efcore -->
7878
<MicrosoftEntityFrameworkCoreSqliteVersion>9.0.3</MicrosoftEntityFrameworkCoreSqliteVersion>
7979
<!-- Dependencies from https://github.com/dotnet/arcade -->
80-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksTemplatingVersion>
80+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksTemplatingVersion>
8181
</PropertyGroup>
8282
<PropertyGroup Label="No longer automated Maestro dependency updates">
8383
<!-- Packages from dotnet/runtime -->
@@ -146,7 +146,6 @@
146146
<!-- Compatibility with VS 17.8/.NET SDK 8.0.1xx -->
147147
<MicrosoftCodeAnalysisVersion>4.8.0</MicrosoftCodeAnalysisVersion>
148148
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
149-
150149
<!-- AI templates -->
151150
<AzureAIProjectsVersion>1.0.0-beta.3</AzureAIProjectsVersion>
152151
<AzureAIOpenAIVersion>2.2.0-beta.1</AzureAIOpenAIVersion>
@@ -158,7 +157,6 @@
158157
<OpenAIVersion>2.2.0-beta.1</OpenAIVersion>
159158
<PdfPigVersion>0.1.9</PdfPigVersion>
160159
<SystemLinqAsyncVersion>6.0.1</SystemLinqAsyncVersion>
161-
162160
<!--
163161
xUnit version is configured by the Arcade SDK.
164162
https://github.com/dotnet/arcade/blob/f5a7c5d5c56197b09715dece7541ca06beb94eb0/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnit/XUnit.targets#L9

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
4343

4444
# Enable repos to use a particular version of the on-line dotnet-install scripts.
45-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
45+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
4646
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
4747

4848
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
265+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266266

267267
Retry({
268268
Write-Host "GET $uri"

‎eng/common/tools.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
5454
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
5555

5656
# Enable repos to use a particular version of the on-line dotnet-install scripts.
57-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
57+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
5858
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5959

6060
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -295,7 +295,7 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
298+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
299299

300300
if [[ ! -a "$install_script" ]]; then
301301
mkdir -p "$root"

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"msbuild-sdks": {
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.2.0",
21-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25161.4",
22-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25161.4"
21+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2",
22+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25164.2"
2323
}
2424
}

0 commit comments

Comments
 (0)