Skip to content

Commit 442e254

Browse files
[main] Update dependencies from dotnet/arcade (#7695)
2 parents a4488a0 + 2c52f5c commit 442e254

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26204.1">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26208.3">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>1f7eece09d5c6fc2a1319d04f6ae4b7d18455e2d</Sha>
6+
<Sha>bebe22e46c55ad92df4f879c2de51d158927774a</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26204.1">
8+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26208.3">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>1f7eece09d5c6fc2a1319d04f6ae4b7d18455e2d</Sha>
10+
<Sha>bebe22e46c55ad92df4f879c2de51d158927774a</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26204.1">
12+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26208.3">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>1f7eece09d5c6fc2a1319d04f6ae4b7d18455e2d</Sha>
14+
<Sha>bebe22e46c55ad92df4f879c2de51d158927774a</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.7.0-preview.26201.1">
1717
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
88
</PropertyGroup>
99
<PropertyGroup Label="MSTest prod dependencies - darc updated">
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26204.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26208.3</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
1111
<MicrosoftTestingExtensionsCodeCoverageVersion>18.7.0-preview.26201.1</MicrosoftTestingExtensionsCodeCoverageVersion>
1212
<!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
1313
<MSTestVersion>4.3.0-preview.26203.3</MSTestVersion>

eng/common/tools.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,11 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
185185
if ((-not $globalJsonHasRuntimes) -and (-not [string]::IsNullOrEmpty($env:DOTNET_INSTALL_DIR)) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
186186
$dotnetRoot = $env:DOTNET_INSTALL_DIR
187187
} else {
188-
$dotnetRoot = Join-Path $RepoRoot '.dotnet'
188+
if (-not [string]::IsNullOrEmpty($env:DOTNET_GLOBAL_INSTALL_DIR)) {
189+
$dotnetRoot = $env:DOTNET_GLOBAL_INSTALL_DIR
190+
} else {
191+
$dotnetRoot = Join-Path $RepoRoot '.dotnet'
192+
}
189193

190194
if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) {
191195
if ($install) {

eng/common/tools.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,11 @@ function InitializeDotNetCli {
148148
if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
149149
dotnet_root="$DOTNET_INSTALL_DIR"
150150
else
151-
dotnet_root="${repo_root}.dotnet"
151+
if [[ -n "${DOTNET_GLOBAL_INSTALL_DIR:-}" ]]; then
152+
dotnet_root="$DOTNET_GLOBAL_INSTALL_DIR"
153+
else
154+
dotnet_root="${repo_root}.dotnet"
155+
fi
152156

153157
export DOTNET_INSTALL_DIR="$dotnet_root"
154158

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"runner": "Microsoft.Testing.Platform"
3838
},
3939
"msbuild-sdks": {
40-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26204.1",
40+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26208.3",
4141
"MSBuild.Sdk.Extras": "3.0.44"
4242
}
4343
}

0 commit comments

Comments
 (0)