FSE_v3.0.0

4 files changed, 8 insertions, 9 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip
index 224ffe245..54ac42dc0 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip
@@ -29,10 +29,10 @@
     <ROW Property="ExtractFilesFirst" Value="1"/>
     <ROW Property="LogoIcon" Value="externalui.ico" MultiBuildValue="DefaultBuild:machine_full_0UZ_icon.ico_1" Type="1" MsiKey="LogoIcon"/>
     <ROW Property="Manufacturer" Value="Twine Solutions LTD"/>
-    <ROW Property="ProductCode" Value="1033:{99945180-8F2F-442D-B8BE-8E0FF3C53402} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{9A391945-D190-49F4-BDCA-FB11B14C70B5} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango FSE"/>
-    <ROW Property="ProductVersion" Value="2.0.12.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="3.0.0.0" Type="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{0E13CB0D-89F7-465E-9F56-F1CBD6773E6E}"/>
@@ -98,6 +98,7 @@
     <ROW Component="Microsoft.Activities.Build.dll" ComponentId="{552DEA44-DA8D-4377-B0B7-FD704EA4D911}" Directory_="ProceduresAssemblies_Dir" Attributes="0" KeyPath="Microsoft.Activities.Build.dll"/>
     <ROW Component="Microsoft.AspNet.SignalR.Client.dll" ComponentId="{A6A1BE43-A965-4718-8B9B-E8BB2D2B6FA9}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.AspNet.SignalR.Client.dll"/>
     <ROW Component="Microsoft.Azure.ActiveDirectory.GraphClient.dll" ComponentId="{623FE6DD-F44D-4E99-8FD5-E54A608BE511}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.ActiveDirectory.GraphClient.dll"/>
+    <ROW Component="Microsoft.Azure.KeyVault.Core.dll" ComponentId="{ADCCFA35-DEB3-47C1-BF1D-9443A5896E61}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.KeyVault.Core.dll"/>
     <ROW Component="Microsoft.Build.Conversion.v4.0.dll" ComponentId="{849CEB91-40E6-48EE-B015-D94D31773688}" Directory_="ProceduresAssemblies_Dir" Attributes="0" KeyPath="Microsoft.Build.Conversion.v4.0.dll"/>
     <ROW Component="Microsoft.Build.Engine.dll" ComponentId="{C6B5F7C0-2B45-4241-8C80-9AD99258AEEE}" Directory_="ProceduresAssemblies_Dir" Attributes="0" KeyPath="Microsoft.Build.Engine.dll"/>
     <ROW Component="Microsoft.Build.Framework.dll" ComponentId="{E2802732-355C-49CB-8237-1F0640597EDB}" Directory_="ProceduresAssemblies_Dir" Attributes="0" KeyPath="Microsoft.Build.Framework.dll"/>
@@ -113,7 +114,6 @@
     <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{B81A1F1A-A435-494B-83A6-34F90831ACFD}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/>
     <ROW Component="Microsoft.Data.OData.dll" ComponentId="{29962C42-7050-49DD-9C22-BAD45E1AE018}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/>
     <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{24856FBE-02B1-4C90-AED9-13D1C2B76511}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Services.Client.dll"/>
-    <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" ComponentId="{1B296FA8-D473-4A57-B6E5-74888166D254}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
     <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" ComponentId="{C8FF51E6-B8BB-401D-BD03-58FD08E4C389}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
     <ROW Component="Microsoft.JScript.dll" ComponentId="{6A4279E4-697A-4041-AEF1-D69817FFE0A1}" Directory_="ProceduresAssemblies_Dir" Attributes="0" KeyPath="Microsoft.JScript.dll"/>
     <ROW Component="Microsoft.ML.Core.dll" ComponentId="{7EC1F1B3-7326-4991-B875-30F8B27BA4EC}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ML.Core.dll"/>
@@ -1187,8 +1187,7 @@
     <ROW File="turbojpeg.dll.meta" Component_="turbojpeg.dll.meta" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\win7-x64\turbojpeg.dll.meta" SelfReg="false"/>
     <ROW File="turbojpeg.dll_1" Component_="turbojpeg.dll_1" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\win7-x86\turbojpeg.dll" SelfReg="false"/>
     <ROW File="turbojpeg.dll.meta_1" Component_="turbojpeg.dll.meta_1" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\win7-x86\turbojpeg.dll.meta" SelfReg="false"/>
-    <ROW File="Tango.PPC.Shared.xml" Component_="Dragablz.xml" FileName="TANGOP~1.XML|Tango.PPC.Shared.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Tango.PPC.Shared.xml" SelfReg="false"/>
-    <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" FileName="MICROS~2.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" SelfReg="false"/>
+    <ROW File="Microsoft.Azure.KeyVault.Core.dll" Component_="Microsoft.Azure.KeyVault.Core.dll" FileName="MICRO~50.DLL|Microsoft.Azure.KeyVault.Core.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\FSE\Release\Microsoft.Azure.KeyVault.Core.dll" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent">
     <ROW RemoveFile="_" Options="3"/>
@@ -1203,7 +1202,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\FSE\Release" PackageFileName="Tango FSE v2.0.12" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Tango FSE v2.0.12"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\FSE\Release" PackageFileName="Tango FSE v3.0.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Tango FSE v3.0.0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -1828,7 +1827,7 @@
     <ROW Feature_="TangoFSE" Component_="turbojpeg.dll.meta"/>
     <ROW Feature_="TangoFSE" Component_="turbojpeg.dll_1"/>
     <ROW Feature_="TangoFSE" Component_="turbojpeg.dll.meta_1"/>
-    <ROW Feature_="TangoFSE" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
+    <ROW Feature_="TangoFSE" Component_="Microsoft.Azure.KeyVault.Core.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
     <ROW Name="Tango.FSE.LogViewer.UI.exe" SourcePath="..\..\Graphics\FSE\log_viewer_icon.ico" Index="0"/>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
index 3906f0da4..1695373b2 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs
index eb3ed41c9..9091ff26c 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs
@@ -256,7 +256,7 @@ namespace Tango.FSE.Publisher.UI
 
                 if (!Directory.Exists(Path.GetDirectoryName(installerPath)))
                 {
-                    throw new DirectoryNotFoundException($"Could not locate installer output directory '{Path.GetDirectoryName(installerPath)}'.");
+                    Directory.CreateDirectory(Path.GetDirectoryName(installerPath));
                 }
 
                 UpdateProgress("Authenticating with machine service...");
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
index fcc8be937..4a09534a4 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.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 FSE")]
-[assembly: AssemblyVersion("2.0.12.0")]
+[assembly: AssemblyVersion("3.0.0.0")]