Skip to content

Commit b86599e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20230815.4 (#50113)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.23411.1 -> To Version 8.0.0-beta.23415.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 1d2c90a commit b86599e

8 files changed

+99
-22
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -372,26 +372,26 @@
372372
<Uri>https://github.com/dotnet/winforms</Uri>
373373
<Sha>6a40361221718044bc53066b05e886445becc710</Sha>
374374
</Dependency>
375-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
375+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
376376
<Uri>https://github.com/dotnet/arcade</Uri>
377-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
377+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
378378
<SourceBuild RepoName="arcade" ManagedOnly="true" />
379379
</Dependency>
380-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
380+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
381381
<Uri>https://github.com/dotnet/arcade</Uri>
382-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
382+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
386+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
388+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
390+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
392+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
394+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
395395
</Dependency>
396396
<Dependency Name="Microsoft.Extensions.Telemetry.Testing" Version="8.0.0-rc.1.23412.1">
397397
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@
158158
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
159159
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
160160
<!-- Packages from dotnet/arcade -->
161-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
162-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
163-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
161+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
162+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
163+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
164164
<!-- Packages from dotnet/source-build-externals -->
165165
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23410.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
166166
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/SetupNugetSources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ if ($dotnet31Source -ne $null) {
153153
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
154154
}
155155

156-
$dotnetVersions = @('5','6','7')
156+
$dotnetVersions = @('5','6','7','8')
157157

158158
foreach ($dotnetVersion in $dotnetVersions) {
159159
$feedPrefix = "dotnet" + $dotnetVersion;

‎eng/common/SetupNugetSources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then
105105
PackageSources+=('dotnet3.1-internal-transport')
106106
fi
107107

108-
DotNetVersions=('5' '6' '7')
108+
DotNetVersions=('5' '6' '7' '8')
109109

110110
for DotNetVersion in ${DotNetVersions[@]} ; do
111111
FeedPrefix="dotnet${DotNetVersion}";

‎eng/common/native/init-distro-rid.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ getNonPortableDistroRid()
7979
# Input:
8080
# os: (str)
8181
# arch: (str)
82-
# isPortable: (int)
8382
# rootfsDir?: (nullable:string)
8483
#
8584
# Return:
@@ -97,10 +96,9 @@ initDistroRidGlobal()
9796
{
9897
local targetOs="$1"
9998
local targetArch="$2"
100-
local isPortable="$3"
10199
local rootfsDir=""
102-
if [ "$#" -ge 4 ]; then
103-
rootfsDir="$4"
100+
if [ "$#" -ge 3 ]; then
101+
rootfsDir="$3"
104102
fi
105103

106104
if [ -n "${rootfsDir}" ]; then

‎eng/common/sdl/trim-assets-version.ps1

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<#
2+
.SYNOPSIS
3+
Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.
4+
5+
.PARAMETER InputPath
6+
Full path to directory where artifact packages are stored
7+
8+
.PARAMETER Recursive
9+
Search for NuGet packages recursively
10+
11+
#>
12+
13+
Param(
14+
[string] $InputPath,
15+
[bool] $Recursive = $true
16+
)
17+
18+
$CliToolName = "Microsoft.DotNet.VersionTools.Cli"
19+
20+
function Install-VersionTools-Cli {
21+
param(
22+
[Parameter(Mandatory=$true)][string]$Version
23+
)
24+
25+
Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
26+
$feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
27+
28+
$argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
29+
Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
30+
}
31+
32+
# -------------------------------------------------------------------
33+
34+
if (!(Test-Path $InputPath)) {
35+
Write-Host "Input Path '$InputPath' does not exist"
36+
ExitWithExitCode 1
37+
}
38+
39+
$ErrorActionPreference = 'Stop'
40+
Set-StrictMode -Version 2.0
41+
42+
$disableConfigureToolsetImport = $true
43+
$global:LASTEXITCODE = 0
44+
45+
# `tools.ps1` checks $ci to perform some actions. Since the SDL
46+
# scripts don't necessarily execute in the same agent that run the
47+
# build.ps1/sh script this variable isn't automatically set.
48+
$ci = $true
49+
. $PSScriptRoot\..\tools.ps1
50+
51+
try {
52+
$dotnetRoot = InitializeDotNetCli -install:$true
53+
$dotnet = "$dotnetRoot\dotnet.exe"
54+
55+
$toolsetVersion = Read-ArcadeSdkVersion
56+
Install-VersionTools-Cli -Version $toolsetVersion
57+
58+
$cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
59+
if ($null -eq $cliToolFound) {
60+
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
61+
ExitWithExitCode 1
62+
}
63+
64+
Exec-BlockVerbosely {
65+
& "$dotnet" $CliToolName trim-assets-version `
66+
--assets-path $InputPath `
67+
--recursive $Recursive
68+
Exit-IfNZEC "Sdl"
69+
}
70+
}
71+
catch {
72+
Write-Host $_
73+
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
74+
ExitWithExitCode 1
75+
}

‎eng/common/tools.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,14 +671,18 @@ function InitializeNativeTools() {
671671
}
672672
}
673673

674+
function Read-ArcadeSdkVersion() {
675+
return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
676+
}
677+
674678
function InitializeToolset() {
675679
if (Test-Path variable:global:_ToolsetBuildProj) {
676680
return $global:_ToolsetBuildProj
677681
}
678682

679683
$nugetCache = GetNuGetPackageCachePath
680684

681-
$toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
685+
$toolsetVersion = Read-ArcadeSdkVersion
682686
$toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"
683687

684688
if (Test-Path $toolsetLocationFile) {

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4"
3232
}
3333
}

0 commit comments

Comments
 (0)