merge conflicts

1 files changed, 15 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 1be69bf1c..b3926190f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -142,6 +142,7 @@
       <DependentUpon>ConsoleWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Console\ConsoleWindowVM.cs" />
+    <Compile Include="FirmwareUpgrade\DefaultFirmwareUpgrader.cs" />
     <Compile Include="Html\DefaultHtmlPresenter.cs" />
     <Compile Include="Html\HtmlWindow.xaml.cs">
       <DependentUpon>HtmlWindow.xaml</DependentUpon>
@@ -172,6 +173,7 @@
     <Compile Include="ViewModels\AboutViewVM.cs" />
     <Compile Include="ViewModels\ConnectedMachineViewVM.cs" />
     <Compile Include="ViewModels\ConnectionLostViewVM.cs" />
+    <Compile Include="ViewModels\FirmwareUpgradeViewVM.cs" />
     <Compile Include="ViewModels\LoadingViewVM.cs" />
     <Compile Include="ViewModels\LoginViewVM.cs" />
     <Compile Include="ViewModels\MachineConnectionViewVM.cs" />
@@ -193,6 +195,9 @@
     <Compile Include="Views\ConnectionLostView.xaml.cs">
       <DependentUpon>ConnectionLostView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\FirmwareUpgradeView.xaml.cs">
+      <DependentUpon>FirmwareUpgradeView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\LoadingView.xaml.cs">
       <DependentUpon>LoadingView.xaml</DependentUpon>
     </Compile>
@@ -277,6 +282,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\FirmwareUpgradeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\LoadingView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -449,6 +458,10 @@
       <Project>{8a65ad6a-a9b4-48c0-9301-4b7434b712f8}</Project>
       <Name>Tango.MachineStudio.Statistics</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.MachineStudio.Storage\Tango.MachineStudio.Storage.csproj">
+      <Project>{5991f6b5-ea4e-41e9-a4f6-7d3a50010fd6}</Project>
+      <Name>Tango.MachineStudio.Storage</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.MachineStudio.Stubs\Tango.MachineStudio.Stubs.csproj">
       <Project>{22c2aa72-9493-4d0d-b421-8ef9789fb192}</Project>
       <Name>Tango.MachineStudio.Stubs</Name>
@@ -501,6 +514,7 @@
     <Resource Include="Images\settings.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Images\firmware_upgrade.png" />
     <Resource Include="Images\external-bridge-emulator.png" />
     <EmbeddedResource Include="..\..\Versioning\ChangeLog.txt">
       <Link>ChangeLog.txt</Link>
@@ -595,7 +609,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
+      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file