Skip to content

Commit 6d82e84

Browse files
author
Mirroring
committed
Merge commit '673eb374a40ab16fd4cfefe913844ab1cd9ff803'
2 parents 78221f9 + 673eb37 commit 6d82e84

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25161.4">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25164.2">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
560+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25161.4">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25164.2">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
564+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25161.4">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25164.2">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
568+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25161.4">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25164.2">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
572+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25161.4">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25164.2">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
576+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25161.4">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25164.2">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
580+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25161.4">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25164.2">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
585+
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.4">
@@ -597,14 +597,14 @@
597597
<Uri>https://github.com/dotnet/arcade-services</Uri>
598598
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25112.2">
600+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25163.1">
601601
<Uri>https://github.com/dotnet/scenario-tests</Uri>
602-
<Sha>f219fd635f701e3142be92cb0bb4039cadb39d4d</Sha>
602+
<Sha>75f784a5484a2d4e00905069160954f686dcc8e3</Sha>
603603
</Dependency>
604604
<!-- Intermediate is necessary for source build. -->
605-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25112.2">
605+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25163.1">
606606
<Uri>https://github.com/dotnet/scenario-tests</Uri>
607-
<Sha>f219fd635f701e3142be92cb0bb4039cadb39d4d</Sha>
607+
<Sha>75f784a5484a2d4e00905069160954f686dcc8e3</Sha>
608608
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
609609
</Dependency>
610610
<!--

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
<PropertyGroup Label="Infrastructure and test only dependencies">
260260
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
261261
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
262-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25112.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
262+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25163.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
263263
</PropertyGroup>
264264
<PropertyGroup Label="Manually updated">
265265
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -268,10 +268,10 @@
268268
</PropertyGroup>
269269
<PropertyGroup>
270270
<!-- Dependencies from https://github.com/dotnet/arcade -->
271-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25161.4</MicrosoftDotNetSignToolVersion>
273-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25161.4</MicrosoftDotNetXliffTasksVersion>
274-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25161.4</MicrosoftDotNetXUnitExtensionsVersion>
271+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25164.2</MicrosoftDotNetSignToolVersion>
273+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25164.2</MicrosoftDotNetXliffTasksVersion>
274+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25164.2</MicrosoftDotNetXUnitExtensionsVersion>
275275
</PropertyGroup>
276276
<PropertyGroup>
277277
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎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
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25161.4",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25161.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25164.2",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)