Skip to content

Commit 1b6af73

Browse files
dotnet-maestro[bot]Shyam-Gupta
dotnet-maestro[bot]
and
Shyam-Gupta
authored
[release/10.0] Source code updates from dotnet/dotnet (#14463)
* Update dependencies from build 309867 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.CMake.Sdk, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.XUnitV3Extensions (Version 10.0.0-beta.26209.115 -> 10.0.0-beta.26210.105) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm, Microsoft.Win32.SystemEvents, runtime.win-x64.Microsoft.NETCore.ILAsm, System.CodeDom, System.Configuration.ConfigurationManager, System.Formats.Nrbf, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Text.Encodings.Web, System.Text.Json, System.Windows.Extensions, runtime.win-x86.Microsoft.NETCore.ILAsm (Version 10.0.7 -> 10.0.7) Microsoft.NETCore.Platforms (Version 10.0.7-servicing.26209.115 -> 10.0.7-servicing.26210.105) [[ commit created by automation ]] * Update package source key in NuGet.config --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Shyam Gupta <shgu@microsoft.com>
1 parent 21ac3a2 commit 1b6af73

21 files changed

Lines changed: 219 additions & 305 deletions

‎NuGet.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<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" />
7+
<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" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1010
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -21,7 +21,7 @@
2121
</packageSources>
2222
<packageSourceMapping>
2323
<clear />
24-
<packageSource key="darc-pub-dotnet-dotnet-8639c3b">
24+
<packageSource key="darc-pub-dotnet-dotnet-d14d02d">
2525
<package pattern="Microsoft.*" />
2626
<package pattern="runtime.*" />
2727
<package pattern="System.*" />

‎eng/Version.Details.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetCMakeSdkPackageVersion>
12-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetGenFacadesPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetRemoteExecutorPackageVersion>
15-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetCMakeSdkPackageVersion>
12+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetGenFacadesPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetRemoteExecutorPackageVersion>
15+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
1616
<MicrosoftNETSdkILPackageVersion>10.0.7</MicrosoftNETSdkILPackageVersion>
1717
<MicrosoftNETCoreAppRefPackageVersion>10.0.7</MicrosoftNETCoreAppRefPackageVersion>
1818
<MicrosoftNETCoreILAsmPackageVersion>10.0.7</MicrosoftNETCoreILAsmPackageVersion>
1919
<MicrosoftNETCoreILDAsmPackageVersion>10.0.7</MicrosoftNETCoreILDAsmPackageVersion>
20-
<MicrosoftNETCorePlatformsPackageVersion>10.0.7-servicing.26209.115</MicrosoftNETCorePlatformsPackageVersion>
20+
<MicrosoftNETCorePlatformsPackageVersion>10.0.7-servicing.26210.105</MicrosoftNETCorePlatformsPackageVersion>
2121
<MicrosoftWin32SystemEventsPackageVersion>10.0.7</MicrosoftWin32SystemEventsPackageVersion>
2222
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.7</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
2323
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.7</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="8639c3b28a6eac36e38a59c9cae67aa52b1b06a8" BarId="309770" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="d14d02dd9f70268be43db2ae722433f7d4461fb8" BarId="309867" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.7-servicing.26209.115">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.7-servicing.26210.105">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
13+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
1414
</Dependency>
1515
<Dependency Name="System.Resources.Extensions" Version="10.0.7">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
17+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
1818
</Dependency>
1919
<Dependency Name="System.Windows.Extensions" Version="10.0.7">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
21+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
2222
</Dependency>
2323
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.7">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
25+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
2626
</Dependency>
2727
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.7">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
29+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
3030
</Dependency>
3131
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.7">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
33+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
3434
</Dependency>
3535
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.7">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
37+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
3838
</Dependency>
3939
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.7">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
41+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
4242
</Dependency>
4343
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.7">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
45+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
4646
</Dependency>
4747
<Dependency Name="System.Text.Encodings.Web" Version="10.0.7">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
49+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
5050
</Dependency>
5151
<Dependency Name="System.Text.Json" Version="10.0.7">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
53+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
5454
</Dependency>
5555
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.7">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
57+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
5858
</Dependency>
5959
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.7">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
61+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
6262
</Dependency>
6363
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.7">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
65+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
6666
</Dependency>
6767
<Dependency Name="System.CodeDom" Version="10.0.7">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
69+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
7070
</Dependency>
7171
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.7">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
73+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
7474
</Dependency>
7575
<Dependency Name="System.Formats.Nrbf" Version="10.0.7">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
77+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
7878
</Dependency>
7979
<Dependency Name="System.IO.Hashing" Version="10.0.7">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
81+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26209.115">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26210.105">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
88+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.26209.115">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.26210.105">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
92+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.26209.115">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.26210.105">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
96+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26209.115">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26210.105">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
100+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.26209.115">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.26210.105">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
104+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.26209.115">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.26210.105">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
108+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26209.115">
110+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26210.105">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
112+
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
113113
</Dependency>
114114
</ToolsetDependencies>
115115
</Dependencies>

‎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)