diff --git a/NuGet.config b/NuGet.config index d1b04861eaa70..ea005c53c77b1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,13 +10,6 @@ <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-emsdk --> <add key="darc-pub-dotnet-emsdk-f623714" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-91b783e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-8/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-91b783e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-7/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-91b783e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-4/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-91b783e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-3/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-91b783e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-2/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-91b783e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-1/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5701f45f965e..8b459fa150956 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> @@ -121,69 +121,69 @@ <Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha> <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24510.3"> <Uri>https://github.com/dotnet/runtime-assets</Uri> @@ -334,9 +334,9 @@ <Uri>https://github.com/dotnet/xharness</Uri> <Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24508.1"> + <Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24516.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha> + <Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha> </Dependency> <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 5faf5f839ef76..9557205b78c92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,21 +87,21 @@ <!-- SDK dependencies --> <MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion> <!-- Arcade dependencies --> - <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksFeedVersion> - <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24508.1</MicrosoftDotNetCodeAnalysisVersion> - <MicrosoftDotNetGenAPIVersion>8.0.0-beta.24508.1</MicrosoftDotNetGenAPIVersion> - <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24508.1</MicrosoftDotNetGenFacadesVersion> - <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24508.1</MicrosoftDotNetXUnitExtensionsVersion> - <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24508.1</MicrosoftDotNetXUnitConsoleRunnerVersion> - <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksArchivesVersion> - <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksInstallersVersion> - <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksPackagingVersion> - <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion> - <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksTemplatingVersion> - <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion> - <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24508.1</MicrosoftDotNetRemoteExecutorVersion> - <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24508.1</MicrosoftDotNetVersionToolsTasksVersion> - <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24508.1</MicrosoftDotNetPackageTestingVersion> + <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksFeedVersion> + <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24516.1</MicrosoftDotNetCodeAnalysisVersion> + <MicrosoftDotNetGenAPIVersion>8.0.0-beta.24516.1</MicrosoftDotNetGenAPIVersion> + <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24516.1</MicrosoftDotNetGenFacadesVersion> + <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24516.1</MicrosoftDotNetXUnitExtensionsVersion> + <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24516.1</MicrosoftDotNetXUnitConsoleRunnerVersion> + <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksArchivesVersion> + <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksInstallersVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion> + <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksTemplatingVersion> + <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion> + <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24516.1</MicrosoftDotNetRemoteExecutorVersion> + <MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24516.1</MicrosoftDotNetVersionToolsTasksVersion> + <MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24516.1</MicrosoftDotNetPackageTestingVersion> <!-- NuGet dependencies --> <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion> <!-- Installer dependencies --> diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index c0e8f91317f07..c690cc0a070cd 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -28,7 +28,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/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml index c0e8f91317f07..c690cc0a070cd 100644 --- a/eng/common/templates/steps/get-delegation-sas.yml +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -28,7 +28,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/global.json b/global.json index a2a0581ed84a9..4aea1744d8298 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24508.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24516.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"