Skip to content

Commit

Permalink
Merge pull request #54481 from dotnet/dev/rigibson/snap-17.0-p2
Browse files Browse the repository at this point in the history
  • Loading branch information
RikkiGibson authored Jun 29, 2021
1 parent e241380 commit 51f16af
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<MajorVersion>4</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>2</PreReleaseVersionLabel>
<PreReleaseVersionLabel>3</PreReleaseVersionLabel>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<!--
By default the assembly version in official builds is "$(MajorVersion).$(MinorVersion).0.0".
Expand Down
16 changes: 10 additions & 6 deletions eng/config/PublishData.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@
"packageFeeds": "default",
"channels": [],
"vsBranch": "rel/d16.10",
"vsMajorVersion": 16
"vsMajorVersion": 16,
"insertionTitlePrefix": "[d16.10]"
},
"release/dev16.11-vs-deps": {
"nugetKind": [
Expand All @@ -184,18 +185,20 @@
"packageFeeds": "default",
"channels": [],
"vsBranch": "rel/d16.11",
"vsMajorVersion": 16
"vsMajorVersion": 16,
"insertionTitlePrefix": "[d16.11]"
},
"release/dev17.0-preview1-vs-deps": {
"release/dev17.0-vs-deps": {
"nugetKind": [
"Shipping",
"NonShipping"
],
"version": "4.0.*",
"packageFeeds": "default",
"channels": [],
"vsBranch": "rel/d17.0",
"vsMajorVersion": 17
"vsBranch": "main",
"vsMajorVersion": 17,
"insertionTitlePrefix": "[d17p2]"
},
"main-vs-deps": {
"nugetKind": [
Expand All @@ -207,7 +210,8 @@
"channels": [],
"vsBranch": "main",
"vsMajorVersion": 17,
"insertionCreateDraftPR": false
"insertionCreateDraftPR": true,
"insertionTitlePrefix": "[d17p3]"
},
"main": {
"nugetKind": [
Expand Down

0 comments on commit 51f16af

Please sign in to comment.