Skip to content

Snap for VS 18.3 and update branding to VS 18.4 #13005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 6 commits into from
Jan 12, 2026
+7 −4
Merged

Snap for VS 18.3 and update branding to VS 18.4 #13005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca753f2
Initial plan
Copilot Jan 12, 2026
2672911
Update branding from VS 18.3 to VS 18.4
Copilot Jan 12, 2026
585e42a
Update merge flow configuration for vs18.3 branch
Copilot Jan 12, 2026
7c1771d
Add vs18.4 to merge flow configuration
Copilot Jan 12, 2026
566c81a
Update comment in merge flow config to match pattern
Copilot Jan 12, 2026
d337e46
Update merge flow configuration for vs18.3
ViktorHofer Jan 12, 2026
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
4 changes: 2 additions & 2 deletions .config/git-merge-flow-config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
},
// Automate opening PRs to merge msbuild's vs18.0 (SDK 10.0.1xx) into vs18.3 (SDK 10.0.2xx, VS)
"vs18.0": {
"MergeToBranch": "main" // update to flow through vs18.3 after we fork for release
"MergeToBranch": "vs18.3"
},
// MSBuild latest release to main
// Automate opening PRs to merge msbuild's vs18.3 (SDK 10.0.2xx) into main
"vs18.3": {
"MergeToBranch": "main"
}
Expand Down
5 changes: 4 additions & 1 deletion azure-pipelines/vs-insertion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ parameters:
values:
- auto
- main
- rel/d18.4
- rel/d18.3
- rel/d18.0
- rel/d17.14
Expand All @@ -67,7 +68,9 @@ 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.3') }}:
${{ if eq(variables['Build.SourceBranchName'], 'vs18.4') }}:
value: 'rel/d18.4'
${{ elseif eq(variables['Build.SourceBranchName'], 'vs18.3') }}:
value: 'rel/d18.3'
${{ elseif eq(variables['Build.SourceBranchName'], 'vs18.0') }}:
value: 'rel/d18.0'
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="Version.Details.props" />

<PropertyGroup>
<VersionPrefix>18.3.0</VersionPrefix>
<VersionPrefix>18.4.0</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PackageValidationBaselineVersion>18.0.2</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
Expand Down
Loading