diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca3a444f8c..6a673496ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml index d2901470a7..9db5617ea7 100644 --- a/eng/common/core-templates/steps/get-delegation-sas.yml +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -31,7 +31,16 @@ steps: # 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 + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $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." diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 3d16b41c78..605692d2fb 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,6 +1,7 @@ parameters: # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 07d317bf8f..d1aeb92fce 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -4,6 +4,7 @@ parameters: componentGovernanceIgnoreDirectories: '' # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9574f4eb9d..22954477a5 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -900,7 +900,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index c9e1729d2d..0a10dfa31b 100644 --- a/global.json +++ b/global.json @@ -1,14 +1,14 @@ { "sdk": { - "version": "9.0.100-preview.7.24407.12", + "version": "9.0.100-rc.2.24474.11", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.100-preview.7.24407.12" + "dotnet": "9.0.100-rc.2.24474.11" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24453.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } diff --git a/src/System.Runtime.TimeZoneData/System.Runtime.TimeZoneData.csproj b/src/System.Runtime.TimeZoneData/System.Runtime.TimeZoneData.csproj index 9684ab2089..73d06beab9 100644 --- a/src/System.Runtime.TimeZoneData/System.Runtime.TimeZoneData.csproj +++ b/src/System.Runtime.TimeZoneData/System.Runtime.TimeZoneData.csproj @@ -1,6 +1,6 @@ - 2024a + 2024b $([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'timezonedata')) $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)', 'data')) slim diff --git a/src/System.Runtime.TimeZoneData/data/Africa/Blantyre b/src/System.Runtime.TimeZoneData/data/Africa/Blantyre index 651e5cf67a..581bb0e08b 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Africa/Blantyre and b/src/System.Runtime.TimeZoneData/data/Africa/Blantyre differ diff --git a/src/System.Runtime.TimeZoneData/data/Africa/Bujumbura b/src/System.Runtime.TimeZoneData/data/Africa/Bujumbura index 651e5cf67a..581bb0e08b 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Africa/Bujumbura and b/src/System.Runtime.TimeZoneData/data/Africa/Bujumbura differ diff --git a/src/System.Runtime.TimeZoneData/data/Africa/Gaborone b/src/System.Runtime.TimeZoneData/data/Africa/Gaborone index 651e5cf67a..581bb0e08b 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Africa/Gaborone and b/src/System.Runtime.TimeZoneData/data/Africa/Gaborone differ diff --git a/src/System.Runtime.TimeZoneData/data/Africa/Harare b/src/System.Runtime.TimeZoneData/data/Africa/Harare index 651e5cf67a..581bb0e08b 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Africa/Harare and b/src/System.Runtime.TimeZoneData/data/Africa/Harare differ diff --git a/src/System.Runtime.TimeZoneData/data/Africa/Kigali b/src/System.Runtime.TimeZoneData/data/Africa/Kigali index 651e5cf67a..581bb0e08b 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Africa/Kigali and b/src/System.Runtime.TimeZoneData/data/Africa/Kigali differ diff --git a/src/System.Runtime.TimeZoneData/data/Africa/Lubumbashi b/src/System.Runtime.TimeZoneData/data/Africa/Lubumbashi index 651e5cf67a..581bb0e08b 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Africa/Lubumbashi and b/src/System.Runtime.TimeZoneData/data/Africa/Lubumbashi differ diff --git a/src/System.Runtime.TimeZoneData/data/Africa/Lusaka b/src/System.Runtime.TimeZoneData/data/Africa/Lusaka index 651e5cf67a..581bb0e08b 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Africa/Lusaka and b/src/System.Runtime.TimeZoneData/data/Africa/Lusaka differ diff --git a/src/System.Runtime.TimeZoneData/data/Africa/Maputo b/src/System.Runtime.TimeZoneData/data/Africa/Maputo index 651e5cf67a..581bb0e08b 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Africa/Maputo and b/src/System.Runtime.TimeZoneData/data/Africa/Maputo differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Bahia_Banderas b/src/System.Runtime.TimeZoneData/data/America/Bahia_Banderas index 48faea2ece..882400bd33 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Bahia_Banderas and b/src/System.Runtime.TimeZoneData/data/America/Bahia_Banderas differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Cancun b/src/System.Runtime.TimeZoneData/data/America/Cancun index 640b259fd0..3110cdfd6e 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Cancun and b/src/System.Runtime.TimeZoneData/data/America/Cancun differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Chihuahua b/src/System.Runtime.TimeZoneData/data/America/Chihuahua index 5e0a54f004..f65bb1c931 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Chihuahua and b/src/System.Runtime.TimeZoneData/data/America/Chihuahua differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Ciudad_Juarez b/src/System.Runtime.TimeZoneData/data/America/Ciudad_Juarez index f636ee643f..5f865ea808 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Ciudad_Juarez and b/src/System.Runtime.TimeZoneData/data/America/Ciudad_Juarez differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Ensenada b/src/System.Runtime.TimeZoneData/data/America/Ensenada index 42087af4cc..18d0d14afc 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Ensenada and b/src/System.Runtime.TimeZoneData/data/America/Ensenada differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Hermosillo b/src/System.Runtime.TimeZoneData/data/America/Hermosillo index 5c92e2967e..ba7b14760d 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Hermosillo and b/src/System.Runtime.TimeZoneData/data/America/Hermosillo differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Mazatlan b/src/System.Runtime.TimeZoneData/data/America/Mazatlan index 97d4d36c13..5aa6039ea4 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Mazatlan and b/src/System.Runtime.TimeZoneData/data/America/Mazatlan differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Merida b/src/System.Runtime.TimeZoneData/data/America/Merida index e5de1131dc..e5c7d8cc2d 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Merida and b/src/System.Runtime.TimeZoneData/data/America/Merida differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Mexico_City b/src/System.Runtime.TimeZoneData/data/America/Mexico_City index 80a415c70c..1811234612 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Mexico_City and b/src/System.Runtime.TimeZoneData/data/America/Mexico_City differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Monterrey b/src/System.Runtime.TimeZoneData/data/America/Monterrey index a5822e2c62..c1e0546451 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Monterrey and b/src/System.Runtime.TimeZoneData/data/America/Monterrey differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Ojinaga b/src/System.Runtime.TimeZoneData/data/America/Ojinaga index f7e40c0818..1dd08b1caf 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Ojinaga and b/src/System.Runtime.TimeZoneData/data/America/Ojinaga differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Santa_Isabel b/src/System.Runtime.TimeZoneData/data/America/Santa_Isabel index 42087af4cc..18d0d14afc 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Santa_Isabel and b/src/System.Runtime.TimeZoneData/data/America/Santa_Isabel differ diff --git a/src/System.Runtime.TimeZoneData/data/America/Tijuana b/src/System.Runtime.TimeZoneData/data/America/Tijuana index 42087af4cc..18d0d14afc 100644 Binary files a/src/System.Runtime.TimeZoneData/data/America/Tijuana and b/src/System.Runtime.TimeZoneData/data/America/Tijuana differ diff --git a/src/System.Runtime.TimeZoneData/data/Asia/Choibalsan b/src/System.Runtime.TimeZoneData/data/Asia/Choibalsan index 0a948c2eac..6f5d3a15ab 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Asia/Choibalsan and b/src/System.Runtime.TimeZoneData/data/Asia/Choibalsan differ diff --git a/src/System.Runtime.TimeZoneData/data/Asia/Dili b/src/System.Runtime.TimeZoneData/data/Asia/Dili index bb7be9f3a4..22e705ca1a 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Asia/Dili and b/src/System.Runtime.TimeZoneData/data/Asia/Dili differ diff --git a/src/System.Runtime.TimeZoneData/data/Atlantic/Azores b/src/System.Runtime.TimeZoneData/data/Atlantic/Azores index e6e2616e98..cda1c1d225 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Atlantic/Azores and b/src/System.Runtime.TimeZoneData/data/Atlantic/Azores differ diff --git a/src/System.Runtime.TimeZoneData/data/Atlantic/Madeira b/src/System.Runtime.TimeZoneData/data/Atlantic/Madeira index cf965c3f92..21e84571ee 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Atlantic/Madeira and b/src/System.Runtime.TimeZoneData/data/Atlantic/Madeira differ diff --git a/src/System.Runtime.TimeZoneData/data/Europe/Lisbon b/src/System.Runtime.TimeZoneData/data/Europe/Lisbon index f0c70b6906..7e9aae727b 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Europe/Lisbon and b/src/System.Runtime.TimeZoneData/data/Europe/Lisbon differ diff --git a/src/System.Runtime.TimeZoneData/data/Mexico/BajaNorte b/src/System.Runtime.TimeZoneData/data/Mexico/BajaNorte index 42087af4cc..18d0d14afc 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Mexico/BajaNorte and b/src/System.Runtime.TimeZoneData/data/Mexico/BajaNorte differ diff --git a/src/System.Runtime.TimeZoneData/data/Mexico/BajaSur b/src/System.Runtime.TimeZoneData/data/Mexico/BajaSur index 97d4d36c13..5aa6039ea4 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Mexico/BajaSur and b/src/System.Runtime.TimeZoneData/data/Mexico/BajaSur differ diff --git a/src/System.Runtime.TimeZoneData/data/Mexico/General b/src/System.Runtime.TimeZoneData/data/Mexico/General index 80a415c70c..1811234612 100644 Binary files a/src/System.Runtime.TimeZoneData/data/Mexico/General and b/src/System.Runtime.TimeZoneData/data/Mexico/General differ diff --git a/src/System.Runtime.TimeZoneData/data/zone.tab b/src/System.Runtime.TimeZoneData/data/zone.tab index abd9489753..7726f39a09 100644 --- a/src/System.Runtime.TimeZoneData/data/zone.tab +++ b/src/System.Runtime.TimeZoneData/data/zone.tab @@ -209,8 +209,7 @@ MD +4700+02850 Europe/Chisinau MH +0905+16720 Pacific/Kwajalein Kwajalein MM,CC +1647+09610 Asia/Yangon MN +4755+10653 Asia/Ulaanbaatar most of Mongolia -MN +4801+09139 Asia/Hovd Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan -MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar +MN +4801+09139 Asia/Hovd Bayan-Ölgii, Hovd, Uvs MO +221150+1133230 Asia/Macau MQ +1436-06105 America/Martinique MT +3554+01431 Europe/Malta