merge

1 files changed, 0 insertions, 45 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 a14bb4e2a..7c0851d01 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,9 +59,6 @@
       <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" />
@@ -86,9 +83,6 @@
     <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>
@@ -101,11 +95,6 @@
     <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" />
@@ -128,22 +117,6 @@
     <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" />
@@ -298,10 +271,6 @@
       <Project>{de2f2b86-025b-4f26-83a4-38bd48224ed5}</Project>
       <Name>Tango.Editors</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tango.Git\Tango.Git.csproj">
-      <Project>{99081c0e-065c-4d68-bf60-f82330cca02d}</Project>
-      <Name>Tango.Git</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Integration\Tango.Integration.csproj">
       <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
       <Name>Tango.Integration</Name>
@@ -322,10 +291,6 @@
       <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>
@@ -422,20 +387,10 @@
   <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>
       <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
 </Project>
\ No newline at end of file