huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/rel/2.0.0' into dev

This commit is contained in:
Mike Harder 2017-07-11 16:35:04 -07:00
parent 121c20ef26 01fe818dcd
commit 452e3ccfb0
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NuGetPackageVerifier.json
View File

@ -7,7 +7,7 @@
"Microsoft.VisualStudio.LanguageServices.Razor": {
"Exclusions": {
"WRONG_THIRDPARTY_DEPENDENCY_VERSION": {
"Microsoft.VisualStudio.LanguageServices.Razor; .NETFramework,Version=v4.6": "This package intentionally depends on version 8.0.3 of Newtonsoft.Json because of the dependency on Visual Studio."
"Microsoft.VisualStudio.LanguageServices.Razor; .NETFramework,Version=v4.6": "This package intentionally depends on version 9.0.1 of Newtonsoft.Json because of the dependency on Visual Studio."
}
}
}

5
build/dependencies.props
View File

@ -15,7 +15,10 @@
<RoslynDevVersion>2.3.0-beta4-*</RoslynDevVersion>
<StreamJsonRpcVersion>1.1.92</StreamJsonRpcVersion>
<TestSdkVersion>15.3.0-*</TestSdkVersion>
<VsShellVersion>15.0.26201</VsShellVersion>
<!-- Must keep in sync with tooling\Microsoft.VisualStudio.RazorExtension\project.json -->
<VsShellVersion>15.0.26606</VsShellVersion>
<XunitVersion>2.3.0-beta2-*</XunitVersion>
</PropertyGroup>
</Project>

2
src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
View File

@ -37,7 +37,7 @@
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="12.0.30110" />
<!-- We need to use this version of Json.Net to maintain consistency with Visual Studio. -->
<PackageReference Include="Newtonsoft.Json" Version="8.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor.Workspaces\Microsoft.CodeAnalysis.Razor.Workspaces.csproj" />
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj" />

6
tooling/Microsoft.VisualStudio.RazorExtension/project.json
View File

@ -2,9 +2,9 @@
"frameworks": {
"net46": {
"dependencies": {
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26201",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26201",
"Microsoft.VSSDK.BuildTools": "15.0.26201"
"Microsoft.VisualStudio.ComponentModelHost": "15.0.26606",
"Microsoft.VisualStudio.Shell.15.0": "15.0.26606",
"Microsoft.VSSDK.BuildTools": "15.1.192"
}
}
},