From f742362e2758bb53ebcf818c22d391ffc06f4fb1 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Mon, 27 Nov 2017 15:33:33 -0800 Subject: [PATCH 1/3] Move to 2.7 This is incrementing our version numbers as a part of moving to the next VS release. --- build/Targets/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Targets/Versions.props b/build/Targets/Versions.props index 460ed0c450936..078a8ad11aedd 100644 --- a/build/Targets/Versions.props +++ b/build/Targets/Versions.props @@ -8,13 +8,13 @@ - 2.6.0 + 2.7.0 - 2.6.0 + 2.7.0 dev - beta3 + beta1 $(RoslynFileVersionBase)-$(RoslynNuGetMoniker) From bb1ec73e478991e86f8b9ebd6a6d2a0910d32d82 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Mon, 27 Nov 2017 15:34:41 -0800 Subject: [PATCH 2/3] Publish NuGet packages out of master --- build/config/PublishData.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/config/PublishData.json b/build/config/PublishData.json index 597c0ba7ae828..8ba5ae5cbac14 100644 --- a/build/config/PublishData.json +++ b/build/config/PublishData.json @@ -1,18 +1,18 @@ { "branches": { - "dev15.5.x": { + "master": { "nugetKind": "PerBuildPreRelease", - "version": "2.6.*", + "version": "2.7.*", "nuget": [ "https://dotnet.myget.org/F/roslyn/api/v2/package" ], "vsix": [ "https://dotnet.myget.org/F/roslyn/vsix/upload" ], - "channels": [ "dev15.5", "dev15.5p3" ] + "channels": [ "dev15.6" ] }, - "dev/jaredpar/fix-publish": { + "dev15.5.x": { "nugetKind": "PerBuildPreRelease", "version": "2.6.*", "nuget": [ "https://dotnet.myget.org/F/roslyn/api/v2/package" ], "vsix": [ "https://dotnet.myget.org/F/roslyn/vsix/upload" ], - "channels": [ "publish-test" ] + "channels": [ "dev15.5", "dev15.5p3" ] }, "features/readonly-ref": { "nugetKind": "PerBuildPreRelease", From 3b1834956f8ad49d04aafe771eab22cc49b27cc0 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Mon, 27 Nov 2017 15:55:39 -0800 Subject: [PATCH 3/3] Respond to PR feedback --- build/Targets/Versions.props | 2 +- build/config/PublishData.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Targets/Versions.props b/build/Targets/Versions.props index 078a8ad11aedd..795be0095393d 100644 --- a/build/Targets/Versions.props +++ b/build/Targets/Versions.props @@ -14,7 +14,7 @@ dev - beta1 + beta2 $(RoslynFileVersionBase)-$(RoslynNuGetMoniker) diff --git a/build/config/PublishData.json b/build/config/PublishData.json index 8ba5ae5cbac14..1a99d2061e819 100644 --- a/build/config/PublishData.json +++ b/build/config/PublishData.json @@ -1,6 +1,6 @@ { "branches": { - "master": { + "master-vs-deps": { "nugetKind": "PerBuildPreRelease", "version": "2.7.*", "nuget": [ "https://dotnet.myget.org/F/roslyn/api/v2/package" ],