Skip to content

Commit 6de80cf

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#11203)
* Update dependencies from https://github.com/dotnet/dotnet build 288041 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25520.104 -> 11.0.0-beta.25521.106) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25520.104 -> 10.0.0-rc.1.25521.106) * Update dependencies from https://github.com/dotnet/dotnet build 288109 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25521.106 -> 11.0.0-beta.25522.101) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25521.106 -> 10.0.0-rc.1.25522.101) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b9ac895 commit 6de80cf

File tree

9 files changed

+330
-309
lines changed

9 files changed

+330
-309
lines changed

‎eng/Version.Details.props‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ 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>11.0.0-beta.25520.104</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25520.104</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25520.104</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25520.104</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25520.104</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25520.104</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25520.104</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25520.104</MicrosoftPrivateWinformsPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25522.101</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25522.101</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25522.101</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25522.101</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25522.101</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25522.101</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25522.101</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25522.101</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
21-
<SystemCodeDomPackageVersion>10.0.0-rc.1.25520.104</SystemCodeDomPackageVersion>
22-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25520.104</SystemConfigurationConfigurationManagerPackageVersion>
23-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25520.104</SystemDiagnosticsEventLogPackageVersion>
24-
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25520.104</SystemDirectoryServicesPackageVersion>
25-
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25520.104</SystemDrawingCommonPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25520.104</SystemFormatsNrbfPackageVersion>
27-
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25520.104</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25520.104</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25520.104</SystemReflectionMetadataLoadContextPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25520.104</SystemResourcesExtensionsPackageVersion>
31-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25520.104</SystemRuntimeSerializationFormattersPackageVersion>
32-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25520.104</SystemSecurityCryptographyXmlPackageVersion>
33-
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25520.104</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25520.104</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>10.0.0-rc.1.25522.101</SystemCodeDomPackageVersion>
22+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25522.101</SystemConfigurationConfigurationManagerPackageVersion>
23+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25522.101</SystemDiagnosticsEventLogPackageVersion>
24+
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25522.101</SystemDirectoryServicesPackageVersion>
25+
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25522.101</SystemDrawingCommonPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25522.101</SystemFormatsNrbfPackageVersion>
27+
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25522.101</SystemIOPackagingPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25522.101</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25522.101</SystemReflectionMetadataLoadContextPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25522.101</SystemResourcesExtensionsPackageVersion>
31+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25522.101</SystemRuntimeSerializationFormattersPackageVersion>
32+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25522.101</SystemSecurityCryptographyXmlPackageVersion>
33+
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25522.101</SystemSecurityPermissionsPackageVersion>
34+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25522.101</SystemWindowsExtensionsPackageVersion>
3535
<!-- _git/dotnet-wpf-int dependencies -->
3636
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25513.8</MicrosoftDotNetWpfDncEngPackageVersion>
3737
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 45 additions & 45 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="1bdc5cdcf4cf408e00aa3c60f58520083bf2474f" BarId="287856" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="2e13727a96e95d0856ff9fa35bb896b1c1b633e6" BarId="288109" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25520.104">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25522.101">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
7+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25520.104">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25522.101">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
11+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25520.104">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25522.101">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
15+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25520.104">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25522.101">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
19+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25520.104">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25522.101">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
23+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25513.8">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>6ae9d774864ecf3dde943c58647257f250505fd9</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25520.104">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25522.101">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
31+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25520.104">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25522.101">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
35+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25520.104">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25522.101">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
39+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25520.104">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25522.101">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
43+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25520.104">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25522.101">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
47+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25520.104">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25522.101">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
51+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25520.104">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25522.101">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
55+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25520.104">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25522.101">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
59+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25520.104">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25522.101">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
63+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25520.104">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25522.101">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
67+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25520.104">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25522.101">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
71+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25520.104">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25522.101">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
75+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,21 +84,21 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25520.104">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25522.101">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
89+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25520.104">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25522.101">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
93+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25520.104">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25522.101">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
97+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25520.104">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25522.101">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
101+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
102102
</Dependency>
103103
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
104104
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
@@ -109,9 +109,9 @@
109109
<Uri>https://github.com/dotnet/dotnet</Uri>
110110
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
111111
</Dependency>
112-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25520.104">
112+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25522.101">
113113
<Uri>https://github.com/dotnet/dotnet</Uri>
114-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
114+
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
115115
</Dependency>
116116
</ToolsetDependencies>
117117
</Dependencies>

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ EnableInternalPackageSource() {
6666
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
6767
if [ "$?" == "0" ]; then
6868
echo "Enabling internal source '$PackageSourceName'."
69-
# Remove the disabled entry
70-
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
71-
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
72-
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
69+
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
70+
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
7371

7472
# Add the source name to PackageSources for credential handling
7573
PackageSources+=("$PackageSourceName")

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ jobs:
9191
fetchDepth: 3
9292
clean: true
9393

94-
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95-
- ${{ if eq(parameters.publishingVersion, 3) }}:
94+
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95+
- ${{ if eq(parameters.publishingVersion, 3) }}:
9696
- task: DownloadPipelineArtifact@2
9797
displayName: Download Asset Manifests
9898
inputs:
@@ -117,9 +117,16 @@ jobs:
117117
flattenFolders: true
118118
condition: ${{ parameters.condition }}
119119
continueOnError: ${{ parameters.continueOnError }}
120-
120+
121121
- task: NuGetAuthenticate@1
122122

123+
# Populate internal runtime variables.
124+
- template: /eng/common/templates/steps/enable-internal-sources.yml
125+
parameters:
126+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
127+
128+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
129+
123130
- task: AzureCLI@2
124131
displayName: Publish Build Assets
125132
inputs:
@@ -132,9 +139,12 @@ jobs:
132139
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133140
/p:MaestroApiEndpoint=https://maestro.dot.net
134141
/p:OfficialBuildId=$(OfficialBuildId)
142+
-runtimeSourceFeed https://ci.dot.net/internal
143+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
144+
135145
condition: ${{ parameters.condition }}
136146
continueOnError: ${{ parameters.continueOnError }}
137-
147+
138148
- task: powershell@2
139149
displayName: Create ReleaseConfigs Artifact
140150
inputs:
@@ -162,7 +172,7 @@ jobs:
162172
artifactName: AssetManifests
163173
displayName: 'Publish Merged Manifest'
164174
retryCountOnTaskFailure: 10 # for any logs being locked
165-
sbomEnabled: false # we don't need SBOM for logs
175+
sbomEnabled: false # we don't need SBOM for logs
166176

167177
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
168178
parameters:
@@ -195,9 +205,11 @@ jobs:
195205
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
196206
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
197207
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
208+
-runtimeSourceFeed https://ci.dot.net/internal
209+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
198210
199211
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
200212
- template: /eng/common/core-templates/steps/publish-logs.yml
201213
parameters:
202214
is1ESPipeline: ${{ parameters.is1ESPipeline }}
203-
JobLabel: 'Publish_Artifacts_Logs'
215+
JobLabel: 'Publish_Artifacts_Logs'

0 commit comments

Comments
 (0)