APPX and MSIX

*NEW* MSIX designer Slight tweaks to APPX designer UI Add fgmsix.xsd to installer Slight update to MSI project template to make code signing enlistment easier
iswix-llc · Jan 27, 2019 · e3820d3 · e3820d3
1 parent f69a87c
commit e3820d3
Show file tree

Hide file tree

Showing 35 changed files with 2,221 additions and 51 deletions.
diff --git a/Source/Application/Application.sln b/Source/Application/Application.sln
@@ -13,6 +13,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IsWiX", "IsWiX\IsWiX.csproj
 		{62EE9B37-D99A-4AC0-898A-EC822268467C} = {62EE9B37-D99A-4AC0-898A-EC822268467C}
 		{D14BED47-FF47-49F4-B15E-E28E4607B757} = {D14BED47-FF47-49F4-B15E-E28E4607B757}
 		{4B733F56-A202-4813-9494-53B048FE07B6} = {4B733F56-A202-4813-9494-53B048FE07B6}
+		{205BC85E-79EB-45ED-A861-ADC5CEBDF140} = {205BC85E-79EB-45ED-A861-ADC5CEBDF140}
 		{9AD79B6E-B90B-435B-A7DF-1B01C4D563DF} = {9AD79B6E-B90B-435B-A7DF-1B01C4D563DF}
 		{7C470E97-D17B-41A2-B1E2-9EC665300E36} = {7C470E97-D17B-41A2-B1E2-9EC665300E36}
 		{461DDAB2-0B76-460D-9F3E-041CB88DF974} = {461DDAB2-0B76-460D-9F3E-041CB88DF974}
@@ -76,6 +77,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IsWiXAutomationInterface",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireworksFramework.Interfaces", "Shared\FireworksFramework.Interfaces\FireworksFramework.Interfaces.csproj", "{C7C6634A-2317-49A9-92C3-F9552750E1ED}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSIXDesigner", "Designers\MSIXDesigner\MSIXDesigner.csproj", "{205BC85E-79EB-45ED-A861-ADC5CEBDF140}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -212,6 +215,14 @@ Global
 		{C7C6634A-2317-49A9-92C3-F9552750E1ED}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C7C6634A-2317-49A9-92C3-F9552750E1ED}.Release|x86.ActiveCfg = Release|Any CPU
 		{C7C6634A-2317-49A9-92C3-F9552750E1ED}.Release|x86.Build.0 = Release|Any CPU
+		{205BC85E-79EB-45ED-A861-ADC5CEBDF140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{205BC85E-79EB-45ED-A861-ADC5CEBDF140}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{205BC85E-79EB-45ED-A861-ADC5CEBDF140}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{205BC85E-79EB-45ED-A861-ADC5CEBDF140}.Debug|x86.Build.0 = Debug|Any CPU
+		{205BC85E-79EB-45ED-A861-ADC5CEBDF140}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{205BC85E-79EB-45ED-A861-ADC5CEBDF140}.Release|Any CPU.Build.0 = Release|Any CPU
+		{205BC85E-79EB-45ED-A861-ADC5CEBDF140}.Release|x86.ActiveCfg = Release|Any CPU
+		{205BC85E-79EB-45ED-A861-ADC5CEBDF140}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -232,6 +243,7 @@ Global
 		{C1E55196-2D92-4E26-9E70-DF47DFE81894} = {27EDD51D-A5F3-430F-80B1-49B13F450C89}
 		{461DDAB2-0B76-460D-9F3E-041CB88DF974} = {27EDD51D-A5F3-430F-80B1-49B13F450C89}
 		{C7C6634A-2317-49A9-92C3-F9552750E1ED} = {27EDD51D-A5F3-430F-80B1-49B13F450C89}
+		{205BC85E-79EB-45ED-A861-ADC5CEBDF140} = {94BCBA4B-1D51-406B-BA90-63E42F7629A2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0DCB5607-5776-4BEB-B267-E06C84312C9F}

diff --git a/Source/Application/Designers/AppXDesigner/AppXs.Designer.cs b/Source/Application/Designers/AppXDesigner/AppXs.Designer.cs
diff --git a/Source/Application/Designers/AppXDesigner/AppXs.cs b/Source/Application/Designers/AppXDesigner/AppXs.cs
@@ -77,12 +77,17 @@ public void LoadData()
                 linkLabelRequirements.Visible = false;
                 LoadDocument();
             }
+            else
+            {
+                contextMenuStripAppX.Items.Clear();
+            }
         }
 
         private  void LoadDocument()
         {
             panelTop.Height = 0;
             _isWiXFGAppXs = new IsWiXFGAppXs(_documentManager.Document);
+
             contextMenuStripAppX.Items["toolStripMenuItemRename"].Enabled = false;
             contextMenuStripAppX.Items["toolStripMenuItemDelete"].Enabled = false;
 

diff --git a/Source/Application/Designers/AppXDesigner/AppXs.resx b/Source/Application/Designers/AppXDesigner/AppXs.resx
@@ -131,7 +131,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACi
-        EwAAAk1TRnQBSQFMAgEBDAEAAZwBAQGcAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        EwAAAk1TRnQBSQFMAgEBDAEAAbwBAQG8AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAAUADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

diff --git a/Source/Application/Designers/AppXDesigner/FireGiantWiXMessage.Designer.cs b/Source/Application/Designers/AppXDesigner/FireGiantWiXMessage.Designer.cs
diff --git a/Source/Application/Designers/MSIXDesigner/App.config b/Source/Application/Designers/MSIXDesigner/App.config
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="MSIXDesigner.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <userSettings>
+    <MSIXDesigner.Properties.Settings>
+      <setting name="SuppressFireGiantMessage" serializeAs="String">
+        <value>false</value>
+      </setting>
+    </MSIXDesigner.Properties.Settings>
+  </userSettings>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>