Skip to content

Commit bd39e43

Browse files
AndriySvyrydAndriySvyryd
authored
Merge branch 'release/8.0' into 'release/8.0-staging' (#35541)
2 parents 7f25012 + f8051b1 commit bd39e43

File tree

12 files changed

+79
-65
lines changed

12 files changed

+79
-65
lines changed

Diff for: ‎NuGet.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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-dcf4a22" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dcf4a22c/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-runtime -->
99
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1010
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,7 +19,7 @@
1919
<clear />
2020
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2121
<!-- Begin: Package sources from dotnet-runtime -->
22-
<add key="darc-int-dotnet-runtime-dcf4a22" value="true" />
22+
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
2323
<!-- End: Package sources from dotnet-runtime -->
2424
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2525
</disabledPackageSources>

Diff for: ‎eng/Version.Details.xml

+14-17
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3030
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.10-servicing.24474.6">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.12-servicing.24603.5">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
34+
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
3535
</Dependency>
3636
<Dependency Name="Microsoft.Extensions.Logging" Version="8.0.1">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -40,40 +40,37 @@
4040
<Dependency Name="System.Formats.Asn1" Version="8.0.1">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4242
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
43-
</Dependency>
44-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
45-
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
4643
</Dependency>
4744
<Dependency Name="System.Text.Json" Version="8.0.5">
4845
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4946
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
5047
</Dependency>
51-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.10">
48+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
5249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
53-
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
50+
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
5451
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.10">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.12">
5653
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
57-
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
54+
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
5855
</Dependency>
5956
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
60-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.10-servicing.24474.6">
57+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.12-servicing.24603.5">
6158
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
59+
<Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
6360
</Dependency>
6461
</ProductDependencies>
6562
<ToolsetDependencies>
66-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1">
63+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
6764
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
65+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
6966
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24508.1">
67+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25060.1">
7168
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
69+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
7370
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24508.1">
71+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25060.1">
7572
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
73+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
7774
</Dependency>
7875
</ToolsetDependencies>
7976
</Dependencies>

Diff for: ‎eng/Versions.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Label="Version settings">
3-
<VersionPrefix>8.0.12</VersionPrefix>
3+
<VersionPrefix>8.0.13</VersionPrefix>
44
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
55
<PreReleaseVersionIteration>
66
</PreReleaseVersionIteration>
@@ -24,16 +24,16 @@
2424
<MicrosoftExtensionsConfigurationJsonVersion>8.0.1</MicrosoftExtensionsConfigurationJsonVersion>
2525
<MicrosoftExtensionsDependencyInjectionVersion>8.0.1</MicrosoftExtensionsDependencyInjectionVersion>
2626
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.11-servicing.24508.13</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.12-servicing.24603.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
2828
<MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
2929
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
3030
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
31-
<MicrosoftNETCoreAppRefVersion>8.0.10</MicrosoftNETCoreAppRefVersion>
32-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.10</MicrosoftNETCoreAppRuntimewinx64Version>
33-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.11-servicing.24508.13</MicrosoftNETCoreBrowserDebugHostTransportVersion>
31+
<MicrosoftNETCoreAppRefVersion>8.0.12</MicrosoftNETCoreAppRefVersion>
32+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.12</MicrosoftNETCoreAppRuntimewinx64Version>
33+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.12-servicing.24603.5</MicrosoftNETCoreBrowserDebugHostTransportVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25060.1</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->

Diff for: ‎eng/common/cross/toolchain.cmake

+30-31
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm")
4040
set(TOOLCHAIN "arm-linux-gnueabihf")
4141
endif()
4242
if(TIZEN)
43-
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
43+
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf")
4444
endif()
4545
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4646
set(CMAKE_SYSTEM_PROCESSOR aarch64)
@@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4949
elseif(LINUX)
5050
set(TOOLCHAIN "aarch64-linux-gnu")
5151
if(TIZEN)
52-
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
52+
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu")
5353
endif()
5454
elseif(FREEBSD)
5555
set(triple "aarch64-unknown-freebsd12")
@@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel")
5858
set(CMAKE_SYSTEM_PROCESSOR armv7l)
5959
set(TOOLCHAIN "arm-linux-gnueabi")
6060
if(TIZEN)
61-
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
61+
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi")
6262
endif()
6363
elseif(TARGET_ARCH_NAME STREQUAL "armv6")
6464
set(CMAKE_SYSTEM_PROCESSOR armv6l)
@@ -95,7 +95,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
9595
elseif(LINUX)
9696
set(TOOLCHAIN "x86_64-linux-gnu")
9797
if(TIZEN)
98-
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
98+
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu")
9999
endif()
100100
elseif(FREEBSD)
101101
set(triple "x86_64-unknown-freebsd12")
@@ -112,7 +112,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
112112
set(TOOLCHAIN "i686-linux-gnu")
113113
endif()
114114
if(TIZEN)
115-
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
115+
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
116116
endif()
117117
else()
118118
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
@@ -124,26 +124,25 @@ endif()
124124

125125
# Specify include paths
126126
if(TIZEN)
127-
if(TARGET_ARCH_NAME STREQUAL "arm")
128-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
129-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
130-
endif()
131-
if(TARGET_ARCH_NAME STREQUAL "armel")
132-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
133-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
134-
endif()
135-
if(TARGET_ARCH_NAME STREQUAL "arm64")
136-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
137-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
138-
endif()
139-
if(TARGET_ARCH_NAME STREQUAL "x86")
140-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
141-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu)
142-
endif()
143-
if(TARGET_ARCH_NAME STREQUAL "x64")
144-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
145-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
127+
function(find_toolchain_dir prefix)
128+
# Dynamically find the version subdirectory
129+
file(GLOB DIRECTORIES "${prefix}/*")
130+
list(GET DIRECTORIES 0 FIRST_MATCH)
131+
get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME)
132+
133+
set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE)
134+
endfunction()
135+
136+
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
137+
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
138+
else()
139+
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
146140
endif()
141+
142+
message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}")
143+
144+
include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++)
145+
include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN})
147146
endif()
148147

149148
if(ANDROID)
@@ -265,21 +264,21 @@ endif()
265264

266265
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
267266
if(TIZEN)
268-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
267+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
269268
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
270269
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
271-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
270+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
272271
endif()
273272
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
274273
if(TIZEN)
275-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
274+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
276275
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
277276
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
278-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
277+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
279278

280279
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
281280
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
282-
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
281+
add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
283282
endif()
284283
elseif(TARGET_ARCH_NAME STREQUAL "x86")
285284
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
@@ -288,10 +287,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
288287
endif()
289288
add_toolchain_linker_flag(-m32)
290289
if(TIZEN)
291-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
290+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
292291
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
293292
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
294-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
293+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
295294
endif()
296295
elseif(ILLUMOS)
297296
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")

Diff for: ‎eng/common/templates-official/job/publish-build-assets.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
arguments: >
8787
-task PublishBuildAssets -restore -msbuildEngine dotnet
8888
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
89-
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
89+
/p:MaestroApiEndpoint=https://maestro.dot.net
9090
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
9191
/p:OfficialBuildId=$(Build.BuildNumber)
9292
condition: ${{ parameters.condition }}

Diff for: ‎eng/common/templates-official/post-build/common-variables.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variables:
77

88
# Default Maestro++ API Endpoint and API Version
99
- name: MaestroApiEndPoint
10-
value: "https://maestro-prod.westus2.cloudapp.azure.com"
10+
value: "https://maestro.dot.net"
1111
- name: MaestroApiAccessToken
1212
value: $(MaestroAccessToken)
1313
- name: MaestroApiVersion

Diff for: ‎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."

Diff for: ‎eng/common/templates/job/job.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128

129129
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
130130
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
131-
- task: MicroBuildSigningPlugin@3
131+
- task: MicroBuildSigningPlugin@4
132132
displayName: Install MicroBuild plugin
133133
inputs:
134134
signType: $(_SignType)

Diff for: ‎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."

Diff for: ‎eng/common/tools.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ function InstallDotNet([string] $dotnetRoot,
321321
$variations += @($installParameters)
322322

323323
$dotnetBuilds = $installParameters.Clone()
324-
$dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
324+
$dotnetbuilds.AzureFeed = "https://ci.dot.net/public"
325325
$variations += @($dotnetBuilds)
326326

327327
if ($runtimeSourceFeed) {

Diff for: ‎eng/common/tools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ function InstallDotNet {
234234
local public_location=("${installParameters[@]}")
235235
variations+=(public_location)
236236

237-
local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
237+
local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public")
238238
variations+=(dotnetbuilds)
239239

240240
if [[ -n "${6:-}" ]]; then

Diff for: ‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1",
17-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1"
16+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
17+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1"
1818
}
1919
}

0 commit comments

Comments
 (0)