Skip to content

Commit fccaa58

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 270450
Updated Dependencies: Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-preview.5.25302.103 -> 10.0.100-preview.5.25303.102) Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.NET.HostModel, System.IO.Hashing, Microsoft.Extensions.DependencyModel, Microsoft.NET.Runtime.Emscripten.Sdk.Internal, Microsoft.NET.ILLink.Tasks, System.CodeDom, System.Formats.Asn1, System.Security.Cryptography.ProtectedData, System.Text.Encoding.CodePages, System.Resources.Extensions, Microsoft.WindowsDesktop.App.Ref, Microsoft.WindowsDesktop.App.Internal, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.Extensions.FileProviders.Embedded, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components.Web, Microsoft.JSInterop, Microsoft.Extensions.ObjectPool, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.TestHost, Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.DotNet.Wpf.ProjectTemplates, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.FileSystemGlobbing, System.ServiceProcess.ServiceController, System.Text.Json, Microsoft.Bcl.AsyncInterfaces, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Win32.SystemEvents, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions, System.Reflection.MetadataLoadContext, Microsoft.Extensions.Configuration.Ini (Version 10.0.0-preview.6.25302.103 -> 10.0.0-preview.6.25303.102) Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.CLI, Microsoft.TestPlatform.Build (Version 17.15.0-preview-25302-103 -> 17.15.0-preview-25303-102) Microsoft.FSharp.Compiler (Version 14.0.100-beta.25302.103 -> 14.0.100-beta.25303.102) Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.CodeAnalysis.PublicApiAnalyzers (Version 5.0.0-1.25302.103 -> 5.0.0-1.25303.102) Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport, Microsoft.Web.Xdt, Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25302.103 -> 10.0.0-preview.25303.102) System.CommandLine (Version 2.0.0-beta5.25302.103 -> 2.0.0-beta5.25303.102) Microsoft.DiaSymReader (Version 2.2.0-beta.25302.103 -> 2.2.0-beta.25303.102) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25302.103 -> 2.0.0-preview.1.25303.102) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab, Microsoft.SourceLink.Bitbucket.Git, Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XUnitExtensions, Microsoft.DotNet.XliffTasks (Version 10.0.0-beta.25302.103 -> 10.0.0-beta.25303.102)
1 parent 34eaf3d commit fccaa58

File tree

7 files changed

+390
-352
lines changed

7 files changed

+390
-352
lines changed

eng/Version.Details.xml

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

eng/Versions.props

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

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.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

0 commit comments

Comments
 (0)