Skip to content

Commit a1e337c

Browse files
rmarinhormarinho
authored
[ci] Move to preview6 (#29736)
* [ci] Move to preview6 * [ci] Update preview 6 packages * [ci] Update sdk and other packages
1 parent c92932f commit a1e337c

File tree

13 files changed

+194
-189
lines changed

13 files changed

+194
-189
lines changed

‎eng/Version.Details.xml‎

Lines changed: 80 additions & 80 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,36 @@
3030
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
3131
<MicrosoftMauiPreviousDotNetReleasedVersion>9.0.51</MicrosoftMauiPreviousDotNetReleasedVersion>
3232
<!-- dotnet/sdk -->
33-
<MicrosoftNETSdkPackageVersion>10.0.100-preview.5.25277.114</MicrosoftNETSdkPackageVersion>
33+
<MicrosoftNETSdkPackageVersion>10.0.100-preview.6.25311.107</MicrosoftNETSdkPackageVersion>
3434
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
3535
<!-- dotnet/runtime -->
36-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25277.114</MicrosoftNETCoreAppRefPackageVersion>
36+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25311.107</MicrosoftNETCoreAppRefPackageVersion>
3737
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
3838
<SystemTextEncodingsWebPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextEncodingsWebPackageVersion>
3939
<MicrosoftBclAsyncInterfacesPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftBclAsyncInterfacesPackageVersion>
4040
<!-- Microsoft/Extensions -->
4141
<SystemCodeDomPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemCodeDomPackageVersion>
42-
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsConfigurationVersion>
43-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsConfigurationAbstractionsVersion>
44-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsConfigurationJsonVersion>
45-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsDependencyInjectionVersion>
46-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
47-
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsFileProvidersAbstractionsVersion>
48-
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsLoggingAbstractionsVersion>
49-
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsLoggingVersion>
50-
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsLoggingConsoleVersion>
51-
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsLoggingDebugVersion>
52-
<MicrosoftExtensionsPrimitivesVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsPrimitivesVersion>
53-
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-preview.5.25277.114</MicrosoftExtensionsHostingAbstractionsVersion>
42+
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsConfigurationVersion>
43+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsConfigurationAbstractionsVersion>
44+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsConfigurationJsonVersion>
45+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsDependencyInjectionVersion>
46+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
47+
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsFileProvidersAbstractionsVersion>
48+
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsLoggingAbstractionsVersion>
49+
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsLoggingVersion>
50+
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsLoggingConsoleVersion>
51+
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsLoggingDebugVersion>
52+
<MicrosoftExtensionsPrimitivesVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsPrimitivesVersion>
53+
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-preview.6.25311.107</MicrosoftExtensionsHostingAbstractionsVersion>
5454
<!-- xamarin/xamarin-android -->
55-
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-preview.5.115</MicrosoftAndroidSdkWindowsPackageVersion>
55+
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-ci.main.142</MicrosoftAndroidSdkWindowsPackageVersion>
5656
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.61</MicrosoftNETSdkAndroidManifest90100PackageVersion>
5757
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
5858
<!-- xamarin/xamarin-macios -->
59-
<MicrosoftMacCatalystSdknet100_184PackageVersion>18.4.10618-net10-p5</MicrosoftMacCatalystSdknet100_184PackageVersion>
60-
<MicrosoftmacOSSdknet100_154PackageVersion>15.4.10618-net10-p5</MicrosoftmacOSSdknet100_154PackageVersion>
61-
<MicrosoftiOSSdknet100_184PackageVersion>18.4.10618-net10-p5</MicrosoftiOSSdknet100_184PackageVersion>
62-
<MicrosofttvOSSdknet100_184PackageVersion>18.4.10618-net10-p5</MicrosofttvOSSdknet100_184PackageVersion>
59+
<MicrosoftMacCatalystSdknet100_184PackageVersion>18.4.10636-net10-p6</MicrosoftMacCatalystSdknet100_184PackageVersion>
60+
<MicrosoftmacOSSdknet100_154PackageVersion>15.4.10636-net10-p6</MicrosoftmacOSSdknet100_154PackageVersion>
61+
<MicrosoftiOSSdknet100_184PackageVersion>18.4.10636-net10-p6</MicrosoftiOSSdknet100_184PackageVersion>
62+
<MicrosofttvOSSdknet100_184PackageVersion>18.4.10636-net10-p6</MicrosofttvOSSdknet100_184PackageVersion>
6363
<!-- Samsung/Tizen.NET -->
6464
<SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
6565
<!-- wasdk -->
@@ -68,19 +68,19 @@
6868
<MicrosoftGraphicsWin2DPackageVersion>1.3.2</MicrosoftGraphicsWin2DPackageVersion>
6969
<MicrosoftWindowsWebView2PackageVersion>1.0.3179.45</MicrosoftWindowsWebView2PackageVersion>
7070
<!-- Everything else -->
71-
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreAuthorizationPackageVersion>
72-
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
73-
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
74-
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
75-
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
76-
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreComponentsFormsPackageVersion>
77-
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreComponentsPackageVersion>
78-
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreComponentsWebPackageVersion>
79-
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
80-
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
81-
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
82-
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-preview.5.25277.114</MicrosoftAspNetCoreMetadataPackageVersion>
83-
<MicrosoftJSInteropPackageVersion>10.0.0-preview.5.25277.114</MicrosoftJSInteropPackageVersion>
71+
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreAuthorizationPackageVersion>
72+
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
73+
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
74+
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
75+
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
76+
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreComponentsFormsPackageVersion>
77+
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreComponentsPackageVersion>
78+
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreComponentsWebPackageVersion>
79+
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
80+
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
81+
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
82+
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-preview.6.25311.107</MicrosoftAspNetCoreMetadataPackageVersion>
83+
<MicrosoftJSInteropPackageVersion>10.0.0-preview.6.25311.107</MicrosoftJSInteropPackageVersion>
8484
<!-- Everything else (previous edition) -->
8585
<MicrosoftAspNetCorePackageVersion>8.0.16</MicrosoftAspNetCorePackageVersion>
8686
<MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>$(MicrosoftAspNetCorePackageVersion)</MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>
@@ -136,13 +136,13 @@
136136
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
137137
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
138138
<SystemDrawingCommonPackageVersion>9.0.0</SystemDrawingCommonPackageVersion>
139-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25277.114</MicrosoftDotNetBuildTasksFeedVersion>
140-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25277.114</MicrosoftDotNetBuildTasksInstallersPackageVersion>
141-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25277.114</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
142-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25277.114</MicrosoftDotNetHelixSdkPackageVersion>
139+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25311.107</MicrosoftDotNetBuildTasksFeedVersion>
140+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25311.107</MicrosoftDotNetBuildTasksInstallersPackageVersion>
141+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25311.107</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
142+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25311.107</MicrosoftDotNetHelixSdkPackageVersion>
143143
<MicroBuildPluginsSwixBuildDotnetPackageVersion>1.1.87-gba258badda</MicroBuildPluginsSwixBuildDotnetPackageVersion>
144-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25277.114</MicrosoftDotNetRemoteExecutorPackageVersion>
145-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25277.114</MicrosoftDotNetXUnitExtensionsPackageVersion>
144+
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25311.107</MicrosoftDotNetRemoteExecutorPackageVersion>
145+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25311.107</MicrosoftDotNetXUnitExtensionsPackageVersion>
146146
</PropertyGroup>
147147
<PropertyGroup>
148148
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>
@@ -216,4 +216,4 @@
216216
<MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet100_184PackageVersion)</MicrosoftiOSSdkPackageVersion>
217217
<MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet100_184PackageVersion)</MicrosofttvOSSdkPackageVersion>
218218
</PropertyGroup>
219-
</Project>
219+
</Project>

‎eng/common/build.ps1‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Param(
2121
[switch] $publish,
2222
[switch] $clean,
2323
[switch][Alias('pb')]$productBuild,
24+
[switch]$fromVMR,
2425
[switch][Alias('bl')]$binaryLog,
2526
[switch][Alias('nobl')]$excludeCIBinarylog,
2627
[switch] $ci,
@@ -74,6 +75,7 @@ function Print-Usage() {
7475
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7576
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
7677
Write-Host " -buildCheck Sets /check msbuild parameter"
78+
Write-Host " -fromVMR Set when building from within the VMR"
7779
Write-Host ""
7880

7981
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -128,6 +130,7 @@ function Build {
128130
/p:Test=$test `
129131
/p:Pack=$pack `
130132
/p:DotNetBuild=$productBuild `
133+
/p:DotNetBuildFromVMR=$fromVMR `
131134
/p:IntegrationTest=$integrationTest `
132135
/p:PerformanceTest=$performanceTest `
133136
/p:Sign=$sign `

‎eng/common/build.sh‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ usage()
4343
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
4545
echo " --buildCheck <value> Sets /check msbuild parameter"
46+
echo " --fromVMR Set when building from within the VMR"
4647
echo ""
4748
echo "Command line arguments not listed above are passed thru to msbuild."
4849
echo "Arguments can also be passed in with a single hyphen."
@@ -64,6 +65,7 @@ restore=false
6465
build=false
6566
source_build=false
6667
product_build=false
68+
from_vmr=false
6769
rebuild=false
6870
test=false
6971
integration_test=false
@@ -89,7 +91,7 @@ verbosity='minimal'
8991
runtime_source_feed=''
9092
runtime_source_feed_key=''
9193

92-
properties=''
94+
properties=()
9395
while [[ $# > 0 ]]; do
9496
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9597
case "$opt" in
@@ -142,6 +144,9 @@ while [[ $# > 0 ]]; do
142144
restore=true
143145
pack=true
144146
;;
147+
-fromvmr|-from-vmr)
148+
from_vmr=true
149+
;;
145150
-test|-t)
146151
test=true
147152
;;
@@ -187,7 +192,7 @@ while [[ $# > 0 ]]; do
187192
shift
188193
;;
189194
*)
190-
properties="$properties $1"
195+
properties+=("$1")
191196
;;
192197
esac
193198

@@ -221,7 +226,7 @@ function Build {
221226
InitializeCustomToolset
222227

223228
if [[ ! -z "$projects" ]]; then
224-
properties="$properties /p:Projects=$projects"
229+
properties+=("/p:Projects=$projects")
225230
fi
226231

227232
local bl=""
@@ -243,6 +248,7 @@ function Build {
243248
/p:Build=$build \
244249
/p:DotNetBuild=$product_build \
245250
/p:DotNetBuildSourceOnly=$source_build \
251+
/p:DotNetBuildFromVMR=$from_vmr \
246252
/p:Rebuild=$rebuild \
247253
/p:Test=$test \
248254
/p:Pack=$pack \
@@ -251,7 +257,7 @@ function Build {
251257
/p:Sign=$sign \
252258
/p:Publish=$publish \
253259
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
254-
$properties
260+
${properties[@]+"${properties[@]}"}
255261

256262
ExitWithExitCode 0
257263
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ jobs:
8686
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
8787
${{ if eq(parameters.CreatePr, true) }}:
8888
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
89-
${{ if eq(parameters.RepoType, 'gitHub') }}:
90-
isShouldReusePrSelected: ${{ parameters.ReusePr }}
89+
isShouldReusePrSelected: ${{ parameters.ReusePr }}
9190
packageSourceAuth: patAuth
9291
patVariable: ${{ parameters.CeapexPat }}
9392
${{ if eq(parameters.RepoType, 'gitHub') }}:
@@ -118,4 +117,4 @@ jobs:
118117
pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
119118
publishLocation: Container
120119
artifactName: Loc
121-
condition: ${{ parameters.condition }}
120+
condition: ${{ parameters.condition }}

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

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ parameters:
3232
# Optional: 🌤️ or not the build has assets it wants to publish to BAR
3333
isAssetlessBuild: false
3434

35+
# Optional, publishing version
36+
publishingVersion: 3
37+
38+
# Optional: A minimatch pattern for the asset manifests to publish to BAR
39+
assetManifestsPattern: '*/manifests/**/*.xml'
40+
3541
jobs:
3642
- job: Asset_Registry_Publish
3743

@@ -77,13 +83,31 @@ jobs:
7783
clean: true
7884

7985
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
80-
- task: DownloadPipelineArtifact@2
81-
displayName: Download Asset Manifests
82-
inputs:
83-
artifactName: AssetManifests
84-
targetPath: '$(Build.StagingDirectory)/AssetManifests'
85-
condition: ${{ parameters.condition }}
86-
continueOnError: ${{ parameters.continueOnError }}
86+
- ${{ if eq(parameters.publishingVersion, 3) }}:
87+
- task: DownloadPipelineArtifact@2
88+
displayName: Download Asset Manifests
89+
inputs:
90+
artifactName: AssetManifests
91+
targetPath: '$(Build.StagingDirectory)/AssetManifests'
92+
condition: ${{ parameters.condition }}
93+
continueOnError: ${{ parameters.continueOnError }}
94+
- ${{ if eq(parameters.publishingVersion, 4) }}:
95+
- task: DownloadPipelineArtifact@2
96+
displayName: Download V4 asset manifests
97+
inputs:
98+
itemPattern: '*/manifests/**/*.xml'
99+
targetPath: '$(Build.StagingDirectory)/AllAssetManifests'
100+
condition: ${{ parameters.condition }}
101+
continueOnError: ${{ parameters.continueOnError }}
102+
- task: CopyFiles@2
103+
displayName: Copy V4 asset manifests to AssetManifests
104+
inputs:
105+
SourceFolder: '$(Build.StagingDirectory)/AllAssetManifests'
106+
Contents: ${{ parameters.assetManifestsPattern }}
107+
TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
108+
flattenFolders: true
109+
condition: ${{ parameters.condition }}
110+
continueOnError: ${{ parameters.continueOnError }}
87111

88112
- task: NuGetAuthenticate@1
89113

@@ -120,6 +144,17 @@ jobs:
120144
Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs"
121145
}
122146
147+
- ${{ if eq(parameters.publishingVersion, 4) }}:
148+
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
149+
parameters:
150+
is1ESPipeline: ${{ parameters.is1ESPipeline }}
151+
args:
152+
targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
153+
artifactName: AssetManifests
154+
displayName: 'Publish Merged Manifest'
155+
retryCountOnTaskFailure: 10 # for any logs being locked
156+
sbomEnabled: false # we don't need SBOM for logs
157+
123158
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
124159
parameters:
125160
is1ESPipeline: ${{ parameters.is1ESPipeline }}

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,6 @@ stages:
193193
buildId: $(AzDOBuildId)
194194
artifactName: PackageArtifacts
195195
checkDownloadedFiles: true
196-
itemPattern: |
197-
**
198-
!**/Microsoft.SourceBuild.Intermediate.*.nupkg
199196

200197
# This is necessary whenever we want to publish/restore to an AzDO private feed
201198
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here

0 commit comments

Comments
 (0)