From 08594f0b96b235f9de42d4456f775401042ef426 Mon Sep 17 00:00:00 2001 From: bao-qian Date: Sat, 7 Nov 2015 03:03:54 +0000 Subject: [PATCH] Upgrade to .net 4.5 --- Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj | 13 ++++---- Plugins/Wox.Plugin.CMD/packages.config | 4 +-- .../Wox.Plugin.Caculator.csproj | 4 +-- Plugins/Wox.Plugin.Caculator/packages.config | 2 +- .../Wox.Plugin.Color/Wox.Plugin.Color.csproj | 2 +- .../Wox.Plugin.ControlPanel.csproj | 2 +- .../ContextMenuStorage.cs | 1 - .../Wox.Plugin.Everything.csproj | 18 ++++++---- Plugins/Wox.Plugin.Everything/packages.config | 3 +- .../Wox.Plugin.Folder.csproj | 10 +++--- Plugins/Wox.Plugin.Folder/packages.config | 2 +- .../Wox.Plugin.PluginIndicator.csproj | 2 +- .../Wox.Plugin.PluginManagement.csproj | 6 ++-- .../packages.config | 2 +- .../Wox.Plugin.Program.csproj | 8 +++-- Plugins/Wox.Plugin.Program/packages.config | 2 +- Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj | 6 ++-- Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj | 2 +- .../Wox.Plugin.WebSearch.csproj | 7 ++-- Plugins/Wox.Plugin.WebSearch/packages.config | 2 +- Wox.Core/Wox.Core.csproj | 9 ++--- Wox.Core/packages.config | 6 ++-- Wox.CrashReporter/Wox.CrashReporter.csproj | 15 ++++++--- Wox.CrashReporter/packages.config | 2 +- Wox.Infrastructure/Wox.Infrastructure.csproj | 12 ++++--- Wox.Infrastructure/packages.config | 6 ++-- Wox.Plugin/Wox.Plugin.csproj | 8 +++-- Wox.Test/Wox.Test.csproj | 13 +++++--- Wox.Test/packages.config | 4 +-- .../Wox.UpdateFeedGenerator.csproj | 17 ++++++---- Wox.UpdateFeedGenerator/app.config | 3 ++ Wox.UpdateFeedGenerator/packages.config | 4 +-- Wox/App.config | 5 ++- Wox/Wox.csproj | 33 ++++++++++++++----- Wox/packages.config | 14 ++++---- 35 files changed, 150 insertions(+), 99 deletions(-) create mode 100644 Wox.UpdateFeedGenerator/app.config diff --git a/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj b/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj index 2b7280a2b5..cb10d95247 100644 --- a/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj +++ b/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.CMD Wox.Plugin.CMD - v3.5 + v4.5.2 512 ..\..\ @@ -34,8 +34,8 @@ false - - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll True @@ -43,13 +43,15 @@ + - + ..\..\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll + True @@ -110,5 +112,4 @@ --> - - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.CMD/packages.config b/Plugins/Wox.Plugin.CMD/packages.config index 4687456d1a..0be4b18f6f 100644 --- a/Plugins/Wox.Plugin.CMD/packages.config +++ b/Plugins/Wox.Plugin.CMD/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj b/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj index 907c4ff929..e28fab5d13 100644 --- a/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj +++ b/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Caculator Wox.Plugin.Caculator - v3.5 + v4.5.2 512 ..\..\ @@ -39,8 +39,8 @@ - False ..\..\packages\YAMP.1.4.0\lib\net35\YAMP.dll + True diff --git a/Plugins/Wox.Plugin.Caculator/packages.config b/Plugins/Wox.Plugin.Caculator/packages.config index 4e151aa36f..ef1566573c 100644 --- a/Plugins/Wox.Plugin.Caculator/packages.config +++ b/Plugins/Wox.Plugin.Caculator/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj b/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj index 847df6d016..eebd501f0f 100644 --- a/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj +++ b/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Color Wox.Plugin.Color - v3.5 + v4.5.2 512 diff --git a/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj b/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj index 86f8a2c2a8..9b19f29657 100644 --- a/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj +++ b/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.ControlPanel Wox.Plugin.ControlPanel - v3.5 + v4.5.2 512 diff --git a/Plugins/Wox.Plugin.Everything/ContextMenuStorage.cs b/Plugins/Wox.Plugin.Everything/ContextMenuStorage.cs index ba36209b6a..1971cf95ae 100644 --- a/Plugins/Wox.Plugin.Everything/ContextMenuStorage.cs +++ b/Plugins/Wox.Plugin.Everything/ContextMenuStorage.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.IO; using System.Reflection; -using Exceptionless.Json; using JsonProperty = Newtonsoft.Json.JsonPropertyAttribute; using Wox.Infrastructure.Storage; diff --git a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj index 1b8afe4139..3df41be678 100644 --- a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj +++ b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,9 +9,10 @@ Properties Wox.Plugin.Everything Wox.Plugin.Everything - v3.5 + v4.5.2 512 ..\Wox\ + true @@ -22,6 +23,7 @@ prompt 4 AnyCPU + false pdbonly @@ -30,14 +32,19 @@ TRACE prompt 4 + false + + ..\..\packages\Exceptionless.Portable.3.1.1416\lib\net45\Exceptionless.Portable.dll + True + - False - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + True @@ -137,5 +144,4 @@ --> - - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Everything/packages.config b/Plugins/Wox.Plugin.Everything/packages.config index 7a13476a54..654e648df6 100644 --- a/Plugins/Wox.Plugin.Everything/packages.config +++ b/Plugins/Wox.Plugin.Everything/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj index 748cd7c6d8..e4cc76f35b 100644 --- a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj +++ b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Folder Wox.Plugin.Folder - v3.5 + v4.5.2 512 ..\..\ @@ -34,8 +34,8 @@ false - - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll True @@ -43,6 +43,7 @@ + @@ -111,5 +112,4 @@ --> - - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Folder/packages.config b/Plugins/Wox.Plugin.Folder/packages.config index 7a13476a54..0b84f87d4d 100644 --- a/Plugins/Wox.Plugin.Folder/packages.config +++ b/Plugins/Wox.Plugin.Folder/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj b/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj index e57ab20a8d..5ec360cd3d 100644 --- a/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj +++ b/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.PluginIndicator Wox.Plugin.PluginIndicator - v3.5 + v4.5.2 512 diff --git a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj index f88fb7d916..870bf34574 100644 --- a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj +++ b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.PluginManagement Wox.Plugin.PluginManagement - v3.5 + v4.5.2 512 ..\..\ @@ -34,8 +34,8 @@ false - - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll True diff --git a/Plugins/Wox.Plugin.PluginManagement/packages.config b/Plugins/Wox.Plugin.PluginManagement/packages.config index 7a13476a54..0b84f87d4d 100644 --- a/Plugins/Wox.Plugin.PluginManagement/packages.config +++ b/Plugins/Wox.Plugin.PluginManagement/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj index 84b26a6cd1..4294512e26 100644 --- a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj +++ b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Program Wox.Plugin.Program - v3.5 + v4.5.2 512 ..\..\ @@ -34,15 +34,17 @@ false + - False - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + True + diff --git a/Plugins/Wox.Plugin.Program/packages.config b/Plugins/Wox.Plugin.Program/packages.config index 7a13476a54..0b84f87d4d 100644 --- a/Plugins/Wox.Plugin.Program/packages.config +++ b/Plugins/Wox.Plugin.Program/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj b/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj index 2bfb924a5c..1b303bcb7d 100644 --- a/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj +++ b/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Sys Wox.Plugin.Sys - v3.5 + v4.5.2 512 ..\..\ @@ -39,6 +39,7 @@ + @@ -129,5 +130,4 @@ --> - - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj b/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj index 23e5ac1a8f..ef17910a3c 100644 --- a/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj +++ b/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Url Wox.Plugin.Url - v3.5 + v4.5.2 512 diff --git a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj index 32a1b26e4a..17ee860d8f 100644 --- a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj +++ b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.WebSearch Wox.Plugin.WebSearch - v3.5 + v4.5.2 512 ..\..\ @@ -35,13 +35,14 @@ - False - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + True + diff --git a/Plugins/Wox.Plugin.WebSearch/packages.config b/Plugins/Wox.Plugin.WebSearch/packages.config index 7a13476a54..0b84f87d4d 100644 --- a/Plugins/Wox.Plugin.WebSearch/packages.config +++ b/Plugins/Wox.Plugin.WebSearch/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Wox.Core/Wox.Core.csproj b/Wox.Core/Wox.Core.csproj index c7e8072a24..c6160c84e5 100644 --- a/Wox.Core/Wox.Core.csproj +++ b/Wox.Core/Wox.Core.csproj @@ -9,7 +9,7 @@ Properties Wox.Core Wox.Core - v3.5 + v4.5.2 512 ..\ @@ -35,16 +35,16 @@ - False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + True ..\packages\NAppUpdate.Framework.0.3.2.0\lib\net20\NAppUpdate.Framework.dll True - False - ..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + True @@ -52,6 +52,7 @@ + diff --git a/Wox.Core/packages.config b/Wox.Core/packages.config index 2825ea4cc2..93b11a0396 100644 --- a/Wox.Core/packages.config +++ b/Wox.Core/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/Wox.CrashReporter/Wox.CrashReporter.csproj b/Wox.CrashReporter/Wox.CrashReporter.csproj index 0194c1d262..dd3f3b3160 100644 --- a/Wox.CrashReporter/Wox.CrashReporter.csproj +++ b/Wox.CrashReporter/Wox.CrashReporter.csproj @@ -9,7 +9,7 @@ Properties Wox.CrashReporter Wox.CrashReporter - v3.5 + v4.5.2 512 ..\ @@ -34,13 +34,19 @@ false - - ..\packages\Exceptionless.1.5.2121\lib\net35\Exceptionless.dll + + ..\packages\Exceptionless.1.5.2121\lib\net45\Exceptionless.dll + True + + + ..\packages\Exceptionless.1.5.2121\lib\net45\Exceptionless.Models.dll + True + @@ -95,5 +101,4 @@ --> - - + \ No newline at end of file diff --git a/Wox.CrashReporter/packages.config b/Wox.CrashReporter/packages.config index aaa9e6ed9c..a8a044e437 100644 --- a/Wox.CrashReporter/packages.config +++ b/Wox.CrashReporter/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Wox.Infrastructure/Wox.Infrastructure.csproj b/Wox.Infrastructure/Wox.Infrastructure.csproj index e3740ee2cc..a02fd514e3 100644 --- a/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Wox.Infrastructure Wox.Infrastructure - v3.5 + v4.5.2 512 ..\ @@ -37,11 +37,11 @@ - False - ..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + True - ..\packages\NLog.4.2.0\lib\net35\NLog.dll + ..\packages\NLog.4.2.0\lib\net45\NLog.dll True @@ -78,6 +78,8 @@ Always + + Designer diff --git a/Wox.Infrastructure/packages.config b/Wox.Infrastructure/packages.config index 0c8252da99..3023f2583f 100644 --- a/Wox.Infrastructure/packages.config +++ b/Wox.Infrastructure/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/Wox.Plugin/Wox.Plugin.csproj b/Wox.Plugin/Wox.Plugin.csproj index 11c1b4c89b..5c4fb10f00 100644 --- a/Wox.Plugin/Wox.Plugin.csproj +++ b/Wox.Plugin/Wox.Plugin.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,8 +9,9 @@ Properties Wox.Plugin Wox.Plugin - v3.5 + v4.5.2 512 + true @@ -21,6 +22,7 @@ prompt 4 AnyCPU + false pdbonly @@ -29,12 +31,14 @@ TRACE prompt 4 + false + diff --git a/Wox.Test/Wox.Test.csproj b/Wox.Test/Wox.Test.csproj index 8d54d3612e..867c3ac771 100644 --- a/Wox.Test/Wox.Test.csproj +++ b/Wox.Test/Wox.Test.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Wox.Test Wox.Test - v3.5 + v4.5.2 512 ..\ @@ -34,9 +34,13 @@ false + + ..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll + True + - False ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + True @@ -77,5 +81,4 @@ --> - - + \ No newline at end of file diff --git a/Wox.Test/packages.config b/Wox.Test/packages.config index 565203e846..8bd8a9d0e8 100644 --- a/Wox.Test/packages.config +++ b/Wox.Test/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Wox.UpdateFeedGenerator/Wox.UpdateFeedGenerator.csproj b/Wox.UpdateFeedGenerator/Wox.UpdateFeedGenerator.csproj index 8801cc14a6..b05de76110 100644 --- a/Wox.UpdateFeedGenerator/Wox.UpdateFeedGenerator.csproj +++ b/Wox.UpdateFeedGenerator/Wox.UpdateFeedGenerator.csproj @@ -9,9 +9,10 @@ Properties Wox.UpdateFeedGenerator Wox.UpdateFeedGenerator - v3.5 + v4.5.2 512 ..\ + AnyCPU @@ -22,6 +23,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -31,6 +33,7 @@ TRACE prompt 4 + false @@ -38,8 +41,8 @@ True - False - ..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + True @@ -57,7 +60,10 @@ - + + + Designer + @@ -74,5 +80,4 @@ --> - - + \ No newline at end of file diff --git a/Wox.UpdateFeedGenerator/app.config b/Wox.UpdateFeedGenerator/app.config new file mode 100644 index 0000000000..ff99501038 --- /dev/null +++ b/Wox.UpdateFeedGenerator/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Wox.UpdateFeedGenerator/packages.config b/Wox.UpdateFeedGenerator/packages.config index 9661aa0af8..23f4f18934 100644 --- a/Wox.UpdateFeedGenerator/packages.config +++ b/Wox.UpdateFeedGenerator/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Wox/App.config b/Wox/App.config index 55ab1e0d9d..1c9852a233 100644 --- a/Wox/App.config +++ b/Wox/App.config @@ -1,12 +1,15 @@ + +
+ - + \ No newline at end of file diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index ff6ac6882c..80a69120c1 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Wox Wox - v3.5 + v4.5.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -61,21 +61,30 @@ - False - ..\packages\Exceptionless.1.5.2121\lib\net35\Exceptionless.dll + ..\packages\Exceptionless.1.5.2121\lib\net45\Exceptionless.dll + True - + + ..\packages\Exceptionless.1.5.2121\lib\net45\Exceptionless.Models.dll + True + + + ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + True + + ..\packages\MarkdownSharp.1.13.0.0\lib\35\MarkdownSharp.dll + True - False - ..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + True - False ..\packages\NHotkey.1.2.1\lib\net20\NHotkey.dll + True - + ..\packages\NHotkey.Wpf.1.2.1\lib\net35\NHotkey.Wpf.dll True @@ -89,6 +98,7 @@ + @@ -98,6 +108,10 @@ + + ..\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll + True + @@ -106,6 +120,7 @@ + diff --git a/Wox/packages.config b/Wox/packages.config index 054bbd20c3..ed8b710f14 100644 --- a/Wox/packages.config +++ b/Wox/packages.config @@ -1,10 +1,10 @@  - - - - - - - + + + + + + + \ No newline at end of file