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

Unify Newtonsoft.Json versions to 9.0.1.#1975

Merged
grokys merged 6 commits into from
Oct 8, 2018
Merged

Unify Newtonsoft.Json versions to 9.0.1. #1975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c959459
Reference Newtonsoft.Json 9.0.1
grokys Oct 5, 2018
1a3bc95
Fix Newtonsoft.Json references in projects.
grokys Oct 5, 2018
ac6c6a7
Fix binding redirect in test.
grokys Oct 5, 2018
055ab43
Include Newtonsoft.Json.dll in .vsix
jcansdale Oct 5, 2018
ecae066
Remove non-functional Asset TargetVersion
jcansdale Oct 5, 2018
ab7fee3
Bump version to 2.5.7.
grokys Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.Props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<Product>GitHub Extension for Visual Studio</Product>
<Version>2.5.6.0</Version>
<Version>2.5.7.0</Version>
<Copyright>Copyright © GitHub, Inc. 2014-2018</Copyright>
<LangVersion>7.3</LangVersion>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
os: Visual Studio 2017
version: '2.5.6.{build}'
version: '2.5.7.{build}'
skip_tags: true
install:
- ps: |
Expand Down
2 changes: 1 addition & 1 deletion src/GitHub.Api/GitHub.Api.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/GitHub.App/GitHub.App.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="14.3.25407" />
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
<PackageReference Include="Rothko" Version="0.0.3-ghfvs" />
<PackageReference Include="Rx-Main" Version="2.2.5-custom" targetFramework="net45" />
Expand Down
5 changes: 2 additions & 3 deletions src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -370,9 +370,8 @@
<HintPath>..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
Expand Down
12 changes: 8 additions & 4 deletions src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@
<VsixType>v3</VsixType>
<IsProductComponent>false</IsProductComponent>
<ExtensionInstallationFolder>GitHub\GitHub</ExtensionInstallationFolder>
<XlfLanguages>zh-CN</XlfLanguages>
<XlfLanguages>zh-CN</XlfLanguages>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
Expand DownExpand Up@@ -243,9 +243,8 @@
<HintPath>..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
<HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
Expand DownExpand Up@@ -476,6 +475,11 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll">
<Link>Newtonsoft.Json.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Resources\preview_200x200.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
Expand Down
5 changes: 3 additions & 2 deletions src/GitHub.VisualStudio/source.extension.vsixmanifest
View file
Open in desktop
Original file line numberDiff line numberDiff 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.5.6.0" Language="en-US" Publisher="GitHub, Inc" />
<Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.5.7.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 DownExpand Up@@ -37,8 +37,9 @@
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="GitHub.StartPage" Path="|GitHub.StartPage;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.InlineReviews" Path="|GitHub.InlineReviews|" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="File" Path="Rothko.dll" />
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Newtonsoft.Json.dll" AssemblyName="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25824.0,)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
</PackageManifest>
2 changes: 1 addition & 1 deletion src/common/SolutionInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,6 @@
namespace System
{
internal static class AssemblyVersionInformation {
internal const string Version = "2.5.6.0";
internal const string Version = "2.5.7.0";
}
}
2 changes: 1 addition & 1 deletion test/GitHub.App.UnitTests/app.config
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="10.0.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="9.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down