Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Commit

Permalink
Merge fde4693 into 337f266
Browse files Browse the repository at this point in the history
  • Loading branch information
jcansdale authored Jan 22, 2019
2 parents 337f266 + fde4693 commit 983df56
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.Props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<Product>GitHub Extension for Visual Studio</Product>
<Version>2.8.0.0</Version>
<Version>2.7.1.0</Version>
<Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
os: Visual Studio 2017
version: '2.8.0.{build}'
version: '2.7.1.{build}'
skip_tags: true
install:
- ps: |
Expand Down
2 changes: 1 addition & 1 deletion src/GitHub.VisualStudio/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.8.0.0" Language="en-US" Publisher="GitHub, Inc" />
<Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.7.1.0" Language="en-US" Publisher="GitHub, Inc" />
<DisplayName>GitHub Extension for Visual Studio</DisplayName>
<Description xml:space="preserve">A Visual Studio Extension that brings the GitHub Flow into Visual Studio.</Description>
<PackageId>GitHub.VisualStudio</PackageId>
Expand Down
4 changes: 2 additions & 2 deletions src/common/SolutionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]
Expand All @@ -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";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<ItemGroup>
<PackageReference Include="Codecov" Version="1.1.0" />
<PackageReference Include="Madskristensen.VisualStudio.SDK" Version="14.3.75-pre" />
<PackageReference Include="NCrunch.Framework" Version="3.17.0" />
<PackageReference Include="NSubstitute" Version="2.0.3" />
<PackageReference Include="NUnit" version="3.9.0" />
<PackageReference Include="OpenCover" Version="4.6.519" />
Expand Down
35 changes: 32 additions & 3 deletions test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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);
}

0 comments on commit 983df56

Please sign in to comment.