PPC v1.0.32

6 files changed, 14 insertions, 11 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
index a603ff06b..6d87e9201 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index 05d049030..26f72c858 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{6CF7598D-2B19-4D6D-8214-10AE49249A82} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{23DEE54E-EF9B-451F-B567-864CD9F3CD33} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.0.32.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.0.33.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -273,6 +273,7 @@
     <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" FileName="MICROS~9.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" SelfReg="false" NextFile="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml"/>
     <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml" Component_="CommandLine.xml" FileName="MICROS~4.XML|Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml" SelfReg="false" NextFile="Microsoft.IdentityModel.Clients.ActiveDirectory.xml"/>
     <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" FileName="MICROS~8.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" SelfReg="false" NextFile="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
+    <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.pdb" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" FileName="MICROS~1.PDB|Microsoft.IdentityModel.Clients.ActiveDirectory.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.pdb" SelfReg="false"/>
     <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.xml" Component_="CommandLine.xml" FileName="MICROS~5.XML|Microsoft.IdentityModel.Clients.ActiveDirectory.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.xml" SelfReg="false" NextFile="Microsoft.ServiceBus.dll"/>
     <ROW File="Microsoft.ServiceBus.dll" Component_="Microsoft.ServiceBus.dll" FileName="MICRO~10.DLL|Microsoft.ServiceBus.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.ServiceBus.dll" SelfReg="false" NextFile="Microsoft.ServiceBus.xml"/>
     <ROW File="Microsoft.ServiceBus.xml" Component_="CommandLine.xml" FileName="MICROS~6.XML|Microsoft.ServiceBus.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.ServiceBus.xml" SelfReg="false" NextFile="Microsoft.SqlServer.AzureStorageEnum.dll"/>
@@ -488,7 +489,7 @@
     <ROW File="UpdateMachine.xml" Component_="OverrideData.xml" FileName="UPDATE~1.XML|UpdateMachine.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\Configurations\UpdateMachine.xml" SelfReg="false" NextFile="UpdateTwineDB.xml"/>
     <ROW File="UpdateTwineDB.xml" Component_="OverrideData.xml" FileName="UPDATE~2.XML|UpdateTwineDB.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\Configurations\UpdateTwineDB.xml" SelfReg="false" NextFile="Interop.MSDASC.dll"/>
     <ROW File="VBCSCompiler.exe" Component_="VBCSCompiler.exe" FileName="VBCSCO~1.EXE|VBCSCompiler.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\VBCSCompiler.exe" SelfReg="false" NextFile="VBCSCompiler.exe.config" DigSign="true"/>
-    <ROW File="VBCSCompiler.exe.config" Component_="csc.exe.config" FileName="VBCSCO~1.CON|VBCSCompiler.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\VBCSCompiler.exe.config" SelfReg="false"/>
+    <ROW File="VBCSCompiler.exe.config" Component_="csc.exe.config" FileName="VBCSCO~1.CON|VBCSCompiler.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\VBCSCompiler.exe.config" SelfReg="false" NextFile="Microsoft.IdentityModel.Clients.ActiveDirectory.pdb"/>
     <ROW File="csc.exe" Component_="csc.exe" FileName="csc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csc.exe" SelfReg="false" NextFile="csc.exe.config" DigSign="true"/>
     <ROW File="csc.exe.config" Component_="csc.exe.config" FileName="CSCEXE~1.CON|csc.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csc.exe.config" SelfReg="false" NextFile="csc.rsp"/>
     <ROW File="csc.rsp" Component_="csc.exe.config" FileName="csc.rsp" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csc.rsp" SelfReg="false" NextFile="csi.exe"/>
@@ -515,7 +516,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.0.32"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.0.33"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 672b13a12..641f816af 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.0.32.0")]
+[assembly: AssemblyVersion("1.0.33.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
diff --git a/Software/Visual_Studio/TEMP/Tango.Graphics2D/MainWindow.xaml b/Software/Visual_Studio/TEMP/Tango.Graphics2D/MainWindow.xaml
index 1920f3415..abd7a1455 100644
--- a/Software/Visual_Studio/TEMP/Tango.Graphics2D/MainWindow.xaml
+++ b/Software/Visual_Studio/TEMP/Tango.Graphics2D/MainWindow.xaml
@@ -85,8 +85,8 @@
                         </TextBlock.RenderTransform>
                     </TextBlock>
 
-                    <!--<Line Stroke="Red" X1="0" Y1="0" X2="30" Y2="30"></Line>-->
-                    <!--<Image Source="/Images/sample.png" Width="50" Height="50" />-->
+                    <Line Stroke="Red" X1="0" Y1="0" X2="30" Y2="30"></Line>
+                    <Image Source="/Images/sample.png" Width="50" Height="50" />
 
                     <!--<Path Stroke="Black" StrokeThickness="5" Fill="Goldenrod" Stretch="Fill">
                         <Path.Data>
diff --git a/Software/Visual_Studio/Utilities/Tango.CoatsCatalogImporter/Program.cs b/Software/Visual_Studio/Utilities/Tango.CoatsCatalogImporter/Program.cs
index 031bf39e6..2147c23ce 100644
--- a/Software/Visual_Studio/Utilities/Tango.CoatsCatalogImporter/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.CoatsCatalogImporter/Program.cs
@@ -48,10 +48,12 @@ namespace Tango.CoatsCatalogImporter
             {
                 using (ObservablesContext db = ObservablesContext.CreateDefault(new Core.DataSource()
                 {
-                    Address = "localhost\\SQLPPC",
-                    Catalog = "Tango",
+                    Address = "twine.database.windows.net",
+                    Catalog = "Tango_TEST",
                     Type = Core.DataSourceType.SQLServer,
-                    IntegratedSecurity = true,
+                    UserName = "Roy",
+                    Password = "Aa123456",
+                    IntegratedSecurity = false,
                 }))
                 {
                     var rml = db.Rmls.Single(x => x.Name == rml_name);