Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 28 insertions, 16 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index aff4c056c..48c78e865 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -31,6 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
+    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
@@ -40,6 +43,9 @@
     <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
+    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
+    </Reference>
     <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
     </Reference>
@@ -49,6 +55,8 @@
     <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.SqlServer.AzureStorageEnum, Version=14.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
@@ -76,8 +84,8 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Authentication\AuthenticationLoginResult.cs" />
-    <Compile Include="Authentication\LoginRequest.cs" />
-    <Compile Include="Authentication\LoginResponse.cs" />
+    <Compile Include="Web\LoginRequest.cs" />
+    <Compile Include="Web\LoginResponse.cs" />
     <Compile Include="AutoComplete\MachinesProvider.cs" />
     <Compile Include="Automation\Developer.cs" />
     <Compile Include="Automation\UI.cs" />
@@ -110,6 +118,9 @@
     <Compile Include="Navigation\INavigationObjectReceiver.cs" />
     <Compile Include="Navigation\INavigationResultProvider.cs" />
     <Compile Include="Notifications\BarItem.cs" />
+    <Compile Include="Publish\MachineStudioPublisher.cs" />
+    <Compile Include="Publish\PublishOptions.cs" />
+    <Compile Include="Publish\PublishProgressEventArgs.cs" />
     <Compile Include="Speech\DefaultSpeechProvider.cs" />
     <Compile Include="Speech\ISpeechProvider.cs" />
     <Compile Include="StudioApplication\IStudioApplicationManager.cs" />
@@ -119,19 +130,18 @@
     <Compile Include="StudioModuleBase.cs" />
     <Compile Include="StudioViewModel.cs" />
     <Compile Include="Threading\IDispatcherProvider.cs" />
-    <Compile Include="Update\DownloadLatestVersionResponse.cs" />
-    <Compile Include="Update\DownloadLatestVersionRequest.cs" />
-    <Compile Include="Update\CheckForUpdatesResponse.cs" />
-    <Compile Include="Update\CheckForUpdatesRequest.cs" />
-    <Compile Include="Update\IMachineStudioUpdateService.cs" />
-    <Compile Include="Update\LatestVersionRequest.cs" />
-    <Compile Include="Update\LatestVersionResponse.cs" />
-    <Compile Include="Update\MachineStudioUpdateService.cs" />
-    <None Include="Update\UpdateServiceHelper.cs" />
-    <Compile Include="Update\UploadCompletedRequest.cs" />
-    <Compile Include="Update\UploadCompletedResponse.cs" />
-    <Compile Include="Update\UploadVersionRequest.cs" />
-    <Compile Include="Update\UploadVersionResponse.cs" />
+    <Compile Include="Web\DownloadLatestVersionResponse.cs" />
+    <Compile Include="Web\DownloadLatestVersionRequest.cs" />
+    <Compile Include="Web\CheckForUpdatesResponse.cs" />
+    <Compile Include="Web\CheckForUpdatesRequest.cs" />
+    <Compile Include="Web\LatestVersionRequest.cs" />
+    <Compile Include="Web\LatestVersionResponse.cs" />
+    <Compile Include="Web\MachineStudioWebClient.cs" />
+    <Compile Include="Web\MachineStudioWebClientBase.cs" />
+    <Compile Include="Web\UploadCompletedRequest.cs" />
+    <Compile Include="Web\UploadCompletedResponse.cs" />
+    <Compile Include="Web\UploadVersionRequest.cs" />
+    <Compile Include="Web\UploadVersionResponse.cs" />
     <Compile Include="ValidationRules\Required.cs" />
     <Compile Include="Video\DefaultVideoCaptureProvider.cs" />
     <Compile Include="Video\IVideoCaptureProvider.cs" />
@@ -195,7 +205,9 @@
     </EmbeddedResource>
     <None Include="app.config" />
     <Resource Include="Fonts\digital-7.ttf" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>