Merge pull request #73 from terrycox/InstallerUpdate

Update installer

StoryBuilder.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31825.309
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreateInstallManifest", "CreateInstallManifest\CreateInstallManifest.csproj", "{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NRtfTree", "NRtfTree\NRtfTree.csproj", "{3038398B-A7A2-41BF-9FCC-0A8D12181AA3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StoryBuilderLib", "StoryBuilderLib\StoryBuilderLib.csproj", "{BBC53610-1C2F-4137-AAB3-DDA496D8F105}"
@@ -20,7 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{E2DA341C-F
 		docs\USERNOTES.md = docs\USERNOTES.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StoryBuilder", "StoryBuilder\StoryBuilder.csproj", "{BC359F5C-E784-4FD5-80E5-63A6A0FB853C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StoryBuilder", "StoryBuilder\StoryBuilder.csproj", "{BC359F5C-E784-4FD5-80E5-63A6A0FB853C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,22 +32,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Debug|arm64.Build.0 = Debug|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Debug|x64.Build.0 = Debug|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Debug|x86.Build.0 = Debug|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Release|Any CPU.Build.0 = Release|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Release|arm64.ActiveCfg = Release|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Release|arm64.Build.0 = Release|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Release|x64.ActiveCfg = Release|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Release|x64.Build.0 = Release|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Release|x86.ActiveCfg = Release|Any CPU
-		{477AC314-7BCE-428A-8CD1-D3D2D8D8E595}.Release|x86.Build.0 = Release|Any CPU
 		{3038398B-A7A2-41BF-9FCC-0A8D12181AA3}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{3038398B-A7A2-41BF-9FCC-0A8D12181AA3}.Debug|Any CPU.Build.0 = Debug|x64
 		{3038398B-A7A2-41BF-9FCC-0A8D12181AA3}.Debug|arm64.ActiveCfg = Debug|Any CPU

StoryBuilder/App.xaml.cs

@@ -165,7 +165,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
             await LoadControls(localFolder.Path, story);
 
             await LoadLists(localFolder.Path, story);
-
+            
             await LoadTools(localFolder.Path, story);
 
             ConfigureNavigation();

StoryBuilder/Package.appxmanifest

@@ -8,8 +8,8 @@
 
   <Identity
     Name="3234e32c-9ca1-4ad4-99bc-6583d2362437"
-    Publisher="CN=tcox"
-    Version="2.0.7.0" />
+    Publisher="CN=Rarisma"
+    Version="2.0.8.0" />
 
   <Properties>
     <DisplayName>StoryBuilder</DisplayName>
@@ -20,6 +20,7 @@
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
     <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <PackageDependency Name="Microsoft.VCLibs.140.00.UWPDesktop" MinVersion="14.0.30035.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>
 
   <Resources>

StoryBuilder/StoryBuilder.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
@@ -10,16 +10,18 @@
     <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-    <GenerateAppInstallerFile>True</GenerateAppInstallerFile>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-    <PackageCertificateThumbprint>D8BBA30097EB7F07F5585CCB14AA6458B9F8EB7B</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>D859B0BE541EE9397D211A2D6094DB48AA7961D0</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
-    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundle>Never</AppxBundle>
-    <AppInstallerUri>C:\install</AppInstallerUri>
+    <AppxBundle>Auto</AppxBundle>
+    <AppInstallerUri>C:\msixs</AppInstallerUri>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <AppxPackageDir>C:\Users\Rarisma\Desktop\stb2\</AppxPackageDir>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
   </PropertyGroup>
 
   <ItemGroup>

StoryBuilder/Views/Shell.xaml

@@ -210,7 +210,7 @@
                     </AppBarButton.Icon>
                 </AppBarButton>
                 <AppBarButton Label="Help" ToolTipService.ToolTip="Help"
-                              Command="{x:Bind ShellVm.HelpCommand, Mode=OneWay}" >
+                              Command="{x:Bind ShellVm.HelpCommand, Mode=OneWay}" IsEnabled="False" >
                     <AppBarButton.Icon>
                         <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE897;"/>
                     </AppBarButton.Icon>