Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 50c4cb9

Browse files
author
Mirroring
committed
Merge commit 'b17f0594b28bc51ef41ed2804d55539f4db78349'
2 parents f64f435 + b17f059 commit 50c4cb9

File tree

11 files changed

+93
-81
lines changed

11 files changed

+93
-81
lines changed

‎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.25120.1">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
116+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</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.25120.1">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25164.5">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
126+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25120.1">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25164.5">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
130+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25120.1">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25164.5">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
134+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25120.1">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25164.5">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
138+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25120.1">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25164.5">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
142+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25120.1">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25164.5">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
146+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25120.1">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25164.5">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
150+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25120.1">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25164.5">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
154+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25120.1">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25164.5">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
158+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25120.1">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25164.5">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
162+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25120.1">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25164.5">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
166+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25120.1">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25164.5">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
170+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25120.1">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25164.5">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
174+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25120.1">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25164.5">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
178+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25120.1">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25164.5">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
182+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25120.1">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25164.5">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
186+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25113.1">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,9 +334,9 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>d33548342ade8e537d891c8f0f593aa206418625</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25120.1">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25164.5">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
339+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</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

+16-16
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.25120.1</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25120.1</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25120.1</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25120.1</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25120.1</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25120.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25120.1</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25120.1</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25120.1</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25164.5</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25164.5</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25164.5</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25164.5</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25164.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25164.5</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25164.5</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25164.5</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->
@@ -259,7 +259,7 @@
259259
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
260260
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
261261
<!-- installer version, for testing workloads must be greater than or equal to global.json sdk version -->
262-
<MicrosoftDotnetSdkInternalVersion>8.0.113</MicrosoftDotnetSdkInternalVersion>
262+
<MicrosoftDotnetSdkInternalVersion>8.0.114</MicrosoftDotnetSdkInternalVersion>
263263
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
264264
</PropertyGroup>
265265
<PropertyGroup>

‎eng/common/generate-sbom-prep.ps1

+14-6
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,26 @@ Param(
44

55
. $PSScriptRoot\pipeline-logging-functions.ps1
66

7+
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
8+
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
9+
$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
10+
$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
11+
$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
12+
13+
Write-Host "Artifact name before : $ArtifactName"
14+
Write-Host "Artifact name after : $SafeArtifactName"
15+
716
Write-Host "Creating dir $ManifestDirPath"
17+
818
# create directory for sbom manifest to be placed
9-
if (!(Test-Path -path $ManifestDirPath))
19+
if (!(Test-Path -path $SbomGenerationDir))
1020
{
11-
New-Item -ItemType Directory -path $ManifestDirPath
12-
Write-Host "Successfully created directory $ManifestDirPath"
21+
New-Item -ItemType Directory -path $SbomGenerationDir
22+
Write-Host "Successfully created directory $SbomGenerationDir"
1323
}
1424
else{
1525
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
1626
}
1727

1828
Write-Host "Updating artifact name"
19-
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
20-
Write-Host "Artifact name $artifact_name"
21-
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
29+
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"

‎eng/common/generate-sbom-prep.sh

+11-6
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,24 @@ done
1414
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1515
. $scriptroot/pipeline-logging-functions.sh
1616

17+
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
18+
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
19+
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
20+
1721
manifest_dir=$1
1822

19-
if [ ! -d "$manifest_dir" ] ; then
20-
mkdir -p "$manifest_dir"
21-
echo "Sbom directory created." $manifest_dir
23+
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
24+
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
25+
sbom_generation_dir="$manifest_dir/$safe_artifact_name"
26+
27+
if [ ! -d "$sbom_generation_dir" ] ; then
28+
mkdir -p "$sbom_generation_dir"
29+
echo "Sbom directory created." $sbom_generation_dir
2230
else
2331
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
2432
fi
2533

26-
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
2734
echo "Artifact name before : "$artifact_name
28-
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
29-
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
3035
echo "Artifact name after : "$safe_artifact_name
3136
export ARTIFACT_NAME=$safe_artifact_name
3237
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"

‎eng/common/templates-official/job/job.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ parameters:
3838
enableSbom: true
3939
PackageVersion: 7.0.0
4040
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
41+
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
4142

4243
jobs:
4344
- job: ${{ parameters.name }}
@@ -261,4 +262,4 @@ jobs:
261262
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
262263
artifactName: 'BuildConfiguration'
263264
displayName: 'Publish build retry configuration'
264-
continueOnError: true
265+
continueOnError: true

‎eng/common/templates-official/steps/generate-sbom.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ steps:
3535
PackageName: ${{ parameters.packageName }}
3636
BuildDropPath: ${{ parameters.buildDropPath }}
3737
PackageVersion: ${{ parameters.packageVersion }}
38-
ManifestDirPath: ${{ parameters.manifestDirPath }}
38+
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
3939
${{ if ne(parameters.IgnoreDirectories, '') }}:
4040
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
4141

‎eng/common/tools.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
4343

4444
# Enable repos to use a particular version of the on-line dotnet-install scripts.
45-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
45+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
4646
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
4747

4848
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -263,7 +263,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
263263
if (!(Test-Path $installScript)) {
264264
Create-Directory $dotnetRoot
265265
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
266-
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
267267

268268
Retry({
269269
Write-Host "GET $uri"

‎eng/common/tools.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
5454
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
5555

5656
# Enable repos to use a particular version of the on-line dotnet-install scripts.
57-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
57+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
5858
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5959

6060
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -297,7 +297,7 @@ function with_retries {
297297
function GetDotNetInstallScript {
298298
local root=$1
299299
local install_script="$root/dotnet-install.sh"
300-
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
300+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
301301

302302
if [[ ! -a "$install_script" ]]; then
303303
mkdir -p "$root"

‎eng/pipelines/libraries/stress/http.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ pr:
88
schedules:
99
- cron: "0 13 * * *" # 1PM UTC => 5 AM PST
1010
displayName: HttpStress nightly run
11+
always: true
1112
branches:
1213
include:
1314
- main
14-
- release/6.0
15-
- release/7.0
16-
- release/8.0
15+
- release/*-staging
1716

1817
variables:
1918
- template: ../variables.yml

‎eng/pipelines/libraries/stress/ssl.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ pr:
88
schedules:
99
- cron: "0 13 * * *" # 1PM UTC => 5 AM PST
1010
displayName: SslStress nightly run
11+
always: true
1112
branches:
1213
include:
1314
- main
14-
- release/6.0
15-
- release/7.0
16-
- release/8.0
15+
- release/*-staging
1716

1817
variables:
1918
- template: ../variables.yml

‎global.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "8.0.113",
3+
"version": "8.0.114",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "8.0.113"
8+
"dotnet": "8.0.114"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25120.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25164.5",
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)