Skip to content

Commit 96210c1

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'release/9.0.2xx'
2 parents 3684341 + 6d67e2a commit 96210c1

File tree

651 files changed

+18173
-3228
lines changed

Some content is hidden

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

651 files changed

+18173
-3228
lines changed

‎.vsts-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ extends:
9393
parameters:
9494
pool:
9595
name: $(DncEngInternalBuildPool)
96-
image: 1es-windows-2022
96+
image: windows.vs2022.amd64
9797
os: windows
9898
helixTargetQueue: windows.amd64.vs2022.pre
9999
oneESCompat:
100100
templateFolderName: templates-official
101101
publishTaskPrefix: 1ES.
102102
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
103-
locBranch: release/9.0.1xx
103+
locBranch: release/9.0.2xx
104104
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
105105
timeoutInMinutes: 90
106106
windowsJobParameterSets:

‎CODEOWNERS

+4
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
/src/Cli/dotnet/commands/dotnet-vstest @dotnet/dotnet-testing-admin
5151
/test/dotnet-test.Tests @dotnet/dotnet-testing-admin
5252
/test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin
53+
/test/dotnet-new.Tests @dotnet/dotnet-testing-admin
54+
/template_feed/Microsoft.DotNet.Common.*/content/MSTest* @dotnet/dotnet-testing-admin
55+
/template_feed/Microsoft.DotNet.Common.*/content/NUnit* @dotnet/dotnet-testing-admin
56+
/template_feed/Microsoft.DotNet.Common.*/content/XUnit* @dotnet/dotnet-testing-admin
5357

5458
# Area-Templates
5559
/src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers

‎eng/ManualVersions.props

+14-14
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.54</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.54</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.54</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.54</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.54</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.54</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.54</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.52</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.52</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.52</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.52</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.52</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.52</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.52</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
12+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.57</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.57</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.57</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.57</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.57</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.57</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.57</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.55</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.55</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.55</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.55</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.55</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.55</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.55</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
2626
</PropertyGroup>
2727

2828
</Project>

‎eng/Version.Details.xml

+18-18
Original file line numberDiff line numberDiff line change
@@ -97,43 +97,43 @@
9797
<Sha>96e77ae98391e41b5d940081b3c15a4b77a610aa</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-2.24561.1">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.24603.5">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
102+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-2.24561.1">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.24603.5">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
107+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-2.24561.1">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.24603.5">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
112+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-2.24561.1">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.24603.5">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
116+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-2.24561.1">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.24603.5">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
120+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-2.24561.1">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.24603.5">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
124+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-2.24561.1">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.24603.5">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
128+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-2.24561.1">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.24603.5">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
132+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-2.24561.1">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.24603.5">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
136+
<Sha>d94a5505a6515a2d5350c7055853fc431e6dcfa4</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24605.2">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>

‎eng/Versions.props

+19-29
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,14 @@
3434
<VersionFeature21>30</VersionFeature21>
3535
<VersionFeature31>32</VersionFeature31>
3636
<VersionFeature50>17</VersionFeature50>
37-
<VersionFeature60>35</VersionFeature60>
37+
<VersionFeature60>36</VersionFeature60>
3838
<VersionFeature70>20</VersionFeature70>
39-
<VersionFeature80>10</VersionFeature80>
39+
<VersionFeature80>11</VersionFeature80>
4040
<VersionFeature90>0</VersionFeature90>
4141
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
4242
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4343
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
4444
</PropertyGroup>
45-
<PropertyGroup Label="AspNetCore template versioning">
46-
<!-- Automated versions for asp.net templates -->
47-
<MicrosoftNETSdkPatchVersion>$(VersionFeature)</MicrosoftNETSdkPatchVersion>
48-
<!--
49-
Between branding and shipping, the templates should stay at last month's version.
50-
If the incoming SDK version is 2 versions behind us, we know we just branded but haven't done the internal -> public merge yet.
51-
Therefore we stay at last month's version.
52-
We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
53-
Instead the indicator is that the incoming SDK version is not RTM or greater yet.
54-
Preview releases already use -1 versionining so don't subtract one for that version.
55-
In public builds, we always use the 2 month old version.
56-
-->
57-
<SubtractOneFromTemplateVersions Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal'">true</SubtractOneFromTemplateVersions>
58-
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) &gt;= 2">true</SubtractOneFromTemplateVersions>
59-
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) &gt;= 1 AND ! $(PreReleaseVersionLabel.Contains('rtm')) AND ! $(PreReleaseVersionLabel.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
60-
</PropertyGroup>
6145
<PropertyGroup Label="Restore feeds">
6246
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
6347
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetbuilds.blob.core.windows.net/public/</DotNetAssetRootUrl>
@@ -93,6 +77,10 @@
9377
<!-- Dependency from https://github.com/dotnet/arcade-services -->
9478
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24603.4</MicrosoftDotNetDarcLibVersion>
9579
</PropertyGroup>
80+
<PropertyGroup>
81+
<!-- Dependency from https://github.com/dotnet/aspire -->
82+
<AspirePackageVersion>9.1.0-preview.1.24555.3</AspirePackageVersion>
83+
</PropertyGroup>
9684
<PropertyGroup>
9785
<!-- Dependency from https://github.com/dotnet/winforms -->
9886
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24605.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
@@ -192,14 +180,16 @@
192180
193181
Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older
194182
than the very latest, based on what we want the SDK to support. So use a version that matches the version
195-
in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0
196-
to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release.
183+
in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0
184+
to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release.
197185
In these cases, we don't want to use MicrosoftBuildVersion and other
198186
associated properties that are updated by the VMR infrastructure. So, we read this version
199187
from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion,
200188
then use that in Directory.Packages.props.
201189
202-
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
190+
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
191+
192+
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
203193
<MicrosoftBuildVersion>17.13.0-preview-24604-07</MicrosoftBuildVersion>
204194
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24604-07</MicrosoftBuildLocalizationVersion>
205195
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
@@ -224,14 +214,14 @@
224214
</PropertyGroup>
225215
<PropertyGroup>
226216
<!-- Dependencies from https://github.com/dotnet/roslyn -->
227-
<MicrosoftNetCompilersToolsetVersion>4.13.0-2.24561.1</MicrosoftNetCompilersToolsetVersion>
228-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-2.24561.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
229-
<MicrosoftCodeAnalysisPackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisPackageVersion>
230-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisCSharpPackageVersion>
231-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
232-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
233-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
234-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-2.24561.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
217+
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.24603.5</MicrosoftNetCompilersToolsetVersion>
218+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.24603.5</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
219+
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisPackageVersion>
220+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpPackageVersion>
221+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
222+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
223+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
224+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.24603.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
235225
</PropertyGroup>
236226
<PropertyGroup>
237227
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

‎eng/pipelines/templates/jobs/sdk-job-matrix.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ parameters:
1212
runTestsAsTool: true
1313
# This job uses the build step for testing, so the extra test step is not necessary.
1414
runTests: false
15-
- categoryName: TemplateEngine
16-
testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
17-
publishXunitResults: true
15+
# Turn off template engine runs on Windows temporarily until agent images are updated
16+
#- categoryName: TemplateEngine
17+
# testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
18+
# publishXunitResults: true
1819
- categoryName: AoT
1920
runAoTTests: true
2021
### LINUX ###

‎eng/pipelines/templates/steps/vmr-prepare.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ steps:
1010
displayName: Clone dotnet/dotnet
1111
path: vmr
1212
clean: true
13+
fetchTags: true
14+
fetchDepth: 0
1315

14-
- script: |
15-
git checkout --track origin/${{ parameters.vmrBranch }}
16-
echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}"
16+
- powershell: |
17+
$branchName = "${{ parameters.vmrBranch }}" -replace "refs/heads/", ""
18+
git checkout --track origin/$branchName || exit 1
19+
echo "##vso[task.setvariable variable=vmrBranch]$branchName"
1720
displayName: Check out ${{ parameters.vmrBranch }}
1821
workingDirectory: $(Agent.BuildDirectory)/vmr

‎eng/pipelines/vmr-build-pr-internal.yml

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# This YAML is used by these PR pipelines:
2+
#
3+
# - dotnet-sdk-source-build-internal
4+
# https://dev.azure.com/dnceng/internal/_build?definitionId=1378
5+
6+
trigger: none
7+
pr:
8+
branches:
9+
include:
10+
- internal/release/*
11+
exclude:
12+
- internal/release/*.0.2xx
13+
- internal/release/*.0.3xx
14+
- internal/release/*.0.4xx
15+
16+
parameters:
17+
- name: vmrBranch
18+
displayName: dotnet/dotnet branch to push to
19+
type: string
20+
default: ' '
21+
22+
- name: disableBuild
23+
displayName: Skip the VMR Build stage
24+
type: boolean
25+
default: false
26+
27+
variables:
28+
- template: /eng/common/templates/variables/pool-providers.yml@self
29+
30+
- ${{ if ne(parameters.vmrBranch, ' ') }}:
31+
- name: VmrBranch
32+
value: ${{ replace(parameters.vmrBranch, ' ', '') }}
33+
- ${{ else }}:
34+
- name: VmrBranch
35+
value: ${{ replace(replace(variables['System.PullRequest.TargetBranch'], 'refs/heads/', ''), 'refs/pull/', '') }}
36+
37+
# enable source-only build for pipelines with the -source-build suffix
38+
- name: isSourceOnlyBuild
39+
value: ${{ contains(variables['Build.DefinitionName'], '-source-build') }}
40+
41+
resources:
42+
repositories:
43+
- repository: vmr
44+
name: dotnet-dotnet
45+
type: git
46+
ref: ${{ variables.VmrBranch }}
47+
48+
stages:
49+
# You can temporarily disable the VMR Build stage by setting the disableBuild variable
50+
- ${{ if not(parameters.disableBuild) }}:
51+
- template: templates/stages/vmr-build.yml
52+
parameters:
53+
vmrBranch: ${{ variables.VmrBranch }}
54+
isBuiltFromVmr: false
55+
isSourceOnlyBuild: ${{ variables.isSourceOnlyBuild }}
56+
${{ if contains(variables['Build.DefinitionName'], '-full') }}:
57+
scope: full
58+
${{ elseif eq(variables.isSourceOnlyBuild, 'true') }}:
59+
scope: ultralite
60+
${{ else }}:
61+
scope: lite
62+
63+
# In case the VMR Build stage is temporarily disabled, the VMR synchronization step is run to validate
64+
# that the PR can be merged and later synchronized into the VMR without problems.
65+
- ${{ else }}:
66+
- stage: Synchronize_VMR
67+
displayName: Synchronize VMR
68+
dependsOn: []
69+
jobs:
70+
- template: templates/jobs/vmr-synchronization.yml
71+
parameters:
72+
vmrBranch: ${{ variables.VmrBranch }}
73+
noPush: true

0 commit comments

Comments
 (0)