Skip to content

Commit 4531921

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from build 309867 (#11573)
[release/10.0] Source code updates from dotnet/dotnet
1 parent 08c580e commit 4531921

21 files changed

+214
-300
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-dotnet -->
8-
<add key="darc-pub-dotnet-dotnet-8639c3b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-8639c3b2/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-dotnet-d14d02d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-d14d02dd/nuget/v3/index.json" />
99
<!-- End: Package sources from dotnet-dotnet -->
1010
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1111
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

‎eng/Version.Details.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props
88
<!-- dotnet-dotnet dependencies -->
99
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
1010
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.7-servicing.26209.115</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.7-servicing.26210.105</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
1616
<MicrosoftNETCoreAppRefPackageVersion>10.0.7</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.7-servicing.26209.115</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.7-servicing.26209.115</MicrosoftPrivateWinformsPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.7-servicing.26210.105</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.7-servicing.26210.105</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
2121
<SystemCodeDomPackageVersion>10.0.7</SystemCodeDomPackageVersion>
@@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props
2525
<SystemDrawingCommonPackageVersion>10.0.7</SystemDrawingCommonPackageVersion>
2626
<SystemFormatsNrbfPackageVersion>10.0.7</SystemFormatsNrbfPackageVersion>
2727
<SystemIOPackagingPackageVersion>10.0.7</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.7-servicing.26209.115</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.7-servicing.26210.105</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
2929
<SystemReflectionMetadataLoadContextPackageVersion>10.0.7</SystemReflectionMetadataLoadContextPackageVersion>
3030
<SystemResourcesExtensionsPackageVersion>10.0.7</SystemResourcesExtensionsPackageVersion>
3131
<SystemRuntimeSerializationFormattersPackageVersion>10.0.7</SystemRuntimeSerializationFormattersPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="8639c3b28a6eac36e38a59c9cae67aa52b1b06a8" BarId="309770" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="d14d02dd9f70268be43db2ae722433f7d4461fb8" BarId="309867" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.7-servicing.26209.115">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.7-servicing.26210.105">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
7+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.7-servicing.26209.115">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.7-servicing.26210.105">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
11+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
1212
</Dependency>
1313
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.7">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
15+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
1616
</Dependency>
1717
<Dependency Name="System.Windows.Extensions" Version="10.0.7">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
19+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.7-servicing.26209.115">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.7-servicing.26210.105">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
23+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.5-servicing.26160.10">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>206dc6cbdbcd8b52c1c516e128be08411b5cd3aa</Sha>
2828
</Dependency>
2929
<Dependency Name="System.Resources.Extensions" Version="10.0.7">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
31+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
3232
</Dependency>
3333
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.7">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
35+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
3636
</Dependency>
3737
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.7">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
39+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
4040
</Dependency>
4141
<Dependency Name="System.CodeDom" Version="10.0.7">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
43+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
4444
</Dependency>
4545
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.7">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
47+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
4848
</Dependency>
4949
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.7">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
51+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
5252
</Dependency>
5353
<Dependency Name="System.DirectoryServices" Version="10.0.7">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
55+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
5656
</Dependency>
5757
<Dependency Name="System.Formats.Nrbf" Version="10.0.7">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
59+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
6060
</Dependency>
6161
<Dependency Name="System.IO.Packaging" Version="10.0.7">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
63+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
6464
</Dependency>
6565
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.7">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
67+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
6868
</Dependency>
6969
<Dependency Name="System.Security.Permissions" Version="10.0.7">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
71+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
7272
</Dependency>
7373
<Dependency Name="System.Drawing.Common" Version="10.0.7">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
75+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,25 +84,25 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.7-servicing.26209.115">
87+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.7-servicing.26210.105">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
89+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26209.115">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26210.105">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
93+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26209.115">
95+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26210.105">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
97+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26209.115">
99+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26210.105">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
101+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.26209.115">
103+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.26210.105">
104104
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
105+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
106106
</Dependency>
107107
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
108108
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ parameters:
2424
enablePublishBuildArtifacts: false
2525
enablePublishBuildAssets: false
2626
enablePublishTestResults: false
27+
enablePublishing: false
2728
enableBuildRetry: false
2829
mergeTestResults: false
2930
testRunTitle: ''
3031
testResultsFormat: ''
3132
name: ''
32-
componentGovernanceSteps: []
3333
preSteps: []
3434
artifactPublishSteps: []
3535
runAsPublic: false
@@ -146,9 +146,6 @@ jobs:
146146
- ${{ each step in parameters.steps }}:
147147
- ${{ step }}
148148

149-
- ${{ each step in parameters.componentGovernanceSteps }}:
150-
- ${{ step }}
151-
152149
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
153150
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
154151
parameters:

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,18 @@ jobs:
172172
targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
173173
artifactName: AssetManifests
174174
displayName: 'Publish Merged Manifest'
175-
retryCountOnTaskFailure: 10 # for any logs being locked
176-
sbomEnabled: false # we don't need SBOM for logs
175+
retryCountOnTaskFailure: 10 # for any files being locked
176+
isProduction: false # just metadata for publishing
177177

178-
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
178+
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
179179
parameters:
180180
is1ESPipeline: ${{ parameters.is1ESPipeline }}
181181
args:
182182
displayName: Publish ReleaseConfigs Artifact
183-
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
184-
publishLocation: Container
183+
targetPath: '$(Build.StagingDirectory)/ReleaseConfigs'
185184
artifactName: ReleaseConfigs
185+
retryCountOnTaskFailure: 10 # for any files being locked
186+
isProduction: false # just metadata for publishing
186187

187188
- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
188189
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -218,4 +219,5 @@ jobs:
218219
- template: /eng/common/core-templates/steps/publish-logs.yml
219220
parameters:
220221
is1ESPipeline: ${{ parameters.is1ESPipeline }}
221-
JobLabel: 'Publish_Artifacts_Logs'
222+
StageLabel: 'BuildAssetRegistry'
223+
JobLabel: 'Publish_Artifacts_Logs'

‎eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ parameters:
4343

4444
artifacts: {}
4545
is1ESPipeline: ''
46+
47+
# Publishing version w/default.
48+
publishingVersion: 3
49+
4650
repositoryAlias: self
4751
officialBuildId: ''
4852

@@ -102,6 +106,7 @@ jobs:
102106
parameters:
103107
is1ESPipeline: ${{ parameters.is1ESPipeline }}
104108
continueOnError: ${{ parameters.continueOnError }}
109+
publishingVersion: ${{ parameters.publishingVersion }}
105110
dependsOn:
106111
- ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}:
107112
- ${{ each job in parameters.publishBuildAssetsDependsOn }}:

0 commit comments

Comments
 (0)