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

Commit 983df56

Browse files
authored
Merge fde4693 into 337f266
2 parents 337f266 + fde4693 commit 983df56

File tree

7 files changed

+39
-9
lines changed

7 files changed

+39
-9
lines changed

Directory.Build.Props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<Product>GitHub Extension for Visual Studio</Product>
4-
<Version>2.8.0.0</Version>
4+
<Version>2.7.1.0</Version>
55
<Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
66
<LangVersion>7.3</LangVersion>
77
</PropertyGroup>

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
os: Visual Studio 2017
2-
version: '2.8.0.{build}'
2+
version: '2.7.1.{build}'
33
skip_tags: true
44
install:
55
- ps: |

src/GitHub.VisualStudio/source.extension.vsixmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.8.0.0" Language="en-US" Publisher="GitHub, Inc" />
4+
<Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.7.1.0" Language="en-US" Publisher="GitHub, Inc" />
55
<DisplayName>GitHub Extension for Visual Studio</DisplayName>
66
<Description xml:space="preserve">A Visual Studio Extension that brings the GitHub Flow into Visual Studio.</Description>
77
<PackageId>GitHub.VisualStudio</PackageId>

src/common/SolutionInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[assembly: AssemblyInformationalVersion(AssemblyVersionInformation.Version)]
1010
[assembly: ComVisible(false)]
1111
[assembly: AssemblyCompany("GitHub, Inc.")]
12-
[assembly: AssemblyCopyright("Copyright © GitHub, Inc. 2014-2016")]
12+
[assembly: AssemblyCopyright("Copyright © GitHub, Inc. 2014-2016")]
1313
[assembly: AssemblyConfiguration("")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
@@ -18,6 +18,6 @@
1818
namespace System
1919
{
2020
internal static class AssemblyVersionInformation {
21-
internal const string Version = "2.8.0.0";
21+
internal const string Version = "2.7.1.0";
2222
}
2323
}

test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<ItemGroup>
2222
<PackageReference Include="Codecov" Version="1.1.0" />
2323
<PackageReference Include="Madskristensen.VisualStudio.SDK" Version="14.3.75-pre" />
24+
<PackageReference Include="NCrunch.Framework" Version="3.17.0" />
2425
<PackageReference Include="NSubstitute" Version="2.0.3" />
2526
<PackageReference Include="NUnit" version="3.9.0" />
2627
<PackageReference Include="OpenCover" Version="4.6.519" />

test/GitHub.VisualStudio.UnitTests/GitHubAssemblyTests.cs

+32-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
using System.IO;
1+
using System;
2+
using System.IO;
3+
using System.Linq;
24
using System.Reflection;
5+
using NCrunch.Framework;
36
using NUnit.Framework;
47

58
public class GitHubAssemblyTests
@@ -15,8 +18,34 @@ public void GitHub_Assembly_Should_Not_Reference_DesignTime_Assembly(string asse
1518
}
1619
}
1720

21+
[Theory]
22+
public void GitHub_Assembly_Should_Not_Reference_System_Net_Http_Above_4_0(string assemblyFile)
23+
{
24+
var asm = Assembly.LoadFrom(assemblyFile);
25+
foreach (var referencedAssembly in asm.GetReferencedAssemblies())
26+
{
27+
if (referencedAssembly.Name == "System.Net.Http")
28+
{
29+
Assert.That(referencedAssembly.Version, Is.EqualTo(new Version("4.0.0.0")));
30+
}
31+
}
32+
}
33+
1834
[DatapointSource]
19-
string[] GitHubAssemblies => Directory.GetFiles(AssemblyDirectory, "GitHub.*.dll");
35+
string[] GetGitHubAssemblies()
36+
{
37+
var prefix = "GitHub.";
38+
if (NCrunchEnvironment.NCrunchIsResident())
39+
{
40+
return NCrunchEnvironment.GetAllAssemblyLocations()
41+
.Where(p => Path.GetFileName(p).StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
42+
.ToArray();
43+
}
44+
else
45+
{
46+
var dir = Path.GetDirectoryName(GetType().Assembly.Location);
47+
return Directory.GetFiles(dir, $"{prefix}*.dll");
48+
}
49+
}
2050

21-
string AssemblyDirectory => Path.GetDirectoryName(GetType().Assembly.Location);
2251
}

0 commit comments

Comments
 (0)