Updated plugin project to be compatible with latest Wox version.

lances101 · Apr 17, 2016 · 004cfcb · 004cfcb
1 parent e4fe91e
commit 004cfcb
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/Wox.Plugin.SimpleClock.sln b/Wox.Plugin.SimpleClock.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.SimpleClock", "Wox.Plugin.SimpleClock\Wox.Plugin.SimpleClock.csproj", "{A75CBF0D-5253-419A-B123-C52E1D0A2C95}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Boromak", "..\Wox.Plugin.Boromak\Wox.Plugin.Boromak\Wox.Plugin.Boromak.csproj", "{3ACC9978-09A4-4F75-A0E3-593B12C70AE0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Boromak", "Wox.Plugin.Boromak\Wox.Plugin.Boromak\Wox.Plugin.Boromak.csproj", "{3ACC9978-09A4-4F75-A0E3-593B12C70AE0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Wox.Plugin.SimpleClock/AlarmSettingsStorage.cs b/Wox.Plugin.SimpleClock/AlarmSettingsStorage.cs
@@ -12,19 +12,14 @@ namespace Wox.Plugin.SimpleClock
 {
     public class ClockSettingsStorage :JsonStrorage<ClockSettingsStorage>
     {
-        protected override string ConfigFolder
+        protected string ConfigFolder
         {
             get
             {
                 return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); 
             }
         }
 
-        protected override string ConfigName
-        {
-            get { return "alarms"; }
-        }
-
         protected override void OnAfterLoad(ClockSettingsStorage obj)
         {
             if (String.IsNullOrEmpty(obj.AlarmTrackPath))
@@ -36,6 +31,9 @@ protected override void OnAfterLoad(ClockSettingsStorage obj)
 
         [JsonProperty]
         public string AlarmTrackPath { get; set; }
+
+        protected override string FileName { get; } = "alarms";
+
         [JsonProperty]
         public List<StoredAlarm> Alarms = new List<StoredAlarm>();
 

diff --git a/Wox.Plugin.SimpleClock/Wox.Plugin.SimpleClock.csproj b/Wox.Plugin.SimpleClock/Wox.Plugin.SimpleClock.csproj
@@ -9,18 +9,20 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Wox.Plugin.SimpleClock</RootNamespace>
     <AssemblyName>Wox.Plugin.SimpleClock</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>D:\Program Files\WoxBeta\Plugins\Wox.Plugin.SimpleClock\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,14 +31,15 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NAudio, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\NAudio.1.7.3\lib\net35\NAudio.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -45,16 +48,17 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
     <Reference Include="Wox.Infrastructure">
-      <HintPath>..\..\LocalWox\Output\Debug\Wox.Infrastructure.dll</HintPath>
+      <HintPath>D:\Program Files\WoxCurrent\Wox.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Wox.Plugin, Version=1.2.0.444, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Wox.Plugin.1.2.0.444\lib\net35\Wox.Plugin.dll</HintPath>
+    <Reference Include="Wox.Plugin, Version=1.2.0.486, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Wox.Plugin.1.2.0.486\lib\net35\Wox.Plugin.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -125,7 +129,7 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Wox.Plugin.Boromak\Wox.Plugin.Boromak\Wox.Plugin.Boromak.csproj">
+    <ProjectReference Include="..\Wox.Plugin.Boromak\Wox.Plugin.Boromak\Wox.Plugin.Boromak.csproj">
       <Project>{3acc9978-09a4-4f75-a0e3-593b12c70ae0}</Project>
       <Name>Wox.Plugin.Boromak</Name>
     </ProjectReference>

diff --git a/Wox.Plugin.SimpleClock/app.config b/Wox.Plugin.SimpleClock/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/Wox.Plugin.SimpleClock/packages.config b/Wox.Plugin.SimpleClock/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NAudio" version="1.7.3" targetFramework="net35" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net35" />
-  <package id="Wox.Plugin" version="1.2.0.444" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net35" requireReinstallation="true" />
+  <package id="Wox.Plugin" version="1.2.0.486" targetFramework="net35" />
 </packages>
diff --git a/Wox.Plugin.SimpleClock/plugin.json b/Wox.Plugin.SimpleClock/plugin.json
@@ -3,8 +3,8 @@
   "ActionKeyword":"clock",
   "Name":"Wox.Plugin.SimpleClock",
   "Description":"Simple Clock",
-  "Author":"Boris Makogonyuk",
-  "Version":"1.0.0",
+  "Author":"Boris Makogonyuk (boromak)",
+  "Version":"1.0.2",
   "Language":"csharp",
   "Website":"http://boromak.com/",
   "IcoPath": "Images\\alarm_full.png",