Skip to content

Commit 92bb014

Browse files
v-wuzhaiv-wuzhai
authored
[release/8.0.3xx] Update dependencies from dotnet/arcade (#20344)
2 parents f690945 + 94ef460 commit 92bb014

File tree

6 files changed

+90
-15
lines changed

6 files changed

+90
-15
lines changed

‎NuGet.config

+73
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,61 @@
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-emsdk -->
1010
<add key="darc-pub-dotnet-emsdk-b767aab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-emsdk-b767aab-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba-7/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-b767aab-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba-6/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-b767aab-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba-5/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-emsdk-b767aab-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba-4/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-emsdk-b767aab-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba-3/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-emsdk-b767aab-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba-2/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-emsdk-b767aab-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba-1/nuget/v3/index.json" />
1118
<!-- End: Package sources from dotnet-emsdk -->
1219
<!-- Begin: Package sources from dotnet-aspnetcore -->
1320
<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" />
21+
<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" />
22+
<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" />
23+
<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" />
24+
<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" />
25+
<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" />
26+
<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" />
27+
<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" />
28+
<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" />
1429
<!-- End: Package sources from dotnet-aspnetcore -->
1530
<!-- Begin: Package sources from dotnet-windowsdesktop -->
1631
<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" />
32+
<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" />
33+
<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" />
34+
<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" />
35+
<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" />
36+
<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" />
37+
<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" />
38+
<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" />
39+
<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" />
1740
<!-- End: Package sources from dotnet-windowsdesktop -->
1841
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1942
<add key="darc-pub-DotNet-msbuild-Trusted-7c2b926" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7c2b9262/nuget/v3/index.json" />
2043
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2144
<!-- Begin: Package sources from dotnet-runtime -->
2245
<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" />
46+
<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" />
2347
<!-- End: Package sources from dotnet-runtime -->
2448
<!-- Begin: Package sources from dotnet-sdk -->
2549
<add key="darc-int-dotnet-sdk-4a9730e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee/nuget/v3/index.json" />
50+
<add key="darc-int-dotnet-sdk-4a9730e-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-9/nuget/v3/index.json" />
51+
<add key="darc-int-dotnet-sdk-4a9730e-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-8/nuget/v3/index.json" />
52+
<add key="darc-int-dotnet-sdk-4a9730e-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-7/nuget/v3/index.json" />
53+
<add key="darc-int-dotnet-sdk-4a9730e-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-6/nuget/v3/index.json" />
54+
<add key="darc-int-dotnet-sdk-4a9730e-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-5/nuget/v3/index.json" />
55+
<add key="darc-int-dotnet-sdk-4a9730e-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-4/nuget/v3/index.json" />
56+
<add key="darc-int-dotnet-sdk-4a9730e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-3/nuget/v3/index.json" />
57+
<add key="darc-int-dotnet-sdk-4a9730e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-2/nuget/v3/index.json" />
58+
<add key="darc-int-dotnet-sdk-4a9730e-17" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-17/nuget/v3/index.json" />
59+
<add key="darc-int-dotnet-sdk-4a9730e-16" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-16/nuget/v3/index.json" />
60+
<add key="darc-int-dotnet-sdk-4a9730e-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-15/nuget/v3/index.json" />
61+
<add key="darc-int-dotnet-sdk-4a9730e-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-14/nuget/v3/index.json" />
62+
<add key="darc-int-dotnet-sdk-4a9730e-13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-13/nuget/v3/index.json" />
63+
<add key="darc-int-dotnet-sdk-4a9730e-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-12/nuget/v3/index.json" />
64+
<add key="darc-int-dotnet-sdk-4a9730e-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-11/nuget/v3/index.json" />
65+
<add key="darc-int-dotnet-sdk-4a9730e-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-10/nuget/v3/index.json" />
2666
<add key="darc-int-dotnet-sdk-4a9730e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-4a9730ee-1/nuget/v3/index.json" />
2767
<!-- End: Package sources from dotnet-sdk -->
2868
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -42,16 +82,49 @@
4282
<disabledPackageSources>
4383
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4484
<!-- Begin: Package sources from dotnet-aspnetcore -->
85+
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="true" />
86+
<add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="true" />
87+
<add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="true" />
88+
<add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="true" />
89+
<add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="true" />
90+
<add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="true" />
91+
<add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="true" />
92+
<add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="true" />
4593
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="true" />
4694
<!-- End: Package sources from dotnet-aspnetcore -->
4795
<!-- Begin: Package sources from dotnet-runtime -->
96+
<add key="darc-int-dotnet-runtime-eba546b-6" value="true" />
4897
<add key="darc-int-dotnet-runtime-eba546b" value="true" />
4998
<!-- End: Package sources from dotnet-runtime -->
5099
<!-- Begin: Package sources from dotnet-sdk -->
51100
<add key="darc-int-dotnet-sdk-4a9730e-1" value="true" />
101+
<add key="darc-int-dotnet-sdk-4a9730e-10" value="true" />
102+
<add key="darc-int-dotnet-sdk-4a9730e-11" value="true" />
103+
<add key="darc-int-dotnet-sdk-4a9730e-12" value="true" />
104+
<add key="darc-int-dotnet-sdk-4a9730e-13" value="true" />
105+
<add key="darc-int-dotnet-sdk-4a9730e-14" value="true" />
106+
<add key="darc-int-dotnet-sdk-4a9730e-15" value="true" />
107+
<add key="darc-int-dotnet-sdk-4a9730e-16" value="true" />
108+
<add key="darc-int-dotnet-sdk-4a9730e-17" value="true" />
109+
<add key="darc-int-dotnet-sdk-4a9730e-2" value="true" />
110+
<add key="darc-int-dotnet-sdk-4a9730e-3" value="true" />
111+
<add key="darc-int-dotnet-sdk-4a9730e-4" value="true" />
112+
<add key="darc-int-dotnet-sdk-4a9730e-5" value="true" />
113+
<add key="darc-int-dotnet-sdk-4a9730e-6" value="true" />
114+
<add key="darc-int-dotnet-sdk-4a9730e-7" value="true" />
115+
<add key="darc-int-dotnet-sdk-4a9730e-8" value="true" />
116+
<add key="darc-int-dotnet-sdk-4a9730e-9" value="true" />
52117
<add key="darc-int-dotnet-sdk-4a9730e" value="true" />
53118
<!-- End: Package sources from dotnet-sdk -->
54119
<!-- Begin: Package sources from dotnet-windowsdesktop -->
120+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="true" />
121+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="true" />
122+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="true" />
123+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="true" />
124+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="true" />
125+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="true" />
126+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="true" />
127+
<add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="true" />
55128
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="true" />
56129
<!-- End: Package sources from dotnet-windowsdesktop -->
57130
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,18 @@
214214
</Dependency>
215215
</ProductDependencies>
216216
<ToolsetDependencies>
217-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25111.4">
217+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25114.5">
218218
<Uri>https://github.com/dotnet/arcade</Uri>
219-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
219+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
220220
<SourceBuild RepoName="arcade" ManagedOnly="true" />
221221
</Dependency>
222-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25111.4">
222+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25114.5">
223223
<Uri>https://github.com/dotnet/arcade</Uri>
224-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
224+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
225225
</Dependency>
226-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25111.4">
226+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25114.5">
227227
<Uri>https://github.com/dotnet/arcade</Uri>
228-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
228+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
229229
</Dependency>
230230
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
231231
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/arcade -->
42-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25111.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25114.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

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

+4-3
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)

0 commit comments

Comments
 (0)