Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
1 change: 1 addition & 0 deletions azure-pipelines/vs-insertion-experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ parameters:
displayName: 'Insertion Target Branch (select for manual insertion)'
values:
- main
- rel/d18.0
- rel/d17.14
- rel/d17.13
- rel/d17.12
Expand Down
3 changes: 3 additions & 0 deletions azure-pipelines/vs-insertion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ parameters:
values:
- auto
- main
- rel/d18.0
Comment thread
AR-May marked this conversation as resolved.
- rel/d17.14
- rel/d17.13
- rel/d17.12
Expand All @@ -65,6 +66,8 @@ parameters:
variables:
# `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS
- name: AutoInsertTargetBranch
${{ if eq(variables['Build.SourceBranchName'], 'vs18.0') }}:
value: 'rel/d18.0'
${{ if eq(variables['Build.SourceBranchName'], 'vs17.14') }}:
value: 'rel/d17.14'
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.13') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Project>
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
<PropertyGroup>
<VersionPrefix>18.0.0</VersionPrefix>
<VersionPrefix>18.0.0</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
Comment thread
JanProvaznik marked this conversation as resolved.
<PackageValidationBaselineVersion>17.14.8</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
Comment thread
AR-May marked this conversation as resolved.
Outdated
Expand Down