aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.UI
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-09-01 17:46:47 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-09-01 17:46:47 +0300
commit565afd35baab8b2846ebc80a6802a375b3fd876e (patch)
treefa478fa30e6b4bed5b629ef307d35e743bacf0d5 /Software/Visual_Studio/PPC/Tango.PPC.UI
parentb3ffc4c7ba0b7f9bb34c878ae186d380ac41a07f (diff)
downloadTango-565afd35baab8b2846ebc80a6802a375b3fd876e.tar.gz
Tango-565afd35baab8b2846ebc80a6802a375b3fd876e.zip
Added bug reporting module to PPC !!
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/App.config10
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bug.pngbin0 -> 5276 bytes
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs2
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj9
4 files changed, 16 insertions, 5 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
index 9d2de4c50..77255b814 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
@@ -10,8 +10,14 @@
<runtime>
<legacyCorruptedStateExceptionsPolicy enabled="true|false"/>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-
-
+ <!--<dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+ </dependentAssembly>-->
</assemblyBinding>
</runtime>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bug.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bug.png
new file mode 100644
index 000000000..ed4b8e6e6
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/bug.png
Binary files differ
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 0e1ff1d2b..6a9e42ce5 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -225,7 +225,7 @@ namespace Tango.PPC.UI.PPCApplication
ObservablesStaticCollections.Instance.Initialize();
LogManager.Log("Loading machine from database...");
_machineContext = ObservablesContext.CreateDefault();
- _machine = new MachineBuilder(_machineContext).SetFirst().WithSettings().WithOrganization().WithConfiguration().WithSpools().WithCats().Build();
+ _machine = new MachineBuilder(_machineContext).SetFirst().WithVersion().WithSettings().WithOrganization().WithConfiguration().WithSpools().WithCats().Build();
}
initialized = true;
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index c2025b733..ff1ffa040 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -12,7 +12,7 @@
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
- <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+ <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<IsWebBootstrapper>false</IsWebBootstrapper>
@@ -320,6 +320,7 @@
<Resource Include="Images\GlobalStatus\shutdown_icon_Anim.gif" />
<Resource Include="Images\GlobalStatus\standby_Anim.gif" />
<Resource Include="Images\cartridge_validation.png" />
+ <Resource Include="Images\bug.png" />
<Content Include="Manifests\release.xml" />
<Content Include="Manifests\debug.xml" />
<None Include="packages.config" />
@@ -404,6 +405,10 @@
<Project>{6aa425c9-ea6a-4b01-aaed-5ff122e8b663}</Project>
<Name>Tango.WiFi</Name>
</ProjectReference>
+ <ProjectReference Include="..\Modules\Tango.PPC.BugReporting\Tango.PPC.BugReporting.csproj">
+ <Project>{8146fa0a-0725-4a1a-82e6-696c58f33a2b}</Project>
+ <Name>Tango.PPC.BugReporting</Name>
+ </ProjectReference>
<ProjectReference Include="..\Modules\Tango.PPC.Events\Tango.PPC.Events.csproj">
<Project>{a8077b3e-8dd6-4572-8ec4-a27bdc91b70a}</Project>
<Name>Tango.PPC.Events</Name>
@@ -555,7 +560,7 @@ del "$(TargetDir)firmware_package.tfp"</PostBuildEvent>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
- <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+ <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>
</Project> \ No newline at end of file