Skip to content

Commit 3254411

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/8.0-rc1] Update dependencies from dotnet/arcade (#3797)
Update dependencies from https://github.com/dotnet/arcade build 20230815.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks 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 0c003a1 commit 3254411

File tree

8 files changed

+102
-25
lines changed

8 files changed

+102
-25
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,29 +151,29 @@
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>
154-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
154+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
155155
<Uri>https://github.com/dotnet/arcade</Uri>
156-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
156+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23411.1">
158+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23415.4">
159159
<Uri>https://github.com/dotnet/arcade</Uri>
160-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
160+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23411.1">
162+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23415.4">
163163
<Uri>https://github.com/dotnet/arcade</Uri>
164-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
164+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23411.1">
166+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23415.4">
167167
<Uri>https://github.com/dotnet/arcade</Uri>
168-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
168+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
170+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
171171
<Uri>https://github.com/dotnet/arcade</Uri>
172-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
172+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23411.1">
174+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23415.4">
175175
<Uri>https://github.com/dotnet/arcade</Uri>
176-
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
176+
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
177177
</Dependency>
178178
</ToolsetDependencies>
179179
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<!-- arcade -->
14-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
15-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksArchivesVersion>
16-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersVersion>
17-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23411.1</MicrosoftDotNetVersionToolsTasksVersion>
14+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksFeedVersion>
15+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksArchivesVersion>
16+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
17+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23415.4</MicrosoftDotNetVersionToolsTasksVersion>
1818
<!-- corefx -->
1919
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
2020
<SystemDataSqlClientVersion>4.8.5</SystemDataSqlClientVersion>

‎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
@@ -3,8 +3,8 @@
33
"dotnet": "8.0.100-preview.7.23376.3"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23411.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4",
88
"Microsoft.Build.NoTargets": "3.7.0",
99
"Microsoft.Build.Traversal": "3.4.0"
1010
}

0 commit comments

Comments
 (0)