Skip to content

Commit 505c2b8

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 270450 (#10910)
Updated Dependencies: Microsoft.Private.Winforms, Microsoft.Dotnet.WinForms.ProjectTemplates, System.Reflection.MetadataLoadContext, System.Windows.Extensions, Microsoft.NETCore.Platforms, System.Resources.Extensions, System.Runtime.Serialization.Formatters, Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Formats.Nrbf, System.IO.Packaging, System.Security.Cryptography.Xml, System.Security.Permissions, System.Drawing.Common (Version 10.0.0-preview.6.25302.103 -> 10.0.0-preview.6.25303.102) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.GenAPI, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.GitHub (Version 10.0.0-beta.25302.103 -> 10.0.0-beta.25303.102) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 648d092 commit 505c2b8

File tree

7 files changed

+120
-82
lines changed

7 files changed

+120
-82
lines changed

‎eng/Version.Details.xml

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,104 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7" BarId="270315" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="ac2aaf24d127067df385f2aa5ab35bb9b96d5f74" BarId="270450" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25302.103">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25303.102">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
7+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25302.103">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25303.102">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
11+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25302.103">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25303.102">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
15+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25302.103">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25303.102">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
19+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25302.103">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25303.102">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
23+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.5.25222.1">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>462eb030906d5cfcbcbbe22126855da1073cda15</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25302.103">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25303.102">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
31+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25302.103">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25303.102">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
35+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25302.103">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25303.102">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
39+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25302.103">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25303.102">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
43+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25302.103">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25303.102">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
47+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.6.25302.103">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.6.25303.102">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
51+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.6.25302.103">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.6.25303.102">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
55+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25302.103">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25303.102">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
59+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.6.25302.103">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.6.25303.102">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
63+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.6.25302.103">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.6.25303.102">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
67+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.6.25302.103">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.6.25303.102">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
71+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25302.103">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25303.102">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
75+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25302.103">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25303.102">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
81+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25302.103">
83+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25303.102">
8484
<Uri>https://github.com/dotnet/dotnet</Uri>
85-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
85+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
8686
</Dependency>
87-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25302.103">
87+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25303.102">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
89+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25302.103">
91+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25303.102">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
93+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25302.103">
95+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25303.102">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
97+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25302.103">
99+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25303.102">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
101+
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
102102
</Dependency>
103103
</ToolsetDependencies>
104104
</Dependencies>

‎eng/Versions.props

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,33 @@
1919
dotnet/winforms is handling versions for the analyzers.
2020
-->
2121
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
22-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25302.103</MicrosoftDotNetCodeAnalysisVersion>
23-
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25302.103</MicrosoftSourceLinkAzureReposGitVersion>
24-
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25302.103</MicrosoftSourceLinkGitHubVersion>
22+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25303.102</MicrosoftDotNetCodeAnalysisVersion>
23+
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25303.102</MicrosoftSourceLinkAzureReposGitVersion>
24+
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25303.102</MicrosoftSourceLinkGitHubVersion>
2525
</PropertyGroup>
2626
<!-- Packages that come from https://github.com/dotnet/winforms -->
2727
<PropertyGroup>
28-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25302.103</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29-
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25302.103</MicrosoftPrivateWinformsVersion>
30-
<SystemDrawingCommonVersion>10.0.0-preview.6.25302.103</SystemDrawingCommonVersion>
28+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25303.102</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29+
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25303.102</MicrosoftPrivateWinformsVersion>
30+
<SystemDrawingCommonVersion>10.0.0-preview.6.25303.102</SystemDrawingCommonVersion>
3131
</PropertyGroup>
3232
<!-- Packages that come from https://github.com/dotnet/runtime -->
3333
<PropertyGroup>
34-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25302.103</MicrosoftNETCoreAppRefVersion>
35-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25302.103</MicrosoftNETCorePlatformsVersion>
36-
<SystemCodeDomPackageVersion>10.0.0-preview.6.25302.103</SystemCodeDomPackageVersion>
37-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25302.103</SystemConfigurationConfigurationManagerPackageVersion>
38-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.6.25302.103</SystemDiagnosticsEventLogPackageVersion>
39-
<SystemDirectoryServicesVersion>10.0.0-preview.6.25302.103</SystemDirectoryServicesVersion>
40-
<SystemFormatsNrbfVersion>10.0.0-preview.6.25302.103</SystemFormatsNrbfVersion>
41-
<SystemIOPackagingVersion>10.0.0-preview.6.25302.103</SystemIOPackagingVersion>
42-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25302.103</SystemReflectionMetadataLoadContextVersion>
34+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25303.102</MicrosoftNETCoreAppRefVersion>
35+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25303.102</MicrosoftNETCorePlatformsVersion>
36+
<SystemCodeDomPackageVersion>10.0.0-preview.6.25303.102</SystemCodeDomPackageVersion>
37+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25303.102</SystemConfigurationConfigurationManagerPackageVersion>
38+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.6.25303.102</SystemDiagnosticsEventLogPackageVersion>
39+
<SystemDirectoryServicesVersion>10.0.0-preview.6.25303.102</SystemDirectoryServicesVersion>
40+
<SystemFormatsNrbfVersion>10.0.0-preview.6.25303.102</SystemFormatsNrbfVersion>
41+
<SystemIOPackagingVersion>10.0.0-preview.6.25303.102</SystemIOPackagingVersion>
42+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25303.102</SystemReflectionMetadataLoadContextVersion>
4343
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
44-
<SystemResourcesExtensionsVersion>10.0.0-preview.6.25302.103</SystemResourcesExtensionsVersion>
45-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25302.103</SystemRuntimeSerializationFormattersPackageVersion>
46-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.6.25302.103</SystemSecurityCryptographyXmlPackageVersion>
47-
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.6.25302.103</SystemSecurityPermissionsPackageVersion>
48-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25302.103</SystemWindowsExtensionsPackageVersion>
44+
<SystemResourcesExtensionsVersion>10.0.0-preview.6.25303.102</SystemResourcesExtensionsVersion>
45+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25303.102</SystemRuntimeSerializationFormattersPackageVersion>
46+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.6.25303.102</SystemSecurityCryptographyXmlPackageVersion>
47+
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.6.25303.102</SystemSecurityPermissionsPackageVersion>
48+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25303.102</SystemWindowsExtensionsPackageVersion>
4949
</PropertyGroup>
5050
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
5151
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
@@ -59,7 +59,7 @@
5959
<!-- Packages that come from https://github.com/dotnet/arcade -->
6060
<PropertyGroup>
6161
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
62-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25302.103</MicrosoftDotNetGenAPIVersion>
62+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25303.102</MicrosoftDotNetGenAPIVersion>
6363
</PropertyGroup>
6464
<!-- Sourcelink -->
6565
<PropertyGroup>

‎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/tools.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,7 @@ function GetDarc {
528528
fi
529529

530530
"$eng_root/common/darc-init.sh" --toolpath "$darc_path" $version
531+
darc_tool="$darc_path/darc"
531532
}
532533

533534
# Returns a full path to an Arcade SDK task project file.

‎eng/common/vmr-sync.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ Set-StrictMode -Version Latest
103103
Highlight 'Installing .NET, preparing the tooling..'
104104
. .\eng\common\tools.ps1
105105
$dotnetRoot = InitializeDotNetCli -install:$true
106+
$darc = Get-Darc
106107
$dotnet = "$dotnetRoot\dotnet.exe"
107-
& "$dotnet" tool restore
108108

109109
Highlight "Starting the synchronization of VMR.."
110110

111111
# Synchronize the VMR
112112
$darcArgs = (
113-
"darc", "vmr", "forwardflow",
113+
"vmr", "forwardflow",
114114
"--tmp", $tmpDir,
115115
"--$verbosity",
116116
$vmrDir
@@ -124,7 +124,7 @@ if ($azdevPat) {
124124
$darcArgs += ("--azdev-pat", $azdevPat)
125125
}
126126

127-
& "$dotnet" $darcArgs
127+
& "$darc" $darcArgs
128128

129129
if ($LASTEXITCODE -eq 0) {
130130
Highlight "Synchronization succeeded"

‎eng/common/vmr-sync.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ set -e
164164
highlight 'Installing .NET, preparing the tooling..'
165165
source "./eng/common/tools.sh"
166166
InitializeDotNetCli true
167+
GetDarc
167168
dotnetDir=$( cd ./.dotnet/; pwd -P )
168169
dotnet=$dotnetDir/dotnet
169-
"$dotnet" tool restore
170170

171171
highlight "Starting the synchronization of VMR.."
172172
set +e
@@ -186,7 +186,9 @@ fi
186186

187187
# Synchronize the VMR
188188

189-
"$dotnet" darc vmr forwardflow \
189+
export DOTNET_ROOT="$dotnetDir"
190+
191+
"$darc_tool" vmr forwardflow \
190192
--tmp "$tmp_dir" \
191193
$azdev_pat \
192194
--$verbosity \

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25302.103",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25302.103",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25303.102",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25303.102",
1919
"Microsoft.Build.NoTargets": "3.7.56"
2020
},
2121
"sdk": {

0 commit comments

Comments
 (0)