Skip to content

Snap 17.14p3 (update config) #11689

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
jjonescz merged 1 commit into from
Apr 1, 2025
Merged

Snap 17.14p3 (update config) #11689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>
<!-- Versioning for assemblies/packages -->
<PropertyGroup>
<MajorVersion>9</MajorVersion>
<MajorVersion>10</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
Expand All @@ -30,8 +30,8 @@
imported. This OK because we want to just have an obvious salt for a local build.
-->
<PropertyGroup>
<VsixVersionPrefix>17.14.3</VsixVersionPrefix>
<AddinMajorVersion>17.14</AddinMajorVersion>
<VsixVersionPrefix>17.15.1</VsixVersionPrefix>
<AddinMajorVersion>17.15</AddinMajorVersion>
<AddinVersion>$(AddinMajorVersion)</AddinVersion>
<AddinVersion Condition="'$(OfficialBuildId)' != ''">$(AddinVersion).$(OfficialBuildId)</AddinVersion>
<AddinVersion Condition="'$(OfficialBuildId)' == ''">$(AddinVersion).42424242.42</AddinVersion>
Expand Down
8 changes: 4 additions & 4 deletions eng/config/PublishData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
],
"vsBranch": "main",
Copy link
Member

@davidwengier davidwengier Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems wrong. Should be the same as Roslyn, no?

Copy link
Member Author

@jjonescz jjonescz Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what you mean, this will be the same as Roslyn.

Copy link
Member

@davidwengier davidwengier Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I was looking at Roslyn's earlier today and I thought it was set to the "initial" branch, but I guess that pre-snap anyway. I'm sure you know what you're doing better than me :)

Copy link
Member Author

@jjonescz jjonescz Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, after VS snaps, I think main is the correct target branch rather than the "initial" one.

"vsMajorVersion": 17,
"insertionCreateDraftPR": false,
"insertionTitlePrefix": "[d17.14 P3]"
"insertionCreateDraftPR": true,
"insertionTitlePrefix": "[d17.15 P1]"
},
"release/dev17.6": {
"nugetKind": [
Expand Down Expand Up @@ -113,10 +113,10 @@
"Shipping",
"NonShipping"
],
"vsBranch": "rel/d17.14",
"vsBranch": "main",
"vsMajorVersion": 17,
"insertionCreateDraftPR": false,
"insertionTitlePrefix": "[d17.14 P2]"
"insertionTitlePrefix": "[d17.14 P3]"
}
}
}