Version 3.0.1 intial commit

Ken98045 · Jan 14, 2022 · 9c01c07 · 9c01c07
1 parent 51b5e57
commit 9c01c07
Show file tree

Hide file tree

Showing 198 changed files with 34,288 additions and 7,238 deletions.
diff --git a/DBNewMotionFrames.ldf b/DBNewMotionFrames.ldf
diff --git a/Form1.Designer.cs b/Form1.Designer.cs
diff --git a/Form1.cs b/Form1.cs
diff --git a/OnGuardCore.csproj b/OnGuardCore.csproj
@@ -3,29 +3,68 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
 	<DisableWinExeOutputInference>true</DisableWinExeOutputInference>	
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <Version>2.0.1</Version>
+    <Version>3.0.1</Version>
     <AssemblyName>OnGuard</AssemblyName>
     <Platforms>AnyCPU;x64</Platforms>
     <Configurations>Debug;Release;xsx</Configurations>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <AssemblyVersion>2.1.0.0</AssemblyVersion>
-    <FileVersion>2.1.0.0</FileVersion>
+    <AssemblyVersion>3.0.0.0</AssemblyVersion>
+    <FileVersion>3.0.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Remove="AISettings.cs" />
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="Resources\HelpFiles\AddCameraHelp.rtf" />
+    <None Remove="Resources\HelpFiles\CameraAddressHelp.rtf" />
+    <None Remove="Resources\HelpFiles\CameraTriggeredHelp.rtf" />
+    <None Remove="Resources\HelpFiles\DataFilesHelp.rtf" />
+    <None Remove="Resources\HelpFiles\FolderPrefixHelp.rtf" />
+    <None Remove="Resources\HelpFiles\ISpySnapshotHelp.rtf" />
+    <None Remove="Resources\HelpFiles\MMSHelperHelp.rtf" />
+    <None Remove="Resources\HelpFiles\OnGuardCaptureHelp.rtf" />
+    <None Remove="Resources\HelpFiles\OnGuardMonitorHelp.rtf" />
+    <None Remove="Resources\HelpFiles\ONVIFSnapshotHelp.rtf" />
+    <None Remove="Resources\HelpFiles\PresetsHelp.rtf" />
+    <None Remove="Resources\HelpFiles\PTZHelp.rtf" />
+    <None Remove="Resources\HelpFiles\PTZMovementHelp.rtf" />
+    <None Remove="Resources\HelpFiles\SnapshotMethodHelp.rtf" />
+    <None Remove="Resources\HelpFiles\SnapshotResolutionHelp.rtf" />
+    <None Remove="Resources\HelpFiles\SQLConnectionHelp.rtf" />
+    <None Remove="Resources\OnGuard.jpg" />
     <None Remove="Src\Resources\Samples\Street1.jpg" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.9.45-alpha" />
-    <PackageReference Include="MQTTnet" Version="3.0.14" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+    <EmbeddedResource Include="Resources\HelpFiles\AddCameraHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\CameraAddressHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\CameraTriggeredHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\DataFilesHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\FolderPrefixHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\ISpySnapshotHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\MMSHelperHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\OnGuardCaptureHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\OnGuardMonitorHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\ONVIFSnapshotHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\PresetsHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\PTZHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\PTZMovementHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\SnapshotMethodHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\SnapshotResolutionHelp.rtf" />
+    <EmbeddedResource Include="Resources\HelpFiles\SQLConnectionHelp.rtf" />
+    <EmbeddedResource Include="Resources\OnGuard.jpg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.0.63" />
+    <PackageReference Include="Mictlanix.DotNet.OnvifClient" Version="0.0.3" />
+    <PackageReference Include="MQTTnet" Version="3.0.16" />
+    <PackageReference Include="SolarCalculator" Version="3.0.6" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
   </ItemGroup>
 
   <ItemGroup>
@@ -71,6 +110,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="DBNewMotionFrames.mdf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="DBNewMotionFrames_log.ldf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Src\Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

diff --git a/OnGuardCore.sln b/OnGuardCore.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OnGuardCore", "OnGuardCore.csproj", "{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{A9FF5A82-23D4-4644-BF80-AD7E82CF40A9}"
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{006F4EC1-F5CF-4442-B9D2-807F48303511}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,21 +15,20 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Debug|Any CPU.Build.0 = Debug|x64
 		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Debug|x64.ActiveCfg = Debug|x64
 		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Debug|x64.Build.0 = Debug|x64
-		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Release|Any CPU.ActiveCfg = Release|x64
+		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Release|Any CPU.Build.0 = Release|x64
 		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Release|x64.ActiveCfg = Release|x64
 		{927CF148-F6BB-41EC-BB98-BF61D8CADBF3}.Release|x64.Build.0 = Release|x64
-		{A9FF5A82-23D4-4644-BF80-AD7E82CF40A9}.Debug|Any CPU.ActiveCfg = Debug
-		{A9FF5A82-23D4-4644-BF80-AD7E82CF40A9}.Debug|x64.ActiveCfg = Debug
-		{A9FF5A82-23D4-4644-BF80-AD7E82CF40A9}.Debug|x64.Build.0 = Debug
-		{A9FF5A82-23D4-4644-BF80-AD7E82CF40A9}.Release|Any CPU.ActiveCfg = Release
-		{A9FF5A82-23D4-4644-BF80-AD7E82CF40A9}.Release|Any CPU.Build.0 = Release
-		{A9FF5A82-23D4-4644-BF80-AD7E82CF40A9}.Release|x64.ActiveCfg = Release
-		{A9FF5A82-23D4-4644-BF80-AD7E82CF40A9}.Release|x64.Build.0 = Release
+		{006F4EC1-F5CF-4442-B9D2-807F48303511}.Debug|Any CPU.ActiveCfg = Release
+		{006F4EC1-F5CF-4442-B9D2-807F48303511}.Debug|x64.ActiveCfg = Debug
+		{006F4EC1-F5CF-4442-B9D2-807F48303511}.Release|Any CPU.ActiveCfg = Release
+		{006F4EC1-F5CF-4442-B9D2-807F48303511}.Release|Any CPU.Build.0 = Release
+		{006F4EC1-F5CF-4442-B9D2-807F48303511}.Release|x64.ActiveCfg = Release
+		{006F4EC1-F5CF-4442-B9D2-807F48303511}.Release|x64.Build.0 = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE