merge

1 files changed, 3 insertions, 138 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
index 9d39c96d9..d130a8002 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
@@ -72,10 +72,6 @@
     <Reference Include="Microsoft.Azure.Common.NetFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.SqlServer.AzureStorageEnum, Version=14.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.WindowsAPICodePack-Core.1.1.0.0\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -124,15 +120,7 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ApplicationStates.cs" />
-    <Compile Include="BackupRestore\BackupMode.cs" />
-    <Compile Include="BackupRestore\BackupRestoreProgressEventArgs.cs" />
-    <Compile Include="BackupRestore\BackupFile.cs" />
-    <Compile Include="BackupRestore\BackupSettings.cs" />
-    <Compile Include="BackupRestore\BackupRestoreStage.cs" />
-    <Compile Include="BackupRestore\DefaultBackupManager.cs" />
-    <Compile Include="BackupRestore\IBackupManager.cs" />
-    <Compile Include="BackupRestore\RestoreResult.cs" />
-    <Compile Include="BackupRestore\RestoreSettings.cs" />
+    <Compile Include="Backup\IBackupManager.cs" />
     <Compile Include="Connection\DefaultMachineProvider.cs" />
     <Compile Include="Connection\IMachineProvider.cs" />
     <Compile Include="Connection\MachineOperatorChangedEventArgs.cs" />
@@ -143,66 +131,23 @@
     <Compile Include="Connectivity\WiFiAuthentication.cs" />
     <Compile Include="Connectivity\WiFiNetwork.cs" />
     <Compile Include="Connectivity\IConnectivityProvider.cs" />
-    <Compile Include="Console\DefaultConsoleEngineService.cs" />
-    <Compile Include="Console\IConsoleEngineService.cs" />
     <Compile Include="Controls\AsyncAdornerControl.cs" />
-    <Compile Include="Controls\ImageGalleryControl.cs" />
     <Compile Include="Controls\TwineCatalogControl.xaml.cs">
       <DependentUpon>TwineCatalogControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\TwineCatalogRenderer.cs" />
     <Compile Include="Converters\HeightToOpacityConverter.cs" />
-    <Compile Include="DataStore\DefaultDataStoreService.cs" />
-    <Compile Include="DataStore\IDataStoreService.cs" />
     <Compile Include="ExtensionMethods\IListExtensions.cs" />
     <Compile Include="ExtensionMethods\ObservableCollectionExtensions.cs" />
     <Compile Include="ExternalBridge\IPPCExternalBridgeService.cs" />
     <Compile Include="ExternalBridge\PPCExternalBridgeService.cs" />
-    <Compile Include="FileSystem\DefaultFileSystemService.cs" />
-    <Compile Include="FileSystem\FileSystemOperation.cs" />
-    <Compile Include="FileSystem\FileSystemOperationMode.cs" />
-    <Compile Include="FileSystem\IFileSystemService.cs" />
-    <Compile Include="Helpers\KeyboardHelper.cs" />
-    <Compile Include="Helpers\LogsHelper.cs" />
     <Compile Include="HotSpot\DefaultHotSpotProvider.cs" />
     <Compile Include="HotSpot\IHotSpotProvider.cs" />
-    <Compile Include="Insights\DefaultInsightsService.cs" />
-    <Compile Include="Insights\IInsightsService.cs" />
     <Compile Include="IPPCView.cs" />
-    <Compile Include="IPPCService.cs" />
     <Compile Include="MachineSetup\IMachineSetupManager.cs" />
     <Compile Include="MachineSetup\MachineSetupManager.cs" />
     <Compile Include="MachineSetup\MachineSetupProgress.cs" />
     <Compile Include="MachineSetup\MachineSetupResult.cs" />
-    <Compile Include="Notifications\AppBarPriority.cs" />
-    <Compile Include="Performance\DefaultPerformanceService.cs" />
-    <Compile Include="Performance\IPerformanceService.cs" />
-    <Compile Include="RemoteDesktop\DefaultRemoteDesktopService.cs" />
-    <Compile Include="RemoteDesktop\IRemoteDesktopService.cs" />
-    <Compile Include="RemoteDesktop\RemoteDesktopClient.cs" />
-    <Compile Include="RemoteJob\DefaultRemoteJobService.cs" />
-    <Compile Include="RemoteJob\IRemoteJobService.cs" />
-    <Compile Include="RemoteActions\IRemoteActionsService.cs" />
-    <Compile Include="SQL\DefaultRemoteSqlService.cs" />
-    <Compile Include="SQL\IRemoteSqlService.cs" />
-    <Compile Include="Synchronization\DefaultMachineDataSynchronizer.cs" />
-    <Compile Include="Synchronization\IMachineDataSynchronizer.cs" />
-    <Compile Include="Synchronization\SynchronizationEndedEventArgs.cs" />
-    <Compile Include="Synchronization\SynchronizationState.cs" />
-    <Compile Include="Synchronization\SynchronizationStatus.cs" />
-    <Compile Include="Synchronization\SynchronizationStatusChangedEventArgs.cs" />
-    <Compile Include="SystemInfo\DefaultSystemInfoService.cs" />
-    <Compile Include="SystemInfo\ISystemInfoService.cs" />
-    <Compile Include="ThreadLoading\IThreadLoadingService.cs" />
-    <Compile Include="UpdatePackages\DefaultPackageRunner.cs" />
-    <Compile Include="UpdatePackages\IPackageRunner.cs" />
-    <Compile Include="UpdatePackages\IPPCPackage.cs" />
-    <Compile Include="UpdatePackages\PackageContext.cs" />
-    <Compile Include="UpdatePackages\PackageProgressEventArgs.cs" />
-    <Compile Include="UpdatePackages\PackageRunnerResult.cs" />
-    <Compile Include="UpdatePackages\PackageStateChangedEventArgs.cs" />
-    <Compile Include="UpdatePackages\PackagesFile.cs" />
-    <Compile Include="UpdatePackages\PPCPackageAttribute.cs" />
     <Compile Include="Publish\PPCPublisher.cs" />
     <Compile Include="Publish\PublishInfo.cs" />
     <Compile Include="Publish\PublishOptions.cs" />
@@ -213,16 +158,12 @@
     <Compile Include="Web\CheckForUpdateRequest.cs" />
     <Compile Include="Web\CheckForUpdateResponse.cs" />
     <Compile Include="MachineUpdate\DbCompareResult.cs" />
-    <Compile Include="Web\NotifyMachineDataDownloadCompletedResponse.cs" />
-    <Compile Include="Web\NotifyMachineDataDownloadCompletedRequest.cs" />
     <Compile Include="Web\DownloadUpdateRequest.cs" />
-    <Compile Include="Web\MachineUpdateCompletedResponse.cs" />
     <Compile Include="Web\DownloadUpdateResponse.cs" />
     <Compile Include="MachineUpdate\IMachineUpdateManager.cs" />
     <Compile Include="Web\LoginMode.cs" />
     <Compile Include="Web\LoginRequest.cs" />
     <Compile Include="Web\LoginResponse.cs" />
-    <Compile Include="Web\MachineUpdateCompletedRequest.cs" />
     <Compile Include="Web\MachineSetupRequest.cs" />
     <Compile Include="Web\MachineSetupResponse.cs" />
     <Compile Include="MachineUpdate\MachineUpdateProgress.cs" />
@@ -230,9 +171,9 @@
     <Compile Include="MachineUpdate\MachineUpdateResult.cs" />
     <Compile Include="Web\PPCWebClient.cs" />
     <Compile Include="Web\PPCWebClientBase.cs" />
-    <Compile Include="Web\SynchronizationFailedEntity.cs" />
     <Compile Include="Web\UpdateDBRequest.cs" />
     <Compile Include="Web\UpdateDBResponse.cs" />
+    <Compile Include="MachineUpdate\UpdatePackageFile.cs" />
     <Compile Include="Messages\JobRemovedMessage.cs" />
     <Compile Include="Messages\JobSavedMessage.cs" />
     <Compile Include="Messages\MachineSettingsSavedMessage.cs" />
@@ -264,13 +205,8 @@
     <Compile Include="Web\MachineVersionsResponse.cs" />
     <Compile Include="Web\LatestVersionRequest.cs" />
     <Compile Include="Web\LatestVersionResponse.cs" />
-    <Compile Include="Web\UpdatedEntity.cs" />
-    <Compile Include="Web\DownloadMachineDataRequest.cs" />
-    <Compile Include="Web\DownloadMachineDataResponse.cs" />
-    <Compile Include="Web\UploadMachineDataResponse.cs" />
     <Compile Include="Web\UploadCompletedResponse.cs" />
     <Compile Include="Web\UploadCompletedRequest.cs" />
-    <Compile Include="Web\UploadMachineDataRequest.cs" />
     <Compile Include="Web\UploadVersionRequest.cs" />
     <Compile Include="Web\UploadVersionResponse.cs" />
     <Compile Include="UWF\DefaultUnifiedWriteFilterManager.cs" />
@@ -281,10 +217,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\ImageGalleryControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Controls\MultiPieChart.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -361,29 +293,8 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <EmbeddedResource Include="SafetyLevelOperations.csv" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\DataStore\Tango.DataStore.Editing\Tango.DataStore.Editing.csproj">
-      <Project>{ee088ff7-04d1-41fb-9d6a-cedeee7a7b9c}</Project>
-      <Name>Tango.DataStore.Editing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DataStore\Tango.DataStore.EF\Tango.DataStore.EF.csproj">
-      <Project>{88d9906b-8fc4-4fe0-b7eb-127a0a8fcee4}</Project>
-      <Name>Tango.DataStore.EF</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DataStore\Tango.DataStore.LiteDB\Tango.DataStore.Lite.csproj">
-      <Project>{fa96bc0c-4055-475c-9dcc-70a5a9436b10}</Project>
-      <Name>Tango.DataStore.Lite</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DataStore\Tango.DataStore.Remote\Tango.DataStore.Remote.csproj">
-      <Project>{29448f3c-9b3e-4da6-8555-46a8b9a6b3aa}</Project>
-      <Name>Tango.DataStore.Remote</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DataStore\Tango.DataStore\Tango.DataStore.csproj">
-      <Project>{e0364dfa-0721-4637-9d32-9d22aac109d6}</Project>
-      <Name>Tango.DataStore</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Tango.AdvancedInstaller\Tango.AdvancedInstaller.csproj">
       <Project>{c5df1816-34e5-4700-824c-29623a1baa22}</Project>
       <Name>Tango.AdvancedInstaller</Name>
@@ -396,18 +307,10 @@
       <Project>{b4fe6485-4161-4b36-bc08-67e0b53d01b7}</Project>
       <Name>Tango.ColorConversion</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tango.Console\Tango.Console.csproj">
-      <Project>{199e8359-cad3-433d-9eed-2027652b24a4}</Project>
-      <Name>Tango.Console</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Core\Tango.Core.csproj">
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tango.CSV\Tango.CSV.csproj">
-      <Project>{58e8825f-0c96-449c-b320-1e82b0aa876b}</Project>
-      <Name>Tango.CSV</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Emulations\Tango.Emulations.csproj">
       <Project>{63561e19-ff5a-414b-a5ef-e30711543e1d}</Project>
       <Name>Tango.Emulations</Name>
@@ -416,18 +319,6 @@
       <Project>{4399AF76-DB52-4CFB-8020-6F85BDB29FD5}</Project>
       <Name>Tango.Explorer</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tango.FileSystem\Tango.FileSystem.csproj">
-      <Project>{c6ebbbbe-2123-44dc-aef7-a0d47d736ac0}</Project>
-      <Name>Tango.FileSystem</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Tango.Git\Tango.Git.csproj">
-      <Project>{99081c0e-065c-4d68-bf60-f82330cca02d}</Project>
-      <Name>Tango.Git</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Tango.Insights\Tango.Insights.csproj">
-      <Project>{4a55c185-3f8d-41b0-8815-c15f6213a14a}</Project>
-      <Name>Tango.Insights</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Integration\Tango.Integration.csproj">
       <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
       <Name>Tango.Integration</Name>
@@ -440,10 +331,6 @@
       <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project>
       <Name>Tango.PMR</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tango.RemoteDesktop\Tango.RemoteDesktop.csproj">
-      <Project>{a78068d4-2061-4376-8ede-583d8d880dec}</Project>
-      <Name>Tango.RemoteDesktop</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Settings\Tango.Settings.csproj">
       <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
       <Name>Tango.Settings</Name>
@@ -456,10 +343,6 @@
       <Project>{e1e66ed9-597d-45fa-8048-de90a6930484}</Project>
       <Name>Tango.SQLExaminer</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tango.SystemInfo\Tango.SystemInfo.csproj">
-      <Project>{997a961c-beda-4b56-aa0f-c39e532f7ffa}</Project>
-      <Name>Tango.SystemInfo</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Touch\Tango.Touch.csproj">
       <Project>{fd86424c-6e84-491b-8df9-3d0f5c236a2a}</Project>
       <Name>Tango.Touch</Name>
@@ -468,10 +351,6 @@
       <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project>
       <Name>Tango.Transport</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tango.WebRTC\Tango.WebRTC.csproj">
-      <Project>{09f81a12-0f77-4336-854d-9e0a74a17f9e}</Project>
-      <Name>Tango.WebRTC</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Web\Tango.Web.csproj">
       <Project>{5001990f-977b-48ff-b217-0236a5022ad8}</Project>
       <Name>Tango.Web</Name>
@@ -480,10 +359,6 @@
       <Project>{6aa425c9-ea6a-4b01-aaed-5ff122e8b663}</Project>
       <Name>Tango.WiFi</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tango.PPC.Shared\Tango.PPC.Shared.csproj">
-      <Project>{208c8bd8-72c6-4e3c-acaa-351091a2acc7}</Project>
-      <Name>Tango.PPC.Shared</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.6">
@@ -500,16 +375,6 @@
   <ItemGroup>
     <Folder Include="Scripting\" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\finger3.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\tap.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\cl-full.png" />
-    <Resource Include="Images\lubricant2.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -520,7 +385,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file