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

1 files changed, 39 insertions, 0 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 62f2dc984..2df984c7c 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
@@ -59,6 +59,9 @@
       <HintPath>..\..\Referenced Assemblies\SMO\Microsoft.SqlServer.AzureStorageEnum.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>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
@@ -83,6 +86,9 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\PPC\Tango.PPC.Common\Publish\PublishInfo.cs">
+      <Link>Tup\PublishInfo.cs</Link>
+    </Compile>
     <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
@@ -95,6 +101,11 @@
     <Compile Include="Converters\UserRoleToVisibilityConverter.cs" />
     <Compile Include="MachineStudioTheme.cs" />
     <Compile Include="Resources\SharedResourceDictionary.cs" />
+    <Compile Include="Tup\TupFileBuilder.cs" />
+    <Compile Include="Tup\TupFileBuilderProgressEventArgs.cs" />
+    <Compile Include="Web\DownloadLatestPPCVersionRequest.cs" />
+    <Compile Include="Web\DownloadLatestPPCVersionResponse.cs" />
+    <Compile Include="Web\LoginMethod.cs" />
     <Compile Include="Web\LoginRequest.cs" />
     <Compile Include="Web\LoginResponse.cs" />
     <Compile Include="AutoComplete\MachinesProvider.cs" />
@@ -117,6 +128,22 @@
     <Compile Include="ExtensionMethods\CommonDialogExtensions.cs" />
     <Compile Include="ExtensionMethods\TangoIOCExtensions.cs" />
     <Compile Include="FirmwareUpgrade\IFirmwareUpgrader.cs" />
+    <Resource Include="Fonts\Flexo-Black.otf" />
+    <Resource Include="Fonts\Flexo-BlackIt.otf" />
+    <Resource Include="Fonts\Flexo-Bold.otf" />
+    <Resource Include="Fonts\Flexo-BoldIt.otf" />
+    <Resource Include="Fonts\Flexo-Demi.otf" />
+    <Resource Include="Fonts\Flexo-DemiIt.otf" />
+    <Resource Include="Fonts\Flexo-Heavy.otf" />
+    <Resource Include="Fonts\Flexo-HeavyIt.otf" />
+    <Resource Include="Fonts\Flexo-It.otf" />
+    <Resource Include="Fonts\Flexo-Light.otf" />
+    <Resource Include="Fonts\Flexo-LightIt.otf" />
+    <Resource Include="Fonts\Flexo-Medium.otf" />
+    <Resource Include="Fonts\Flexo-MediumIt.otf" />
+    <Resource Include="Fonts\Flexo-Regular.otf" />
+    <Resource Include="Fonts\Flexo-Thin.otf" />
+    <Resource Include="Fonts\Flexo-ThinIt.otf" />
     <None Include="Helpers\GraphsHelper.cs" />
     <Compile Include="IStudioViewModel.cs" />
     <Compile Include="MachineStudioSettings.cs" />
@@ -145,6 +172,8 @@
     <Compile Include="Web\LatestVersionResponse.cs" />
     <Compile Include="Web\MachineStudioWebClient.cs" />
     <Compile Include="Web\MachineStudioWebClientBase.cs" />
+    <Compile Include="Web\RefreshTokenRequest.cs" />
+    <Compile Include="Web\RefreshTokenResponse.cs" />
     <Compile Include="Web\UploadCompletedRequest.cs" />
     <Compile Include="Web\UploadCompletedResponse.cs" />
     <Compile Include="Web\UploadVersionRequest.cs" />
@@ -289,6 +318,10 @@
       <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project>
       <Name>Tango.SharedUI</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.SQLExaminer\Tango.SQLExaminer.csproj">
+      <Project>{e1e66ed9-597d-45fa-8048-de90a6930484}</Project>
+      <Name>Tango.SQLExaminer</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Transport\Tango.Transport.csproj">
       <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project>
       <Name>Tango.Transport</Name>
@@ -385,6 +418,12 @@
   <ItemGroup>
     <Resource Include="Images\ti-tm4c129x.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\machine_new.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\machine_new_small.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>