Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from dotnet/arcade #7296

Merged
merged 1 commit into from
Sep 10, 2024
Merged

[main] Update dependencies from dotnet/arcade #7296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>b4d9a1334d5189172977ba8fddd00bda70161e4a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24426.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24459.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
<Sha>e4f0d9916d3fee1f67a63345cdb8438ca3faeff8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24426.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24459.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
<Sha>e4f0d9916d3fee1f67a63345cdb8438ca3faeff8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24426.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24459.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
<Sha>e4f0d9916d3fee1f67a63345cdb8438ca3faeff8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24426.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24459.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
<Sha>e4f0d9916d3fee1f67a63345cdb8438ca3faeff8</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.103-servicing.24114.15">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>68e8abb1d3e1a240a6e4c29dcd220aae91681676</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24426.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24459.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
<Sha>e4f0d9916d3fee1f67a63345cdb8438ca3faeff8</Sha>
</Dependency>
<Dependency Name="Microsoft.FileFormats" Version="1.0.545601">
<Uri>https://github.com/dotnet/diagnostics</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
-->
<PropertyGroup Label="Automated">
<!-- dotnet/arcade references -->
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24426.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24426.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24426.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24459.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24459.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24459.4</MicrosoftDotNetXUnitExtensionsVersion>
<!-- dotnet/aspnetcore references -->
<MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.1</MicrosoftAspNetCoreAppRuntimewinx64Version>
<VSRedistCommonAspNetCoreSharedFrameworkx6480Version>8.0.1-servicing.23580.8</VSRedistCommonAspNetCoreSharedFrameworkx6480Version>
Expand Down
19 changes: 7 additions & 12 deletions eng/common/templates-official/steps/get-delegation-sas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,15 @@ steps:
scriptType: 'pscore'
scriptLocation: 'inlineScript'
inlineScript: |
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
# of correlation payloads. See https://github.com/dotnet/dnceng/issues/3484
$sas = ""
do {
# Calculate the expiration of the SAS token and convert to UTC
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
# Calculate the expiration of the SAS token and convert to UTC
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")

$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv

if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to generate SAS token."
exit 1
}
} while($sas.IndexOf('/') -ne -1)
if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to generate SAS token."
exit 1
}

if ('${{ parameters.base64Encode }}' -eq 'true') {
$sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas))
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24426.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24426.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24459.4",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24459.4"
}
}