Skip to content

Commit c646e20

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210302.1 (#30738)
[main] Update dependencies from dotnet/arcade
1 parent 4fd3691 commit c646e20

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -312,17 +312,17 @@
312312
<Uri>https://github.com/dotnet/runtime</Uri>
313313
<Sha>3e21dfcc41407fb34e9e2ea9ba7630d519a2c36b</Sha>
314314
</Dependency>
315-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21125.5">
315+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21152.1">
316316
<Uri>https://github.com/dotnet/arcade</Uri>
317-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
317+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
318318
</Dependency>
319-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21125.5">
319+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21152.1">
320320
<Uri>https://github.com/dotnet/arcade</Uri>
321-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
321+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
322322
</Dependency>
323-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21125.5">
323+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21152.1">
324324
<Uri>https://github.com/dotnet/arcade</Uri>
325-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
325+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
326326
</Dependency>
327327
</ToolsetDependencies>
328328
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.3.21159.2</MicrosoftEntityFrameworkCoreVersion>
142142
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.3.21159.2</MicrosoftEntityFrameworkCoreDesignVersion>
143143
<!-- Packages from dotnet/arcade -->
144-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21125.5</MicrosoftDotNetBuildTasksInstallersVersion>
144+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21152.1</MicrosoftDotNetBuildTasksInstallersVersion>
145145
</PropertyGroup>
146146
<!--
147147

‎eng/common/cross/armel/tizen-fetch.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ fetch_tizen_pkgs()
157157
Inform "Initialize arm base"
158158
fetch_tizen_pkgs_init standard base
159159
Inform "fetch common packages"
160-
fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
160+
fetch_tizen_pkgs armv7l gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
162162
fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
163163
Inform "fetch corefx packages"

‎eng/common/templates/steps/perf-send-to-helix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ parameters:
1111
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
1212
CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload
1313
IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
14-
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
15-
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
14+
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases.json
15+
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases.json
1616
EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control
1717
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
1818
Creator: '' # optional -- if the build is external, use this to specify who is sending the job

‎eng/common/templates/steps/send-to-helix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ parameters:
1818
XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner
1919
XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects
2020
IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
21-
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json
22-
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json
21+
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
22+
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
2323
EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control
2424
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
2525
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
141141

142142
# Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version,
143143
# otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues.
144-
if ((-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
144+
if ((-not $globalJsonHasRuntimes) -and (-not [string]::IsNullOrEmpty($env:DOTNET_INSTALL_DIR)) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
145145
$dotnetRoot = $env:DOTNET_INSTALL_DIR
146146
} else {
147147
$dotnetRoot = Join-Path $RepoRoot '.dotnet'

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.22.10",
33-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21125.5",
34-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21125.5"
33+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21152.1",
34+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21152.1"
3535
}
3636
}

0 commit comments

Comments
 (0)