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

Commit f096821

Browse files
grokysgrokys
authored
Merge ab7fee3 into a8f266a 
2 parents a8f266a + ab7fee3 commit f096821

File tree

9 files changed

+20
-16
lines changed

9 files changed

+20
-16
lines changed

‎Directory.Build.Props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
33
<Product>GitHub Extension for Visual Studio</Product>
4-
<Version>2.5.6.0</Version>
4+
<Version>2.5.7.0</Version>
55
<Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
6-
<LangVersion>7.3</LangVersion>
6+
<LangVersion>7.3</LangVersion>
77
</PropertyGroup>
88
</Project>

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
os: Visual Studio 2017
2-
version: '2.5.6.{build}'
2+
version: '2.5.7.{build}'
33
skip_tags: true
44
install:
55
- ps: |

‎src/GitHub.Api/GitHub.Api.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
30-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
30+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
3131
<PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
3232
</ItemGroup>
3333
</Project>

‎src/GitHub.App/GitHub.App.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="14.3.25407" />
4949
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
5050
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
51-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
51+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
5252
<PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
5353
<PackageReference Include="Rothko" Version="0.0.3-ghfvs" />
5454
<PackageReference Include="Rx-Main" Version="2.2.5-custom" targetFramework="net45" />

‎src/GitHub.InlineReviews/GitHub.InlineReviews.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,8 @@
370370
<HintPath>..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
371371
<Private>True</Private>
372372
</Reference>
373-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
374-
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
375-
<Private>True</Private>
373+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
374+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
376375
</Reference>
377376
<Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
378377
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>

‎src/GitHub.VisualStudio/GitHub.VisualStudio.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<VsixType>v3</VsixType>
1313
<IsProductComponent>false</IsProductComponent>
1414
<ExtensionInstallationFolder>GitHub\GitHub</ExtensionInstallationFolder>
15-
<XlfLanguages>zh-CN</XlfLanguages>
15+
<XlfLanguages>zh-CN</XlfLanguages>
1616
<NuGetPackageImportStamp>
1717
</NuGetPackageImportStamp>
1818
</PropertyGroup>
@@ -243,9 +243,8 @@
243243
<HintPath>..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
244244
<Private>True</Private>
245245
</Reference>
246-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
247-
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
248-
<Private>True</Private>
246+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
247+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
249248
</Reference>
250249
<Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
251250
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
@@ -476,6 +475,11 @@
476475
</EmbeddedResource>
477476
</ItemGroup>
478477
<ItemGroup>
478+
<Content Include="..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll">
479+
<Link>Newtonsoft.Json.dll</Link>
480+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
481+
<IncludeInVSIX>true</IncludeInVSIX>
482+
</Content>
479483
<Content Include="Resources\preview_200x200.png">
480484
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
481485
<IncludeInVSIX>true</IncludeInVSIX>

‎src/GitHub.VisualStudio/source.extension.vsixmanifest‎

Lines changed: 3 additions & 2 deletions
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.5.6.0" Language="en-US" Publisher="GitHub, Inc" />
4+
<Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.5.7.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>
@@ -37,8 +37,9 @@
3737
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="GitHub.StartPage" Path="|GitHub.StartPage;PkgdefProjectOutputGroup|" />
3838
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.InlineReviews" Path="|GitHub.InlineReviews|" />
3939
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="File" Path="Rothko.dll" />
40+
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Newtonsoft.Json.dll" AssemblyName="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />
4041
</Assets>
4142
<Prerequisites>
4243
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25824.0,)" DisplayName="Visual Studio core editor" />
4344
</Prerequisites>
44-
</PackageManifest>
45+
</PackageManifest>

‎src/common/SolutionInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
namespace System
1919
{
2020
internal static class AssemblyVersionInformation {
21-
internal const string Version = "2.5.6.0";
21+
internal const string Version = "2.5.7.0";
2222
}
2323
}

‎test/GitHub.App.UnitTests/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
44
<dependentAssembly>
55
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
6-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="10.0.0.0"/>
6+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="9.0.0.0"/>
77
</dependentAssembly>
88
</assemblyBinding>
99
</runtime>

0 commit comments

Comments
 (0)