Skip to content

Commit b5a0345

Browse files
dotnet-maestro[bot]carlossanlop
dotnet-maestro[bot]
and
carlossanlop
authored
Update dependencies from https://github.com/dotnet/arcade build 20230815.4 (#90665)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23411.1 -> To Version 8.0.0-beta.23415.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23408.1 -> To Version 1.0.0-beta.23415.1 (parent: Microsoft.DotNet.Arcade.Sdk Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
1 parent f84caca commit b5a0345

File tree

8 files changed

+145
-68
lines changed

8 files changed

+145
-68
lines changed

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -107,79 +107,79 @@
107107
</Dependency>
108108
</ProductDependencies>
109109
<ToolsetDependencies>
110-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
110+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
112+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
113113
<SourceBuild RepoName="arcade" ManagedOnly="true" />
114114
</Dependency>
115-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
115+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23415.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
116116
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
117-
<Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
117+
<Sha>649a1e75101b701d753ee41efbe9038f9b23a0db</Sha>
118118
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
119119
</Dependency>
120-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
120+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
121121
<Uri>https://github.com/dotnet/arcade</Uri>
122-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
122+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23411.1">
124+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23415.4">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
126+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
128+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
130+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
132+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
134+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23411.1">
136+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23415.4">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
138+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
140+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
142+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23411.1">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23415.4">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
146+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
150+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23411.1">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
154+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23411.1">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23415.4">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
158+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23411.1">
160+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23415.4">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
162+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23411.1">
164+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23415.4">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
166+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
168+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
170+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
172+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
174+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
176+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
178+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
180+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
182+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
183183
</Dependency>
184184
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23408.1">
185185
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -330,9 +330,9 @@
330330
<Uri>https://github.com/dotnet/xharness</Uri>
331331
<Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
332332
</Dependency>
333-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23411.1">
333+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23415.4">
334334
<Uri>https://github.com/dotnet/arcade</Uri>
335-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
335+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
336336
</Dependency>
337337
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
338338
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,21 @@
8585
<!-- SDK dependencies -->
8686
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsVersion>
93-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23411.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
94-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
95-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
96-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksPackagingVersion>
97-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
98-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksTemplatingVersion>
99-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
100-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
101-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
102-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23411.1</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23415.4</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsVersion>
93+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23415.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
94+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
95+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
96+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksPackagingVersion>
97+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
98+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
99+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
100+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
101+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
102+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23415.4</MicrosoftDotNetPackageTestingVersion>
103103
<!-- NuGet dependencies -->
104104
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
105105
<!-- Installer dependencies -->

‎eng/common/SetupNugetSources.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
33
#
44
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
5-
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
5+
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
66
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
77
#
88
# This script needs to be called in every job that will restore packages and which the base repo has
@@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0
3737
# Add source entry to PackageSources
3838
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
3939
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
40-
40+
4141
if ($packageSource -eq $null)
4242
{
4343
$packageSource = $doc.CreateElement("add")
@@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
4848
else {
4949
Write-Host "Package source $SourceName already present."
5050
}
51-
51+
5252
AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
5353
}
5454

@@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
8989
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
9090

9191
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
92-
92+
9393
ForEach ($PackageSource in $maestroPrivateSources) {
9494
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
9595
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password

‎eng/common/SetupNugetSources.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
55
#
66
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
7-
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
7+
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
88
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
99
#
1010
# This script needs to be called in every job that will restore packages and which the base repo has
@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
6868
sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
6969
fi
7070

71-
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
71+
# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
7272
grep -i "<packageSourceCredentials>" $ConfigFile
7373
if [ "$?" != "0" ]; then
7474
echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
@@ -142,7 +142,7 @@ IFS=$PrevIFS
142142

143143
for FeedName in ${PackageSources[@]} ; do
144144
# Check if there is no existing credential for this FeedName
145-
grep -i "<$FeedName>" $ConfigFile
145+
grep -i "<$FeedName>" $ConfigFile
146146
if [ "$?" != "0" ]; then
147147
echo "Adding credentials for $FeedName."
148148

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "8.0.100-preview.7.23376.3"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"

0 commit comments

Comments
 (0)