Skip to content

Commit acdd151

Browse files
committed
- #68: Remove the Scheduler 3rd party controls
- Fix fallout from removal - Up the version of Krypton and NLog - Update Readme.md - Reissue installer
1 parent caf8c5a commit acdd151

9 files changed

Lines changed: 52 additions & 726 deletions

File tree

Elucidate/Elucidate Windows Installer/Elucidate.wxs

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,6 @@
3737
<File Source="$(var.MgtSource)\Elucidate.exe.config" KeyPath="yes" />
3838
</Component>
3939

40-
<Component>
41-
<File Source="$(var.MgtSource)\ActiveDirectoryObjectPicker.dll" KeyPath="yes" >
42-
<netfx:NativeImage Id="ngen.ActiveDirectoryObjectPicker" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
43-
</File>
44-
</Component>
45-
<Component>
46-
<File Source="$(var.MgtSource)\AeroWizard.dll" KeyPath="yes" >
47-
<netfx:NativeImage Id="ngen.AeroWizard" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
48-
</File>
49-
</Component>
5040
<Component>
5141
<File Source="$(var.MgtSource)\AlphaFS.dll" KeyPath="yes" >
5242
<netfx:NativeImage Id="ngen.AlphaFS" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
@@ -77,11 +67,6 @@
7767
<netfx:NativeImage Id="ngen.Exceptionless.Windows" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
7868
</File>
7969
</Component>
80-
<Component>
81-
<File Source="$(var.MgtSource)\GroupControls.dll" KeyPath="yes" >
82-
<netfx:NativeImage Id="ngen.GroupControls" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
83-
</File>
84-
</Component>
8570
<Component>
8671
<File Source="$(var.MgtSource)\JCS.ToggleSwitch.dll" KeyPath="yes" >
8772
<netfx:NativeImage Id="ngen.JCS.ToggleSwitch" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
@@ -103,32 +88,14 @@
10388
<netfx:NativeImage Id="ngen.Toolkit" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
10489
</File>
10590
</Component>
106-
<Component>
107-
<File Source="$(var.MgtSource)\Microsoft.Win32.TaskScheduler.dll" KeyPath="yes" >
108-
<netfx:NativeImage Id="ngen.Microsoft.Win32.TaskScheduler" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
109-
</File>
110-
</Component>
111-
<Component>
112-
<File Source="$(var.MgtSource)\Microsoft.Win32.TaskSchedulerEditor.dll" KeyPath="yes" >
113-
<netfx:NativeImage Id="ngen.Microsoft.Win32.TaskSchedulerEditor" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
114-
</File>
115-
</Component>
11691
<Component>
11792
<File Source="$(var.MgtSource)\NLog.dll" KeyPath="yes" >
11893
<netfx:NativeImage Id="ngen.NLog" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
11994
</File>
12095
</Component>
121-
<Component>
122-
<File Source="$(var.MgtSource)\TimeSpan2.dll" KeyPath="yes" >
123-
<netfx:NativeImage Id="ngen.TimeSpan2" Platform="all" Priority="2" AppBaseDirectory="ClientDIR" />
124-
</File>
125-
</Component>
12696

12797

12898
<!-- Text and help files-->
129-
<Component>
130-
<File Source="$(var.MgtSource)\snapraid.ps1" KeyPath="yes"/>
131-
</Component>
13299
<Component>
133100
<File Source="$(sys.SOURCEFILEDIR)GPLv2.rtf" KeyPath="yes" />
134101
</Component>

Elucidate/Elucidate/Elucidate.csproj

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</AssemblyInfoVersionSettings>
3131
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
3232
<AssemblyInfoFilePath>Properties\AssemblyInfo.cs</AssemblyInfoFilePath>
33-
<AssemblyVersion>2019.8.993.4</AssemblyVersion>
33+
<AssemblyVersion>2019.12.997.12</AssemblyVersion>
3434
<UpdatePackageVersion>False</UpdatePackageVersion>
3535
<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
3636
<InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
@@ -276,9 +276,6 @@
276276
<ItemGroup>
277277
<EmbeddedResource Include="snapraid.conf.example" />
278278
<None Include="Resources\errorprovidericon.gif" />
279-
<Content Include="snapraid.ps1">
280-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
281-
</Content>
282279
<Content Include="wyDay.Controls\License.txt">
283280
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
284281
</Content>
@@ -308,20 +305,17 @@
308305
<Version>4.3.2027</Version>
309306
</PackageReference>
310307
<PackageReference Include="KryptonToolkitSuite5472">
311-
<Version>5.472.1251</Version>
308+
<Version>5.472.2000</Version>
312309
</PackageReference>
313310
<PackageReference Include="NLog">
314-
<Version>4.6.6</Version>
315-
</PackageReference>
316-
<PackageReference Include="TaskSchedulerEditor">
317-
<Version>2.8.15</Version>
311+
<Version>4.6.8</Version>
318312
</PackageReference>
319313
</ItemGroup>
320314
<ItemGroup />
321315
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
322316
<ProjectExtensions>
323317
<VisualStudio>
324-
<UserProperties BuildVersion_UseUniversalClock="False" BuildVersion_UpdateFileVersion="False" BuildVersion_UpdateAssemblyVersion="False" BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="YearStamp.MonthStamp.DayStamp.Increment" />
318+
<UserProperties BuildVersion_BuildVersioningStyle="YearStamp.MonthStamp.DayStamp.Increment" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="False" BuildVersion_UpdateFileVersion="False" BuildVersion_UseUniversalClock="False" />
325319
</VisualStudio>
326320
</ProjectExtensions>
327321
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Elucidate/Elucidate/Forms/ElucidateForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ private void tabControl_SelectedPageChanged(object sender, EventArgs e)
337337
}
338338
else if (currentTab == tabSchedulePage)
339339
{
340-
tpSchedule.ReLoad();
340+
//tpSchedule.Reset();
341341
}
342342
else if (currentTab == tabRecoverFiles)
343343
{

Elucidate/Elucidate/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
// Build Number - Increment
5959
// Revision - Day
6060
//
61-
[assembly: AssemblyVersion("2019.8.993.4")]
62-
[assembly: AssemblyFileVersion("19.8.993.4")]
61+
[assembly: AssemblyVersion("2019.12.997.12")]
62+
[assembly: AssemblyFileVersion("19.12.997.12")]
6363
[assembly: NeutralResourcesLanguage("en-US")]
6464
// TODO: Add more relevant hints here
6565
[assembly: Dependency("System", LoadHint.Always)]

0 commit comments

Comments
 (0)