From 495a8ee32bb6a75e3d1b0dcb595b760463d8eed5 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Wed, 21 Sep 2016 16:38:59 -0700 Subject: [PATCH 1/2] Changes Newtonsoft.Json dependency to the latest version for Dev15 build. --- Build/PreBuild.ps1 | 2 +- Python/Product/Analyzer/Analyzer.csproj | 2 +- Python/Product/Cookiecutter/Cookiecutter.csproj | 2 +- Python/Product/Core/Core.csproj | 2 ++ Python/Product/Core/source.extension.vsixmanifest | 2 +- Python/Product/Ipc.Json/Ipc.Json.csproj | 2 +- Python/Product/PythonTools/PythonTools.csproj | 5 +---- .../PythonTools/PythonTools/Project/PythonProjectNode.cs | 3 +-- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Build/PreBuild.ps1 b/Build/PreBuild.ps1 index 4037216403..9d02586450 100644 --- 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.0" }; 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 index fce828b052..95965018e1 100644 --- a/Python/Product/Analyzer/Analyzer.csproj +++ b/Python/Product/Analyzer/Analyzer.csproj @@ -44,7 +44,7 @@ ..\Icons\Dev$(VSTarget)\PythonProject.ico - + $(PackagesPath)\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll True diff --git a/Python/Product/Cookiecutter/Cookiecutter.csproj b/Python/Product/Cookiecutter/Cookiecutter.csproj index 619a2c8ef9..16f3796861 100644 --- a/Python/Product/Cookiecutter/Cookiecutter.csproj +++ b/Python/Product/Cookiecutter/Cookiecutter.csproj @@ -108,7 +108,7 @@ True - + $(PackagesPath)\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll True True diff --git a/Python/Product/Core/Core.csproj b/Python/Product/Core/Core.csproj index 11629c61ae..8c030c8223 100644 --- a/Python/Product/Core/Core.csproj +++ b/Python/Product/Core/Core.csproj @@ -155,6 +155,8 @@ . + Always + true . diff --git a/Python/Product/Core/source.extension.vsixmanifest b/Python/Product/Core/source.extension.vsixmanifest index d3c9725562..d702b02359 100644 --- a/Python/Product/Core/source.extension.vsixmanifest +++ b/Python/Product/Core/source.extension.vsixmanifest @@ -47,7 +47,7 @@ - + diff --git a/Python/Product/Ipc.Json/Ipc.Json.csproj b/Python/Product/Ipc.Json/Ipc.Json.csproj index 80dff95e73..b8dd2c8522 100644 --- a/Python/Product/Ipc.Json/Ipc.Json.csproj +++ b/Python/Product/Ipc.Json/Ipc.Json.csproj @@ -37,7 +37,7 @@ Microsoft.PythonTools.Ipc.Json - + $(PackagesPath)\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll True diff --git a/Python/Product/PythonTools/PythonTools.csproj b/Python/Product/PythonTools/PythonTools.csproj index 59e1c686a0..b690625f8a 100644 --- a/Python/Product/PythonTools/PythonTools.csproj +++ b/Python/Product/PythonTools/PythonTools.csproj @@ -182,7 +182,7 @@ $(DevEnvDir)\Microsoft.VisualStudio.WizardFramework.dll - + $(PackagesPath)\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll True True @@ -858,9 +858,6 @@ 1000 Designer - - Designer - diff --git a/Python/Product/PythonTools/PythonTools/Project/PythonProjectNode.cs b/Python/Product/PythonTools/PythonTools/Project/PythonProjectNode.cs index 83c6adabaf..6f04da1066 100644 --- 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) { From e5d05aebec52c70e80d8445a29e1623e8acf1a22 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Wed, 21 Sep 2016 16:42:22 -0700 Subject: [PATCH 2/2] Make it version 8.0.3 --- Build/PreBuild.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build/PreBuild.ps1 b/Build/PreBuild.ps1 index 9d02586450..25cb23c28e 100644 --- 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"="8.0.0" }; 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 },