Skip to content

Commit 078f98e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/8.0.1xx] Update dependencies from dotnet/arcade (#46875)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 67770ed commit 078f98e

File tree

6 files changed

+55
-18
lines changed

6 files changed

+55
-18
lines changed

‎NuGet.config

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
<!-- End: Package sources from dotnet-format -->
2323
<!-- Begin: Package sources from dotnet-aspnetcore -->
2424
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-8/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-7/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-6/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-5/nuget/v3/index.json" />
29+
<add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-4/nuget/v3/index.json" />
30+
<add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-3/nuget/v3/index.json" />
31+
<add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-2/nuget/v3/index.json" />
32+
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-1/nuget/v3/index.json" />
2533
<!-- End: Package sources from dotnet-aspnetcore -->
2634
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
2735
<add key="darc-pub-DotNet-msbuild-Trusted-c3ade83" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-c3ade832/nuget/v3/index.json" />
@@ -30,12 +38,22 @@
3038
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3139
<!-- Begin: Package sources from dotnet-runtime -->
3240
<add key="darc-int-dotnet-runtime-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
41+
<add key="darc-int-dotnet-runtime-eba546b-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0-6/nuget/v3/index.json" />
3342
<!-- End: Package sources from dotnet-runtime -->
3443
<!-- Begin: Package sources from dotnet-templating -->
3544
<add key="darc-pub-dotnet-templating-a977119" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e/nuget/v3/index.json" />
45+
<add key="darc-pub-dotnet-templating-a977119-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e-1/nuget/v3/index.json" />
3646
<!-- End: Package sources from dotnet-templating -->
3747
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3848
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de/nuget/v3/index.json" />
49+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-8/nuget/v3/index.json" />
50+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-7/nuget/v3/index.json" />
51+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-6/nuget/v3/index.json" />
52+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-5/nuget/v3/index.json" />
53+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-4/nuget/v3/index.json" />
54+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-3/nuget/v3/index.json" />
55+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-2/nuget/v3/index.json" />
56+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-1/nuget/v3/index.json" />
3957
<!-- End: Package sources from dotnet-windowsdesktop -->
4058
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4159
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -60,6 +78,14 @@
6078
<!-- Begin: Package sources from dotnet-templating -->
6179
<!-- End: Package sources from dotnet-templating -->
6280
<!-- Begin: Package sources from dotnet-aspnetcore -->
81+
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="true" />
82+
<add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="true" />
83+
<add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="true" />
84+
<add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="true" />
85+
<add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="true" />
86+
<add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="true" />
87+
<add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="true" />
88+
<add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="true" />
6389
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="true" />
6490
<!-- End: Package sources from dotnet-aspnetcore -->
6591
<!-- Begin: Package sources from dotnet-format -->
@@ -75,9 +101,18 @@
75101
<!-- End: Package sources from dotnet-format -->
76102
<!-- End: Package sources from dotnet-aspnetcore -->
77103
<!-- Begin: Package sources from dotnet-runtime -->
104+
<add key="darc-int-dotnet-runtime-eba546b-6" value="true" />
78105
<add key="darc-int-dotnet-runtime-eba546b" value="true" />
79106
<!-- End: Package sources from dotnet-runtime -->
80107
<!-- Begin: Package sources from dotnet-windowsdesktop -->
108+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="true" />
109+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="true" />
110+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="true" />
111+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="true" />
112+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="true" />
113+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="true" />
114+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="true" />
115+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="true" />
81116
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="true" />
82117
<!-- End: Package sources from dotnet-windowsdesktop -->
83118
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25111.4">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25114.5">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
496+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25111.4">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25114.5">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
501+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25111.4">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25114.5">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
505+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25111.4">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25114.5">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
509+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25111.4</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25114.5</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
211211
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
212-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25111.4</MicrosoftDotNetXUnitExtensionsVersion>
212+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25114.5</MicrosoftDotNetXUnitExtensionsVersion>
213213
<MoqPackageVersion>4.18.4</MoqPackageVersion>
214214
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
215215
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/templates-official/steps/send-to-helix.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ parameters:
88
HelixConfiguration: '' # optional -- additional property attached to a job
99
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
1010
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
11+
HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj
1112
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
1213
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
1314
WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
@@ -24,12 +25,12 @@ parameters:
2425
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
2526
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
2627
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
27-
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
28+
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
2829
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
2930
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3031

3132
steps:
32-
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
33+
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
3334
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
3435
env:
3536
BuildConfig: $(_BuildConfig)
@@ -59,7 +60,7 @@ steps:
5960
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6061
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
6162
continueOnError: ${{ parameters.continueOnError }}
62-
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
63+
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
6364
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
6465
env:
6566
BuildConfig: $(_BuildConfig)

‎eng/common/templates/steps/send-to-helix.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ parameters:
88
HelixConfiguration: '' # optional -- additional property attached to a job
99
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
1010
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
11+
HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj
1112
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
1213
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
1314
WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
@@ -24,12 +25,12 @@ parameters:
2425
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
2526
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
2627
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
27-
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
28+
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
2829
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
2930
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3031

3132
steps:
32-
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
33+
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
3334
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
3435
env:
3536
BuildConfig: $(_BuildConfig)
@@ -59,7 +60,7 @@ steps:
5960
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6061
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
6162
continueOnError: ${{ parameters.continueOnError }}
62-
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
63+
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
6364
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
6465
env:
6566
BuildConfig: $(_BuildConfig)

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25111.4",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25111.4"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25114.5",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25114.5"
1919
}
2020
}

0 commit comments

Comments
 (0)