Skip to content

Commit 9cb3b72

Browse files
author
Mirroring
committed
Merge commit '82d4dbfc06a745b9404152b3281eb9559ca1f0d3'
2 parents c36b66f + 82d4dbf commit 9cb3b72

File tree

6 files changed

+74
-63
lines changed

6 files changed

+74
-63
lines changed

‎NuGet.config

-7
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
1212
<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" />
13-
<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" />
14-
<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" />
15-
<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" />
16-
<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" />
17-
<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" />
18-
<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" />
19-
<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" />
2013
<!-- End: Package sources from dotnet-emsdk -->
2114
<!-- Begin: Package sources from dotnet-sdk -->
2215
<!-- End: Package sources from dotnet-sdk -->

‎eng/Version.Details.xml

+36-36
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
116+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24508.1">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24516.1">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
126+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24508.1">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24516.1">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
130+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24508.1">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24516.1">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
134+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24508.1">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24516.1">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
138+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24508.1">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24516.1">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
142+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24508.1">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24516.1">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
146+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24508.1">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24516.1">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
150+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24508.1">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24516.1">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
154+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24508.1">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24516.1">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
158+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24508.1">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24516.1">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
162+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24508.1">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24516.1">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
166+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24508.1">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24516.1">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
170+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24508.1">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24516.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
174+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24508.1">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24516.1">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
178+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24508.1">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24516.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
182+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24508.1">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24516.1">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
186+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24510.3">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,9 +334,9 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24508.1">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24516.1">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
339+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
340340
</Dependency>
341341
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

+15-15
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24508.1</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.24508.1</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24508.1</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24508.1</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24508.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24508.1</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24508.1</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24508.1</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24516.1</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.24516.1</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24516.1</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24516.1</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24516.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24516.1</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24516.1</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24516.1</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->

‎eng/common/templates-official/steps/get-delegation-sas.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,16 @@ steps:
2828
# Calculate the expiration of the SAS token and convert to UTC
2929
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3030
31-
$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
31+
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
32+
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
33+
$sas = ""
34+
do {
35+
$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
36+
if ($LASTEXITCODE -ne 0) {
37+
Write-Error "Failed to generate SAS token."
38+
exit 1
39+
}
40+
} while($sas.IndexOf('/') -ne -1)
3241
3342
if ($LASTEXITCODE -ne 0) {
3443
Write-Error "Failed to generate SAS token."

‎eng/common/templates/steps/get-delegation-sas.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,16 @@ steps:
2828
# Calculate the expiration of the SAS token and convert to UTC
2929
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3030
31-
$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
31+
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
32+
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
33+
$sas = ""
34+
do {
35+
$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
36+
if ($LASTEXITCODE -ne 0) {
37+
Write-Error "Failed to generate SAS token."
38+
exit 1
39+
}
40+
} while($sas.IndexOf('/') -ne -1)
3241
3342
if ($LASTEXITCODE -ne 0) {
3443
Write-Error "Failed to generate SAS token."

‎global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "8.0.110"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24508.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24516.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"

0 commit comments

Comments
 (0)