10000 [release/8.0] Update dependencies from dotnet/arcade (#13277) · dotnet/winforms@32b207b · GitHub
[go: up one dir, main page]
Skip to content

Commit 32b207b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/8.0] Update dependencies from dotnet/arcade (#13277)
[release/8.0] Update dependencies from dotnet/arcade
1 parent 80614ee commit 32b207b

File tree

10 files changed

+56
-38
lines changed

10 files changed

+56
-38
lines changed

‎NuGet.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
77
<add key="darc-int-dotnet-runtime-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-50c4cb9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f-2/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-50c4cb9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f-1/nuget/v3/index.json" />
810
<!-- End: Package sources from dotnet-runtime -->
911
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1012
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,6 +25,8 @@
2325
<clear />
2426
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2527
<!-- Begin: Package sources from dotnet-runtime -->
28+
<add key="darc-int-dotnet-runtime-50c4cb9-1" value="true" />
29+
<add key="darc-int-dotnet-runtime-50c4cb9-2" value="true" />
2630
<add key="darc-int-dotnet-runtime-50c4cb9" value="true" />
2731
<!-- End: Package sources from dotnet-runtime -->
2832
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
179179
</ProductDependencies>
180180
<ToolsetDependencies>
181181
<!-- Arcade -->
182-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25120.1">
182+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
184+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25120.1">
186+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25208.7">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
188+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
189189
</Dependency>
190-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25120.1">
190+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25208.7">
191191
<Uri>https://github.com/dotnet/arcade</Uri>
192-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
192+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
193193
</Dependency>
194-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25120.1">
194+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.7">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
196+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25120.1">
198+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25208.7">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
200+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25120.1">
202+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25208.7">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
204+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
205205
</Dependency>
206206
</ToolsetDependencies>
207207
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.25120.1</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25120.1</MicrosoftDotNetRemoteExecutorVersion>
61-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.25120.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.25208.7</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25208.7</MicrosoftDotNetRemoteExecutorVersion>
61+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsPackageVersion>
6262
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6363
</PropertyGroup>
6464
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

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

Lines changed: 14 additions & 6 deletions
D7AE
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

Lines changed: 11 additions & 6 deletions
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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"

‎global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.113",
3+
"dotnet": "8.0.115",
44
"runtimes": {
55
"dotnet/x64": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -11,12 +11,12 @@
1111
}
1212
},
1313
"sdk": {
14-
"version": "8.0.113"
14+
"version": "8.0.115"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
18-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25120.1",
19-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7",
18+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25208.7",
19+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "8.0.15-servicing.25164.13"
2222
},

0 commit comments

Comments
 (0)
0