diff --git a/Directory.Build.Props b/Directory.Build.Props index 58b61e4891..f848fbdbfc 100644 --- a/Directory.Build.Props +++ b/Directory.Build.Props @@ -1,7 +1,7 @@ GitHub Extension for Visual Studio - 2.8.0.0 + 2.7.1.0 Copyright © GitHub, Inc. 2014-2018 7.3 diff --git a/appveyor.yml b/appveyor.yml index 82ef3e908c..65b62bc6d3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ os: Visual Studio 2017 -version: '2.8.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 71fa07f3fc..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 61ddcb030a..24886a72d3 100644 --- a/src/common/SolutionInfo.cs +++ b/src/common/SolutionInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyInformationalVersion(AssemblyVersionInformation.Version)] [assembly: ComVisible(false)] [assembly: AssemblyCompany("GitHub, Inc.")] -[assembly: AssemblyCopyright("Copyright © GitHub, Inc. 2014-2016")] +[assembly: AssemblyCopyright("Copyright © GitHub, Inc. 2014-2016")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -18,6 +18,6 @@ namespace System { internal static class AssemblyVersionInformation { - internal const string Version = "2.8.0.0"; + internal const string Version = "2.7.1.0"; } } 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 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 ac63165810..b95392cff7 100644 --- a/test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs +++ b/test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs @@ -1,5 +1,8 @@ -using System.IO; +using System; +using System.IO; +using System.Linq; using System.Reflection; +using NCrunch.Framework; using NUnit.Framework; public class GitHubAssemblyTests @@ -15,8 +18,34 @@ 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"); + 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); }