Merge pull request #1652 from zooba/json-version

Json version
microsoft · Sep 22, 2016 · 53c6989 · 53c6989
2 parents beadfa2 + e5d05ae
commit 53c6989
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 11 deletions.
diff --git a/Build/PreBuild.ps1 b/Build/PreBuild.ps1
@@ -3,7 +3,7 @@ param ($vstarget, $source, [switch] $clean, [switch] $full)
 # This is the list of packages we require to build, and the version to use for each supported $vstarget
 $packages = @(
     @{ name="Microsoft.VSSDK.BuildTools"; version=@{ "14.0"="14.2.25201"; "15.0"="15.0.25604-Preview4" }; required=$true },
-    @{ name="Newtonsoft.Json"; version=@{ "14.0"="6.0.8"; "15.0"="6.0.8" }; required=$true },
+    @{ name="Newtonsoft.Json"; version=@{ "14.0"="6.0.8"; "15.0"="8.0.3" }; required=$true },
     @{ name="MicroBuild.Core"; version=@{ "14.0"="0.2.0"; "15.0"="0.2.0" }; required=$false },
     @{ name="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime"; version=@{ "14.0"="14.2.25123"; "15.0"="14.2.25123" }; required=$true },
     @{ name="Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime"; version=@{ "14.0"="12.1.30328"; "15.0"="12.1.30328" }; required=$true },

diff --git a/Python/Product/Analyzer/Analyzer.csproj b/Python/Product/Analyzer/Analyzer.csproj
@@ -44,7 +44,7 @@
     <ApplicationIcon>..\Icons\Dev$(VSTarget)\PythonProject.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json">
       <HintPath>$(PackagesPath)\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>

diff --git a/Python/Product/Cookiecutter/Cookiecutter.csproj b/Python/Product/Cookiecutter/Cookiecutter.csproj
@@ -108,7 +108,7 @@
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json">
       <HintPath>$(PackagesPath)\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
       <IncludeInVSIX>True</IncludeInVSIX>

diff --git a/Python/Product/Core/Core.csproj b/Python/Product/Core/Core.csproj
@@ -155,6 +155,8 @@
     <None Include="source.extension.vsixmanifest" />
     <Content Include="$(PackagesPath)\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll">
       <VSIXSubPath>.</VSIXSubPath>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="$(BuildRoot)\Python\References\Dev$(VSTarget)\Microsoft.PythonTools.InteractiveWindow.dll">
       <VSIXSubPath>.</VSIXSubPath>

diff --git a/Python/Product/Core/source.extension.vsixmanifest b/Python/Product/Core/source.extension.vsixmanifest
@@ -47,7 +47,7 @@
     <Asset Type="UnitTestExtension" Path="|Microsoft.PythonTools.TestAdapter.Executor;_GetTargetPath|" />
     <Asset Type="DebuggerEngineExtension" Path="DkmDebugger.vsdconfig" />
     <Asset Type="NativeVisualizer" Path="PythonDkm.natvis" />
-    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Newtonsoft.Json.dll" AssemblyName="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />
+    <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Newtonsoft.Json.dll" />
     <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.PythonTools.InteractiveWindow.dll" AssemblyName="Microsoft.PythonTools.InteractiveWindow, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.PythonTools.VsInteractiveWindow.dll" AssemblyName="Microsoft.PythonTools.VsInteractiveWindow, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="Microsoft.PythonTools.VsInteractiveWindow.pkgdef" />

diff --git a/Python/Product/Ipc.Json/Ipc.Json.csproj b/Python/Product/Ipc.Json/Ipc.Json.csproj
@@ -37,7 +37,7 @@
     <RootNamespace>Microsoft.PythonTools.Ipc.Json</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json">
       <HintPath>$(PackagesPath)\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>

diff --git a/Python/Product/PythonTools/PythonTools.csproj b/Python/Product/PythonTools/PythonTools.csproj
@@ -182,7 +182,7 @@
     <Reference Include="Microsoft.VisualStudio.WizardFramework, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>$(DevEnvDir)\Microsoft.VisualStudio.WizardFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json">
       <HintPath>$(PackagesPath)\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
       <IncludeInVSIX>True</IncludeInVSIX>
@@ -858,9 +858,6 @@
       <ResourceName>1000</ResourceName>
       <SubType>Designer</SubType>
     </VSCTCompile>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Content Include="visualstudio_py_launcher.py">

diff --git a/Python/Product/PythonTools/PythonTools/Project/PythonProjectNode.cs b/Python/Product/PythonTools/PythonTools/Project/PythonProjectNode.cs
@@ -1214,13 +1214,12 @@ private void AnalysisProcessExited(object sender, AbnormalAnalysisExitEventArgs
             msg.AppendFormat("Exit Code: {0}", e.ExitCode);
             msg.AppendLine();
             msg.AppendLine(" ------ STD ERR ------ ");
-            msg.AppendLine(e.StdErr);
+            msg.Append(e.StdErr);
             msg.AppendLine(" ------ END STD ERR ------ ");
             Site.GetPythonToolsService().Logger.LogEvent(
                 PythonLogEvent.AnalysisExitedAbnormally,
                 msg.ToString()
             );
-            EventLog.WriteEntry(Strings.ProductTitle, msg.ToString(), EventLogEntryType.Error, 9998);
         }
 
         private void HookErrorsAndWarnings(VsProjectAnalyzer res) {