From c9594595f971a18c76963e300938035f72ec7da8 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 5 Oct 2018 11:24:08 +0200 Subject: [PATCH 1/6] Reference Newtonsoft.Json 9.0.1 Instead of 10.0.3 - see #1774. --- src/GitHub.Api/GitHub.Api.csproj | 2 +- src/GitHub.App/GitHub.App.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj index bccfa3c2b5..c548a63e83 100644 --- a/src/GitHub.Api/GitHub.Api.csproj +++ b/src/GitHub.Api/GitHub.Api.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj index a25f0e1056..3ef485092a 100644 --- a/src/GitHub.App/GitHub.App.csproj +++ b/src/GitHub.App/GitHub.App.csproj @@ -48,7 +48,7 @@ - + From 1a3bc954303535cb434c039bf25db6c8869bc1d7 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 5 Oct 2018 11:39:52 +0200 Subject: [PATCH 2/6] Fix Newtonsoft.Json references in projects. The packages.config file referred to 9.0.x but the project files referred to 10.0.x. --- src/GitHub.InlineReviews/GitHub.InlineReviews.csproj | 5 ++--- src/GitHub.VisualStudio/GitHub.VisualStudio.csproj | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj index 65e7fb0387..a66749ba46 100644 --- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj +++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj @@ -370,9 +370,8 @@ ..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll True - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll ..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index 2a5bb719d7..6e26bf92a6 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -12,7 +12,7 @@ v3 false GitHub\GitHub - zh-CN + zh-CN @@ -243,9 +243,8 @@ ..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll True - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll ..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll From ac6c6a7a3d6b64fa673ea466105311a1ececef1f Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 5 Oct 2018 12:19:51 +0200 Subject: [PATCH 3/6] Fix binding redirect in test. --- test/GitHub.App.UnitTests/app.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/GitHub.App.UnitTests/app.config b/test/GitHub.App.UnitTests/app.config index e1367549a4..fce6c6a851 100644 --- a/test/GitHub.App.UnitTests/app.config +++ b/test/GitHub.App.UnitTests/app.config @@ -3,7 +3,7 @@ - + From 055ab4360ef0c6f5076eab01489b4a4140df54b2 Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Fri, 5 Oct 2018 12:48:51 +0100 Subject: [PATCH 4/6] Include Newtonsoft.Json.dll in .vsix Add Newtonsoft.Json.9.0.1 as Asset to .vsixmanifest. --- src/GitHub.VisualStudio/GitHub.VisualStudio.csproj | 5 +++++ src/GitHub.VisualStudio/source.extension.vsixmanifest | 1 + 2 files changed, 6 insertions(+) diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index 6e26bf92a6..a1a72738e6 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -475,6 +475,11 @@ + + Newtonsoft.Json.dll + PreserveNewest + true + PreserveNewest true diff --git a/src/GitHub.VisualStudio/source.extension.vsixmanifest b/src/GitHub.VisualStudio/source.extension.vsixmanifest index 9e293cf42b..6b35ae822b 100644 --- a/src/GitHub.VisualStudio/source.extension.vsixmanifest +++ b/src/GitHub.VisualStudio/source.extension.vsixmanifest @@ -37,6 +37,7 @@ + From ecae0668600be21c65237c6f6023aebed03a1ae2 Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Fri, 5 Oct 2018 16:30:06 +0100 Subject: [PATCH 5/6] Remove non-functional Asset TargetVersion I thought including TargetVersion="[14.0,15.0)" on the Newtonsoft.Json asset would prevent it from being installed on Visual Studio 2017. This doesn't seem to work, so removing it. --- src/GitHub.VisualStudio/source.extension.vsixmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitHub.VisualStudio/source.extension.vsixmanifest b/src/GitHub.VisualStudio/source.extension.vsixmanifest index 6b35ae822b..4581541147 100644 --- a/src/GitHub.VisualStudio/source.extension.vsixmanifest +++ b/src/GitHub.VisualStudio/source.extension.vsixmanifest @@ -37,7 +37,7 @@ - + From ab7fee3cf62ee17576d136d5031284bbda528d5e Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 8 Oct 2018 11:45:50 +0200 Subject: [PATCH 6/6] Bump version to 2.5.7. --- Directory.Build.Props | 4 ++-- appveyor.yml | 2 +- src/GitHub.VisualStudio/source.extension.vsixmanifest | 4 ++-- src/common/SolutionInfo.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Directory.Build.Props b/Directory.Build.Props index 274882efc9..ba140af9cb 100644 --- a/Directory.Build.Props +++ b/Directory.Build.Props @@ -1,8 +1,8 @@ GitHub Extension for Visual Studio - 2.5.6.0 + 2.5.7.0 Copyright © GitHub, Inc. 2014-2018 - 7.3 + 7.3 \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index e061874bab..aaaab024b1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ os: Visual Studio 2017 -version: '2.5.6.{build}' +version: '2.5.7.{build}' skip_tags: true install: - ps: | diff --git a/src/GitHub.VisualStudio/source.extension.vsixmanifest b/src/GitHub.VisualStudio/source.extension.vsixmanifest index 4581541147..7bf0682b68 100644 --- a/src/GitHub.VisualStudio/source.extension.vsixmanifest +++ b/src/GitHub.VisualStudio/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + GitHub Extension for Visual Studio A Visual Studio Extension that brings the GitHub Flow into Visual Studio. GitHub.VisualStudio @@ -42,4 +42,4 @@ - + \ No newline at end of file diff --git a/src/common/SolutionInfo.cs b/src/common/SolutionInfo.cs index 58d7bb878e..4ab0d1352c 100644 --- a/src/common/SolutionInfo.cs +++ b/src/common/SolutionInfo.cs @@ -18,6 +18,6 @@ namespace System { internal static class AssemblyVersionInformation { - internal const string Version = "2.5.6.0"; + internal const string Version = "2.5.7.0"; } }