Skip to content

Commit 70d8cac

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit 'f0f9de5692adf1c0576de062f93c6ab7b176433f' into internal-merge-6.0-2024-08-13-1101-20e8479f-cb54-4b7c-aac6-0c8194b1502e
2 parents ab8d30d + f0f9de5 commit 70d8cac

File tree

8 files changed

+160
-88
lines changed

8 files changed

+160
-88
lines changed

‎NuGet.config

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-e77011b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-5/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-e77011b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-3/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-e77011b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-2/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-runtime-e77011b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-1/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-6c63698" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6c636980/nuget/v3/index.json" />
128
<!-- End: Package sources from dotnet-runtime -->
139
<!-- Begin: Package sources from dotnet-efcore -->
14-
<add key="darc-int-dotnet-efcore-d938643" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d9386432/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-efcore-d938643-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d9386432-8/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-efcore-d938643-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d9386432-7/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-efcore-d938643-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d9386432-6/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-efcore-d938643-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d9386432-5/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-efcore-d938643-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d9386432-4/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-efcore-d938643-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d9386432-3/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-efcore-d938643-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d9386432-2/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-efcore-d938643-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d9386432-10/nuget/v3/index.json" />
23-
<add key="darc-int-dotnet-efcore-d938643-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d9386432-1/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-efcore-73adbdc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-73adbdc3/nuget/v3/index.json" />
2411
<!-- End: Package sources from dotnet-efcore -->
2512
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2613
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -38,23 +25,10 @@
3825
<clear />
3926
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4027
<!-- Begin: Package sources from dotnet-efcore -->
41-
<add key="darc-int-dotnet-efcore-d938643-1" value="true" />
42-
<add key="darc-int-dotnet-efcore-d938643-10" value="true" />
43-
<add key="darc-int-dotnet-efcore-d938643-2" value="true" />
44-
<add key="darc-int-dotnet-efcore-d938643-3" value="true" />
45-
<add key="darc-int-dotnet-efcore-d938643-4" value="true" />
46-
<add key="darc-int-dotnet-efcore-d938643-5" value="true" />
47-
<add key="darc-int-dotnet-efcore-d938643-6" value="true" />
48-
<add key="darc-int-dotnet-efcore-d938643-7" value="true" />
49-
<add key="darc-int-dotnet-efcore-d938643-8" value="true" />
50-
<add key="darc-int-dotnet-efcore-d938643" value="true" />
28+
<add key="darc-int-dotnet-efcore-73adbdc" value="true" />
5129
<!-- End: Package sources from dotnet-efcore -->
5230
<!-- Begin: Package sources from dotnet-runtime -->
53-
<add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
54-
<add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
55-
<add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
56-
<add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
57-
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
31+
<add key="darc-int-dotnet-runtime-6c63698" value="true" />
5832
<!-- End: Package sources from dotnet-runtime -->
5933
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6034
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="6.0.32">
12+
<Dependency Name="dotnet-ef" Version="6.0.33">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>d938643248c7390b295b44237eb64520ac69fd53</Sha>
14+
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.32">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.33">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>d938643248c7390b295b44237eb64520ac69fd53</Sha>
18+
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.32">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.33">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>d938643248c7390b295b44237eb64520ac69fd53</Sha>
22+
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.32">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.33">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>d938643248c7390b295b44237eb64520ac69fd53</Sha>
26+
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.32">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.33">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>d938643248c7390b295b44237eb64520ac69fd53</Sha>
30+
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.32">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.33">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>d938643248c7390b295b44237eb64520ac69fd53</Sha>
34+
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.32">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.33">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>d938643248c7390b295b44237eb64520ac69fd53</Sha>
38+
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.32">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.33">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>d938643248c7390b295b44237eb64520ac69fd53</Sha>
42+
<Sha>73adbdc34d00e8fc71cb835171ee5ba73cc9e53f</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -177,9 +177,9 @@
177177
<Uri>https://github.com/dotnet/runtime</Uri>
178178
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.32-servicing.24314.7">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.33-servicing.24366.10">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
182+
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
183183
</Dependency>
184184
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1">
185185
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -245,33 +245,33 @@
245245
<Uri>https://github.com/dotnet/runtime</Uri>
246246
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
247247
</Dependency>
248-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.32">
248+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.33">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
250+
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.32">
252+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.33">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
254+
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.32">
256+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.33">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
258+
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
259259
</Dependency>
260260
<!--
261261
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
262262
All Runtime.$rid packages should have the same version.
263263
-->
264-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.32">
264+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.33">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
266+
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.32">
268+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.33">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
270+
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.32-servicing.24314.7">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.33-servicing.24366.10">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
274+
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/runtime -->
6565
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
66-
<MicrosoftNETCoreAppRefVersion>6.0.32</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.32</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.32</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.32</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.32</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.32-servicing.24314.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
66+
<MicrosoftNETCoreAppRefVersion>6.0.33</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.33</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.33</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.33</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.33</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.33-servicing.24366.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7373
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -103,7 +103,7 @@
103103
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
104104
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
105105
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
106-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.32-servicing.24314.7</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.33-servicing.24366.10</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
108108
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
109109
<SystemDirectoryServicesProtocolsVersion>6.0.2</SystemDirectoryServicesProtocolsVersion>
@@ -122,14 +122,14 @@
122122
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
123123
<MicrosoftNETCorePlatformsVersion>6.0.13</MicrosoftNETCorePlatformsVersion>
124124
<!-- Packages from dotnet/efcore -->
125-
<dotnetefVersion>6.0.32</dotnetefVersion>
126-
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.32</MicrosoftEntityFrameworkCoreInMemoryVersion>
127-
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.32</MicrosoftEntityFrameworkCoreRelationalVersion>
128-
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.32</MicrosoftEntityFrameworkCoreSqliteVersion>
129-
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.32</MicrosoftEntityFrameworkCoreSqlServerVersion>
130-
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.32</MicrosoftEntityFrameworkCoreToolsVersion>
131-
<MicrosoftEntityFrameworkCoreVersion>6.0.32</MicrosoftEntityFrameworkCoreVersion>
132-
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.32</MicrosoftEntityFrameworkCoreDesignVersion>
125+
<dotnetefVersion>6.0.33</dotnetefVersion>
126+
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.33</MicrosoftEntityFrameworkCoreInMemoryVersion>
127+
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.33</MicrosoftEntityFrameworkCoreRelationalVersion>
128+
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.33</MicrosoftEntityFrameworkCoreSqliteVersion>
129+
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.33</MicrosoftEntityFrameworkCoreSqlServerVersion>
130+
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.33</MicrosoftEntityFrameworkCoreToolsVersion>
131+
<MicrosoftEntityFrameworkCoreVersion>6.0.33</MicrosoftEntityFrameworkCoreVersion>
132+
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.33</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134134
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksInstallersVersion>
135135
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksTemplatingVersion>

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,17 @@ 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.
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
3236
33-
if ($LASTEXITCODE -ne 0) {
34-
Write-Error "Failed to generate SAS token."
35-
exit 1
36-
}
37+
if ($LASTEXITCODE -ne 0) {
38+
Write-Error "Failed to generate SAS token."
39+
exit 1
40+
}
41+
} while($sas.IndexOf('/') -ne -1)
3742
3843
if ('${{ parameters.base64Encode }}' -eq 'true') {
3944
$sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas))

0 commit comments

Comments
 (0)