Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions .vsts-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,39 @@ variables:
value: .NETCore
- name: _DotNetValidationArtifactsCategory
value: .NETCoreValidation
- name: EnableReleaseOneLocBuild
value: false

stages:
- stage: build
displayName: Build

jobs:
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/vs17.2') }}: # should track next-release's active dev branch
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-MSBUILD'
MirrorRepo: 'msbuild'
MirrorBranch: 'main' # should match condition above

- ${{ if and( ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
# The localization setup for release/ branches. Note difference in LclPackageId. main branch is handled separately below.
# Used for vs17.2, vs17.4, vs17.6 etc. branches only.
# When the branch is setup for localization (the localization ticket needs to be created - https://aka.ms/ceChangeLocConfig, requesting change from one release branch to another),
# set 'EnableReleaseOneLocBuild' to true.
- ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/vs') }}:
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
MirrorRepo: 'msbuild'
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-MSBUILDREL'
MirrorBranch: replace(variables['Build.SourceBranch'], 'refs/heads/', '')
JobNameSuffix: '_release'
condition: $(EnableReleaseOneLocBuild)
# The localization setup for main branch. Note difference in package ID. Should not be used with release/ branches.
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
MirrorRepo: 'msbuild'
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-MSBUILD'
MirrorBranch: 'main'
JobNameSuffix: '_main'
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')

- job: Windows_NT
pool:
name: VSEngSS-MicroBuild2022-1ES
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<PropertyGroup>
<VersionPrefix>17.2.11</VersionPrefix>
<VersionPrefix>17.2.12</VersionPrefix>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
Expand Down