From 8c7547ab03e79968d52d85e7fbad7c161e82a829 Mon Sep 17 00:00:00 2001 From: cxfksword Date: Sat, 8 Feb 2014 21:54:37 +0800 Subject: [PATCH] fix build error on release mode and add miss SharpZipLib nuget package --- Wox.2010.sln | 30 +++++++++++++++++++++++++ Wox/PluginLoader/PythonPluginWrapper.cs | 4 +++- Wox/packages.config | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Wox.2010.sln b/Wox.2010.sln index a517724e32..b13e3eec4d 100644 --- a/Wox.2010.sln +++ b/Wox.2010.sln @@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Fanyi", "Plugins EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "Pythonnet.Runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Infrastructure", "Wox.Infrastructure\Wox.Infrastructure.csproj", "{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -214,6 +216,34 @@ Global {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x64.ActiveCfg = UnitTests|x64 {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x64.Build.0 = UnitTests|x64 {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x86.ActiveCfg = UnitTests|x64 + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Win32.ActiveCfg = Debug|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|x64.ActiveCfg = Debug|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|x86.ActiveCfg = Debug|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.EmbeddingTest|Any CPU.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.EmbeddingTest|Any CPU.Build.0 = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.EmbeddingTest|Mixed Platforms.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.EmbeddingTest|Mixed Platforms.Build.0 = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.EmbeddingTest|Win32.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.EmbeddingTest|x64.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.EmbeddingTest|x86.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|Any CPU.Build.0 = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|Win32.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|x64.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|x86.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.UnitTests|Any CPU.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.UnitTests|Any CPU.Build.0 = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.UnitTests|Mixed Platforms.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.UnitTests|Mixed Platforms.Build.0 = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.UnitTests|Win32.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.UnitTests|x64.ActiveCfg = Release|Any CPU + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.UnitTests|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Wox/PluginLoader/PythonPluginWrapper.cs b/Wox/PluginLoader/PythonPluginWrapper.cs index 9b42b3c08c..0941c401cd 100644 --- a/Wox/PluginLoader/PythonPluginWrapper.cs +++ b/Wox/PluginLoader/PythonPluginWrapper.cs @@ -54,11 +54,13 @@ namespace Wox.PluginLoader } #endif } + + return new List(); } private string InvokeFunc(string func, params string[] para) { - string json; + string json = ""; PyObject[] paras = { }; if (para != null && para.Length > 0) diff --git a/Wox/packages.config b/Wox/packages.config index ebcfb61815..edde682830 100644 --- a/Wox/packages.config +++ b/Wox/packages.config @@ -3,4 +3,5 @@ + \ No newline at end of file