Skip to content

Commit de1eb8a

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20230819.1 (#50229)
[release/8.0] Update dependencies from dotnet/arcade
1 parent f40616f commit de1eb8a

File tree

6 files changed

+22
-17
lines changed

6 files changed

+22
-17
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>dda048454d7c52e545672150e80d2e9efc01b87f</Sha>
374374
</Dependency>
375-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
375+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23419.1">
376376
<Uri>https://github.com/dotnet/arcade</Uri>
377-
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
377+
<Sha>385129cbc980a515ddee2fa56f6b16f3183ed9bc</Sha>
378378
<SourceBuild RepoName="arcade" ManagedOnly="true" />
379379
</Dependency>
380-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23415.4">
380+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23419.1">
381381
<Uri>https://github.com/dotnet/arcade</Uri>
382-
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
382+
<Sha>385129cbc980a515ddee2fa56f6b16f3183ed9bc</Sha>
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23419.1">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
386+
<Sha>385129cbc980a515ddee2fa56f6b16f3183ed9bc</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
388+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23419.1">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
390+
<Sha>385129cbc980a515ddee2fa56f6b16f3183ed9bc</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
392+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23419.1">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
394+
<Sha>385129cbc980a515ddee2fa56f6b16f3183ed9bc</Sha>
395395
</Dependency>
396396
<Dependency Name="Microsoft.Extensions.Telemetry.Testing" Version="8.0.0-rc.2.23417.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.23415.4</MicrosoftDotNetBuildTasksInstallersVersion>
162-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
163-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
161+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23419.1</MicrosoftDotNetBuildTasksInstallersVersion>
162+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23419.1</MicrosoftDotNetBuildTasksTemplatingVersion>
163+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23419.1</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/native/init-compiler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
6363
# Set default versions
6464
if [ -z "$majorVersion" ]; then
6565
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
66-
if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
66+
if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
6767
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
6868

6969
for version in $versions; do

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function Install-VersionTools-Cli {
2525
Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
2626
$feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
2727

28-
$argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
28+
$argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed")
2929
Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
3030
}
3131

eng/common/templates/job/execute-sdl.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ jobs:
105105
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
106106
checkDownloadedFiles: true
107107

108+
- powershell: eng/common/sdl/trim-assets-version.ps1
109+
-InputPath $(Build.ArtifactStagingDirectory)\artifacts
110+
displayName: Trim the version from the NuGet packages
111+
continueOnError: ${{ parameters.sdlContinueOnError }}
112+
108113
- powershell: eng/common/sdl/extract-artifact-packages.ps1
109114
-InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
110115
-ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts

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.23415.4",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23419.1",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23419.1"
3232
}
3333
}

0 commit comments

Comments
 (0)