- #68: Remove the Scheduler 3rd party controls

- Fix fallout from removal - Up the version of Krypton and NLog - Update Readme.md - Reissue installer
Smurf-IV · Dec 12, 2019 · acdd151 · acdd151
1 parent caf8c5a
commit acdd151
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 726 deletions.
diff --git a/Elucidate/Elucidate Windows Installer/Elucidate.wxs b/Elucidate/Elucidate Windows Installer/Elucidate.wxs
@@ -37,16 +37,6 @@
                 <File Source="$(var.MgtSource)\Elucidate.exe.config" KeyPath="yes" />
             </Component>
 
-            <Component>
-                <File Source="$(var.MgtSource)\ActiveDirectoryObjectPicker.dll" KeyPath="yes" >
-                    <netfx:NativeImage Id="ngen.ActiveDirectoryObjectPicker" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
-                </File>
-            </Component>
-            <Component>
-                <File Source="$(var.MgtSource)\AeroWizard.dll" KeyPath="yes" >
-                    <netfx:NativeImage Id="ngen.AeroWizard" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
-                </File>
-            </Component>
             <Component>
                 <File Source="$(var.MgtSource)\AlphaFS.dll" KeyPath="yes" >
                     <netfx:NativeImage Id="ngen.AlphaFS" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
@@ -77,11 +67,6 @@
                     <netfx:NativeImage Id="ngen.Exceptionless.Windows" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
                 </File>
             </Component>
-            <Component>
-                <File Source="$(var.MgtSource)\GroupControls.dll" KeyPath="yes" >
-                    <netfx:NativeImage Id="ngen.GroupControls" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
-                </File>
-            </Component>
             <Component>
                 <File Source="$(var.MgtSource)\JCS.ToggleSwitch.dll" KeyPath="yes" >
                     <netfx:NativeImage Id="ngen.JCS.ToggleSwitch" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
@@ -103,32 +88,14 @@
                     <netfx:NativeImage Id="ngen.Toolkit" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
                 </File>
             </Component>
-            <Component>
-                <File Source="$(var.MgtSource)\Microsoft.Win32.TaskScheduler.dll" KeyPath="yes" >
-                    <netfx:NativeImage Id="ngen.Microsoft.Win32.TaskScheduler" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
-                </File>
-            </Component>
-            <Component>
-                <File Source="$(var.MgtSource)\Microsoft.Win32.TaskSchedulerEditor.dll" KeyPath="yes" >
-                    <netfx:NativeImage Id="ngen.Microsoft.Win32.TaskSchedulerEditor" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
-                </File>
-            </Component>
             <Component>
                 <File Source="$(var.MgtSource)\NLog.dll" KeyPath="yes" >
                     <netfx:NativeImage Id="ngen.NLog" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
                 </File>
             </Component>
-            <Component>
-                <File Source="$(var.MgtSource)\TimeSpan2.dll" KeyPath="yes" >
-                    <netfx:NativeImage Id="ngen.TimeSpan2" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
-                </File>
-            </Component>
 
 
             <!-- Text and help files-->
-            <Component>
-                <File Source="$(var.MgtSource)\snapraid.ps1" KeyPath="yes"/>
-            </Component>
             <Component>
                 <File Source="$(sys.SOURCEFILEDIR)GPLv2.rtf" KeyPath="yes" />
             </Component>

diff --git a/Elucidate/Elucidate/Elucidate.csproj b/Elucidate/Elucidate/Elucidate.csproj
@@ -30,7 +30,7 @@
     </AssemblyInfoVersionSettings>
     <PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
     <AssemblyInfoFilePath>Properties\AssemblyInfo.cs</AssemblyInfoFilePath>
-    <AssemblyVersion>2019.8.993.4</AssemblyVersion>
+    <AssemblyVersion>2019.12.997.12</AssemblyVersion>
     <UpdatePackageVersion>False</UpdatePackageVersion>
     <AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
     <InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
@@ -276,9 +276,6 @@
   <ItemGroup>
     <EmbeddedResource Include="snapraid.conf.example" />
     <None Include="Resources\errorprovidericon.gif" />
-    <Content Include="snapraid.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="wyDay.Controls\License.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -308,20 +305,17 @@
       <Version>4.3.2027</Version>
     </PackageReference>
     <PackageReference Include="KryptonToolkitSuite5472">
-      <Version>5.472.1251</Version>
+      <Version>5.472.2000</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.6.6</Version>
-    </PackageReference>
-    <PackageReference Include="TaskSchedulerEditor">
-      <Version>2.8.15</Version>
+      <Version>4.6.8</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UseUniversalClock="False" BuildVersion_UpdateFileVersion="False" BuildVersion_UpdateAssemblyVersion="False" BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="YearStamp.MonthStamp.DayStamp.Increment" />
+      <UserProperties BuildVersion_BuildVersioningStyle="YearStamp.MonthStamp.DayStamp.Increment" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="False" BuildVersion_UpdateFileVersion="False" BuildVersion_UseUniversalClock="False" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Elucidate/Elucidate/Forms/ElucidateForm.cs b/Elucidate/Elucidate/Forms/ElucidateForm.cs
@@ -337,7 +337,7 @@ private void tabControl_SelectedPageChanged(object sender, EventArgs e)
             }
             else if (currentTab == tabSchedulePage)
             {
-                tpSchedule.ReLoad();
+                //tpSchedule.Reset();
             }
             else if (currentTab == tabRecoverFiles)
             {

diff --git a/Elucidate/Elucidate/Properties/AssemblyInfo.cs b/Elucidate/Elucidate/Properties/AssemblyInfo.cs
@@ -58,8 +58,8 @@
 //      Build Number  - Increment
 //      Revision      - Day
 //
-[assembly: AssemblyVersion("2019.8.993.4")]
-[assembly: AssemblyFileVersion("19.8.993.4")]
+[assembly: AssemblyVersion("2019.12.997.12")]
+[assembly: AssemblyFileVersion("19.12.997.12")]
 [assembly: NeutralResourcesLanguage("en-US")]
 // TODO: Add more relevant hints here
 [assembly: Dependency("System", LoadHint.Always)]