Skip to content

Commit 7745abb

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20230817.3 (#31506)
[release/8.0] Update dependencies from dotnet/arcade
1 parent 8025b1c commit 7745abb

File tree

6 files changed

+16
-11
lines changed

6 files changed

+16
-11
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@
5656
</Dependency>
5757
</ProductDependencies>
5858
<ToolsetDependencies>
59-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
59+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23417.3">
6060
<Uri>https://github.com/dotnet/arcade</Uri>
61-
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
61+
<Sha>7837a0b504ed9a598daebd50f20520ccda5fe2b1</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
63+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23417.3">
6464
<Uri>https://github.com/dotnet/arcade</Uri>
65-
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
65+
<Sha>7837a0b504ed9a598daebd50f20520ccda5fe2b1</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
67+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23417.3">
6868
<Uri>https://github.com/dotnet/arcade</Uri>
69-
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
69+
<Sha>7837a0b504ed9a598daebd50f20520ccda5fe2b1</Sha>
7070
</Dependency>
7171
</ToolsetDependencies>
7272
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-rc.1.23402.2</MicrosoftNETCoreBrowserDebugHostTransportVersion>
3232
</PropertyGroup>
3333
<PropertyGroup Label="Dependencies from dotnet/arcade">
34-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
34+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23417.3</MicrosoftDotNetBuildTasksTemplatingVersion>
3535
</PropertyGroup>
3636
<PropertyGroup Label="Other dependencies">
3737
<!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->

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
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
17-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4"
16+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23417.3",
17+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23417.3"
1818
}
1919
}

0 commit comments

Comments
 (0)