Skip to content

Commit 48553c1

Browse files
SourceCodeWhenSourceCodeWhen
authored
Merge branch 'main' into ChangeSlnToSolutionWithAlias
2 parents cc86058 + 0052c4d commit 48553c1

File tree

112 files changed

+1095
-1289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1095
-1289
lines changed

‎NuGet.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +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-aspire -->
7-
<add key="darc-pub-dotnet-aspire-137e8dc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-137e8dca/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-aspire-137e8dc-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-137e8dca-1/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-aspire-a1f7880-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-a1f7880a-1/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-aspire -->
109
<!-- Begin: Package sources from dotnet-aspnetcore -->
1110
<!-- End: Package sources from dotnet-aspnetcore -->

‎eng/DotNetBuild.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
1+
<!-- When altering this file, please include @dotnet/product-construction as a reviewer. -->
22

33
<Project>
44

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
1+
<!-- When altering this file or making other Source Build related changes, include @dotnet/source-build as a reviewer. -->
22
<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
33

44
<UsageData>

‎eng/Version.Details.xml

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

‎eng/Versions.props

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@
115115
</PropertyGroup>
116116
<PropertyGroup>
117117
<!-- Dependency from https://github.com/dotnet/winforms -->
118-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24478.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
118+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24512.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
119119
</PropertyGroup>
120120
<PropertyGroup>
121121
<!-- Dependency from https://github.com/dotnet/test-templates -->
122122
<!-- Supported versions -->
123123
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
124124
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
125-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24508.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
125+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24514.4</MicrosoftDotNetTestProjectTemplates90PackageVersion>
126126
</PropertyGroup>
127127
<PropertyGroup>
128128
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -174,9 +174,9 @@
174174
</PropertyGroup>
175175
<PropertyGroup>
176176
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
177-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24501.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
178-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24501.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
179-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24501.1</MicrosoftWindowsDesktopAppRefPackageVersion>
177+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24514.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
178+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24514.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
179+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24514.2</MicrosoftWindowsDesktopAppRefPackageVersion>
180180
</PropertyGroup>
181181
<PropertyGroup>
182182
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -238,45 +238,45 @@
238238
</PropertyGroup>
239239
<PropertyGroup>
240240
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
241-
<MicrosoftFSharpCompilerPackageVersion>12.9.100-beta.24501.1</MicrosoftFSharpCompilerPackageVersion>
241+
<MicrosoftFSharpCompilerPackageVersion>12.9.100-beta.24510.7</MicrosoftFSharpCompilerPackageVersion>
242242
</PropertyGroup>
243243
<PropertyGroup>
244244
<!-- Dependencies from https://github.com/dotnet/roslyn -->
245-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24504.7</MicrosoftNetCompilersToolsetVersion>
246-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.24504.7</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
247-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.24504.7</MicrosoftCodeAnalysisPackageVersion>
248-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24504.7</MicrosoftCodeAnalysisCSharpPackageVersion>
249-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.24504.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
250-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24504.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
251-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24504.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
252-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24504.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
245+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24510.2</MicrosoftNetCompilersToolsetVersion>
246+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.24510.2</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
247+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisPackageVersion>
248+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisCSharpPackageVersion>
249+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
250+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
251+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
252+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
253253
</PropertyGroup>
254254
<PropertyGroup>
255255
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
256-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24508.25</MicrosoftAspNetCoreAppRefPackageVersion>
256+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24513.1</MicrosoftAspNetCoreAppRefPackageVersion>
257257
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rc.1.24452.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
258-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24508.25</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
259-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24508.25</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
260-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24508.25</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
261-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24508.25</MicrosoftAspNetCoreAnalyzersPackageVersion>
258+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24513.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
259+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24513.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
260+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24513.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
261+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24513.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
262262
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rc.1.24452.1</MicrosoftAspNetCoreTestHostPackageVersion>
263-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24508.25</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
264-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24508.25</MicrosoftAspNetCoreAppRefInternalPackageVersion>
265-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24508.25</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
266-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24508.25</dotnetdevcertsPackageVersion>
267-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24508.25</dotnetuserjwtsPackageVersion>
268-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24508.25</dotnetusersecretsPackageVersion>
263+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24513.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
264+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24513.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
265+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24513.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
266+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24513.1</dotnetdevcertsPackageVersion>
267+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24513.1</dotnetuserjwtsPackageVersion>
268+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24513.1</dotnetusersecretsPackageVersion>
269269
</PropertyGroup>
270270
<PropertyGroup>
271271
<!-- Dependencies from https://github.com/dotnet/razor -->
272-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24507.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
273-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24507.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
274-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24507.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
272+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24509.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
273+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24509.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
274+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24509.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
275275
</PropertyGroup>
276276
<PropertyGroup>
277277
<!-- Dependencies from https://github.com/dotnet/wpf -->
278-
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24480.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
279-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24480.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
278+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24513.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
279+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24513.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
280280
</PropertyGroup>
281281
<PropertyGroup Label="Runtime and Apphost aliases">
282282
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
@@ -324,19 +324,19 @@
324324
</PropertyGroup>
325325
<PropertyGroup>
326326
<!-- Dependencies from https://github.com/dotnet/arcade -->
327-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24504.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
328-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24504.4</MicrosoftDotNetSignToolVersion>
329-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24504.4</MicrosoftDotNetXliffTasksVersion>
330-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24504.4</MicrosoftDotNetXUnitExtensionsVersion>
327+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24511.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
328+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24511.1</MicrosoftDotNetSignToolVersion>
329+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24511.1</MicrosoftDotNetXliffTasksVersion>
330+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24511.1</MicrosoftDotNetXUnitExtensionsVersion>
331331
</PropertyGroup>
332332
<PropertyGroup>
333333
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
334-
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24507.2</MicrosoftBuildTasksGitVersion>
335-
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24507.2</MicrosoftSourceLinkCommonVersion>
336-
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24507.2</MicrosoftSourceLinkAzureReposGitVersion>
337-
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24507.2</MicrosoftSourceLinkGitHubVersion>
338-
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24507.2</MicrosoftSourceLinkGitLabVersion>
339-
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24507.2</MicrosoftSourceLinkBitbucketGitVersion>
334+
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24512.1</MicrosoftBuildTasksGitVersion>
335+
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24512.1</MicrosoftSourceLinkCommonVersion>
336+
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24512.1</MicrosoftSourceLinkAzureReposGitVersion>
337+
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24512.1</MicrosoftSourceLinkGitHubVersion>
338+
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24512.1</MicrosoftSourceLinkGitLabVersion>
339+
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24512.1</MicrosoftSourceLinkBitbucketGitVersion>
340340
</PropertyGroup>
341341
<!-- Get .NET Framework reference assemblies from NuGet packages -->
342342
<PropertyGroup>
@@ -362,7 +362,7 @@
362362
</PropertyGroup>
363363
<PropertyGroup Label="Workload manifest package versions">
364364
<AspireFeatureBand>8.0.100</AspireFeatureBand>
365-
<MicrosoftNETSdkAspireManifest80100PackageVersion>8.2.1</MicrosoftNETSdkAspireManifest80100PackageVersion>
365+
<MicrosoftNETSdkAspireManifest80100PackageVersion>8.2.2</MicrosoftNETSdkAspireManifest80100PackageVersion>
366366
<MauiFeatureBand>9.0.100-preview.6</MauiFeatureBand>
367367
<MauiWorkloadManifestVersion>9.0.0-preview.6.24327.7</MauiWorkloadManifestVersion>
368368
<XamarinAndroidWorkloadManifestVersion>34.99.0-preview.6.340</XamarinAndroidWorkloadManifestVersion>

‎eng/common/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ function Build {
231231
/p:Restore=$restore \
232232
/p:Build=$build \
233233
/p:DotNetBuildRepo=$product_build \
234-
/p:ArcadeBuildFromSource=$source_build \
235234
/p:DotNetBuildSourceOnly=$source_build \
236235
/p:Rebuild=$rebuild \
237236
/p:Test=$test \

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

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -128,33 +128,11 @@ jobs:
128128
- ${{ preStep }}
129129

130130
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
131-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
132-
- task: MicroBuildSigningPlugin@4
133-
displayName: Install MicroBuild plugin
134-
inputs:
135-
signType: $(_SignType)
136-
zipSources: false
137-
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138-
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
139-
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
140-
env:
141-
TeamName: $(_TeamName)
142-
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
143-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
131+
- template: /eng/common/core-templates/steps/install-microbuild.yml
132+
parameters:
133+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
134+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
144135
continueOnError: ${{ parameters.continueOnError }}
145-
condition: and(
146-
succeeded(),
147-
or(
148-
and(
149-
eq(variables['Agent.Os'], 'Windows_NT'),
150-
in(variables['_SignType'], 'real', 'test')
151-
),
152-
and(
153-
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
154-
ne(variables['Agent.Os'], 'Windows_NT'),
155-
eq(variables['_SignType'], 'real')
156-
)
157-
))
158136

159137
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
160138
- task: NuGetAuthenticate@1
@@ -183,26 +161,12 @@ jobs:
183161
- ${{ each step in parameters.componentGovernanceSteps }}:
184162
- ${{ step }}
185163

186-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
187-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
188-
- task: MicroBuildCleanup@1
189-
displayName: Execute Microbuild cleanup tasks
190-
condition: and(
191-
always(),
192-
or(
193-
and(
194-
eq(variables['Agent.Os'], 'Windows_NT'),
195-
in(variables['_SignType'], 'real', 'test')
196-
),
197-
and(
198-
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
199-
ne(variables['Agent.Os'], 'Windows_NT'),
200-
eq(variables['_SignType'], 'real')
201-
)
202-
))
164+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
165+
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
166+
parameters:
167+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
168+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
203169
continueOnError: ${{ parameters.continueOnError }}
204-
env:
205-
TeamName: $(_TeamName)
206170

207171
# Publish test results
208172
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:

‎eng/common/core-templates/steps/cleanup-microbuild.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
parameters:
2+
# Enable cleanup tasks for MicroBuild
3+
enableMicrobuild: false
4+
# Enable cleanup tasks for MicroBuild on Mac and Linux
5+
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
6+
enableMicrobuildForMacAndLinux: false
7+
continueOnError: false
8+
9+
steps:
10+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
11+
- task: MicroBuildCleanup@1
12+
displayName: Execute Microbuild cleanup tasks
13+
condition: and(
14+
always(),
15+
or(
16+
and(
17+
eq(variables['Agent.Os'], 'Windows_NT'),
18+
in(variables['_SignType'], 'real', 'test')
19+
),
20+
and(
21+
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
22+
ne(variables['Agent.Os'], 'Windows_NT'),
23+
eq(variables['_SignType'], 'real')
24+
)
25+
))
26+
continueOnError: ${{ parameters.continueOnError }}
27+
env:
28+
TeamName: $(_TeamName)

‎eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
parameters:
2+
# Enable cleanup tasks for MicroBuild
3+
enableMicrobuild: false
4+
# Enable cleanup tasks for MicroBuild on Mac and Linux
5+
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
6+
enableMicrobuildForMacAndLinux: false
7+
continueOnError: false
8+
9+
steps:
10+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
11+
# Remove Python downgrade with https://github.com/dotnet/arcade/issues/15151
12+
- ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
13+
- task: UsePythonVersion@0
14+
displayName: 'Use Python 3.11.x'
15+
inputs:
16+
versionSpec: '3.11.x'
17+
18+
- task: MicroBuildSigningPlugin@4
19+
displayName: Install MicroBuild plugin
20+
inputs:
21+
signType: $(_SignType)
22+
zipSources: false
23+
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
24+
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
25+
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
26+
env:
27+
TeamName: $(_TeamName)
28+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
29+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
30+
continueOnError: ${{ parameters.continueOnError }}
31+
condition: and(
32+
succeeded(),
33+
or(
34+
and(
35+
eq(variables['Agent.Os'], 'Windows_NT'),
36+
in(variables['_SignType'], 'real', 'test')
37+
),
38+
and(
39+
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
40+
ne(variables['Agent.Os'], 'Windows_NT'),
41+
eq(variables['_SignType'], 'real')
42+
)
43+
))

0 commit comments

Comments
 (0)