From 1442fefd15cb10fd78127c841b3a3ba8b0c0925a Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Tue, 22 Jan 2019 12:53:15 +0000 Subject: [PATCH 1/4] Check assemblies reference System.Net.Http v4.0 Check all GitHub.* assemblies reference System.Net.Http v4.0.0.0. --- .../GitHubAssemblyTests.cs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs b/test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs index ac63165810..7bbe940f4d 100644 --- a/test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs +++ b/test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs @@ -1,4 +1,5 @@ -using System.IO; +using System; +using System.IO; using System.Reflection; using NUnit.Framework; @@ -15,6 +16,19 @@ public void GitHub_Assembly_Should_Not_Reference_DesignTime_Assembly(string asse } } + [Theory] + public void GitHub_Assembly_Should_Not_Reference_System_Net_Http_Above_4_0(string assemblyFile) + { + var asm = Assembly.LoadFrom(assemblyFile); + foreach (var referencedAssembly in asm.GetReferencedAssemblies()) + { + if (referencedAssembly.Name == "System.Net.Http") + { + Assert.That(referencedAssembly.Version, Is.EqualTo(new Version("4.0.0.0"))); + } + } + } + [DatapointSource] string[] GitHubAssemblies => Directory.GetFiles(AssemblyDirectory, "GitHub.*.dll"); From cbb48e0f92121d0d2058d52182838067489701f8 Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Tue, 22 Jan 2019 13:18:03 +0000 Subject: [PATCH 2/4] Make GitHubAssemblyTests work with NCrunch --- .../GitHub.VisualStudio.UnitTests.csproj | 1 + .../GitHubAssemblyTests.cs | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj b/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj index 6f32bb2c82..233568c347 100644 --- a/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj +++ b/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj @@ -21,6 +21,7 @@ + diff --git a/test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs b/test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs index 7bbe940f4d..b95392cff7 100644 --- a/test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs +++ b/test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs @@ -1,6 +1,8 @@ using System; using System.IO; +using System.Linq; using System.Reflection; +using NCrunch.Framework; using NUnit.Framework; public class GitHubAssemblyTests @@ -30,7 +32,20 @@ public void GitHub_Assembly_Should_Not_Reference_System_Net_Http_Above_4_0(strin } [DatapointSource] - string[] GitHubAssemblies => Directory.GetFiles(AssemblyDirectory, "GitHub.*.dll"); + string[] GetGitHubAssemblies() + { + var prefix = "GitHub."; + if (NCrunchEnvironment.NCrunchIsResident()) + { + return NCrunchEnvironment.GetAllAssemblyLocations() + .Where(p => Path.GetFileName(p).StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) + .ToArray(); + } + else + { + var dir = Path.GetDirectoryName(GetType().Assembly.Location); + return Directory.GetFiles(dir, $"{prefix}*.dll"); + } + } - string AssemblyDirectory => Path.GetDirectoryName(GetType().Assembly.Location); } From 9eb18d71bef532f87f7178a6c9730280c4a1dd95 Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Tue, 22 Jan 2019 13:18:58 +0000 Subject: [PATCH 3/4] Compile against net46 version of Octokit.GraphQL --- submodules/octokit.graphql.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/octokit.graphql.net b/submodules/octokit.graphql.net index 772de8c4e5..4d2b083bd8 160000 --- a/submodules/octokit.graphql.net +++ b/submodules/octokit.graphql.net @@ -1 +1 @@ -Subproject commit 772de8c4e539f4f85f40530f2868d3b7ea660879 +Subproject commit 4d2b083bd8eaeb05b7f089e4aedc9d0e0015b61d From 0fdfb12dc5769caf5ffba7c5fa0622cb53e469dc Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Tue, 22 Jan 2019 19:06:08 +0000 Subject: [PATCH 4/4] Setting version to 2.7.1.0 --- Directory.Build.Props | 2 +- appveyor.yml | 2 +- src/GitHub.VisualStudio/source.extension.vsixmanifest | 2 +- src/common/SolutionInfo.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.Props b/Directory.Build.Props index a0cad677f5..f848fbdbfc 100644 --- a/Directory.Build.Props +++ b/Directory.Build.Props @@ -1,7 +1,7 @@ GitHub Extension for Visual Studio - 2.7.0.0 + 2.7.1.0 Copyright © GitHub, Inc. 2014-2018 7.3 diff --git a/appveyor.yml b/appveyor.yml index 519308ae22..65b62bc6d3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ os: Visual Studio 2017 -version: '2.7.0.{build}' +version: '2.7.1.{build}' skip_tags: true install: - ps: | diff --git a/src/GitHub.VisualStudio/source.extension.vsixmanifest b/src/GitHub.VisualStudio/source.extension.vsixmanifest index 3390784562..442a2bf5ae 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 diff --git a/src/common/SolutionInfo.cs b/src/common/SolutionInfo.cs index 3cac0f30af..8f34a4b017 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.7.0.0"; + internal const string Version = "2.7.1.0"; } }