fix the XmlNotepad.template.settings and the templates

lovettchris · lovettchris · commit 53056e14412c · 2026-03-27T13:53:39.000-07:00
diff --git a/notes.txt b/notes.txt
diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -73,6 +73,9 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.3595.46, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Web.WebView2.1.0.3595.46\lib\net462\Microsoft.Web.WebView2.Core.dll</HintPath>
@@ -249,6 +252,7 @@
     </EmbeddedResource>
     <Content Include="Resources\XmlNotepad.template.settings">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Generator>SettingsSingleFileGenerator</Generator>
     </Content>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Application/Resources/XmlNotepad.template.Designer.cs b/src/Application/Resources/XmlNotepad.template.Designer.cs
diff --git a/src/Application/Resources/XmlNotepad.template.settings b/src/Application/Resources/XmlNotepad.template.settings
@@ -20,7 +20,6 @@
   <FontSize>10</FontSize>
   <FontStyle>Normal</FontStyle>
   <FontWeight>Normal</FontWeight>
-  <IgnoreDTD>False</IgnoreDTD>
   <IndentChar>Space</IndentChar>
   <IndentLevel>2</IndentLevel>
   <LightColors>
@@ -52,7 +51,6 @@
   <WindowBounds>0, 0, 0, 0</WindowBounds>
   <XmlDiffIgnoreChildOrder>False</XmlDiffIgnoreChildOrder>
   <XmlDiffIgnoreComments>False</XmlDiffIgnoreComments>
-  <XmlDiffIgnoreDtd>False</XmlDiffIgnoreDtd>
   <XmlDiffIgnoreNamespaces>False</XmlDiffIgnoreNamespaces>
   <XmlDiffIgnorePI>False</XmlDiffIgnorePI>
   <XmlDiffIgnorePrefixes>False</XmlDiffIgnorePrefixes>
diff --git a/src/Updates/Updates.xml b/src/Updates/Updates.xml
@@ -9,8 +9,8 @@
     <history>https://github.com/microsoft/XmlNotepad/blob/master/src/Updates/Updates.xml</history>
     <frequency>1.00:00:00</frequency>
   </application>
-	<version number="2.9.0.18">
-		<feature>Fix issue security advisory on DTD processing.</feature>
+	<version number="2.9.0.20">
+		<feature>Fix issue security advisory on DTD processing. Make default Ignore DTD option True, which is more secure.</feature>
 	</version>
 	<version number="2.9.0.17">
 		<feature>Fix issue #463: Don't add a missing XML declaration on save.</feature>
diff --git a/src/Version/Version.cs b/src/Version/Version.cs
@@ -17,5 +17,5 @@
 //
 // Version.props is the Master version number from which UpdateVersions will propagate to
 // this file, Package.appxmanifest, Product.wxs, Bundle.wxs and Application.csproj.
-[assembly: AssemblyVersion("2.9.0.19")]
-[assembly: AssemblyFileVersion("2.9.0.19")]
+[assembly: AssemblyVersion("2.9.0.20")]
+[assembly: AssemblyFileVersion("2.9.0.20")]
diff --git a/src/Version/Version.props b/src/Version/Version.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>2.9.0.19</ApplicationVersion>
+    <ApplicationVersion>2.9.0.20</ApplicationVersion>
     <Version>$(ApplicationVersion)</Version>
     <Authors>Chris Lovett</Authors>
     <Product>XmlNotepad</Product>
diff --git a/src/XmlNotepadBundle/Bundle.wxs b/src/XmlNotepadBundle/Bundle.wxs
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
-  <Bundle Name="XML Notepad" Version="2.9.0.19" Manufacturer="Lovett Software" UpgradeCode="b39cd92c-6bf2-4f4c-9e2c-fb402781a316">
+  <Bundle Name="XML Notepad" Version="2.9.0.20" Manufacturer="Lovett Software" UpgradeCode="b39cd92c-6bf2-4f4c-9e2c-fb402781a316">
     <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
       <bal:WixStandardBootstrapperApplication LicenseFile="..\Application\license.rtf" ShowVersion="yes" />
     </BootstrapperApplicationRef>
diff --git a/src/XmlNotepadPackage/Package.appxmanifest b/src/XmlNotepadPackage/Package.appxmanifest
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap">
-  <Identity Name="43906ChrisLovett.XmlNotepad" Publisher="CN=BC801FCC-0BF8-49D7-9F51-1B625C3BE476" Version="2.9.0.19" />
+  <Identity Name="43906ChrisLovett.XmlNotepad" Publisher="CN=Chris Lovett, O=Chris Lovett, S=Washington, C=US" Version="2.9.0.20" />
   <Properties>
     <DisplayName>XmlNotepad</DisplayName>
     <PublisherDisplayName>Chris Lovett</PublisherDisplayName>
diff --git a/src/XmlNotepadPackage/XmlNotepadPackage.wapproj b/src/XmlNotepadPackage/XmlNotepadPackage.wapproj
@@ -55,8 +55,8 @@
     <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
-    <PackageCertificateThumbprint>50D58171E20BB6188B199ACA7C20A26DA0DFBF35</PackageCertificateThumbprint>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <PackageCertificateThumbprint>F0DEC4CF1C07CB9E44E29D98389072C8579D5E79</PackageCertificateThumbprint>
     <EntryPointProjectUniqueName>..\Application\Application.csproj</EntryPointProjectUniqueName>
     <GenerateAppInstallerFile>True</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampServerUrl>http://timestamp.sectigo.com</AppxPackageSigningTimestampServerUrl>
diff --git a/src/XmlNotepadSetup/Product.wxs b/src/XmlNotepadSetup/Product.wxs
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-  <Product Id="*" Name="XmlNotepad" Language="1033" Version="2.9.0.19" Manufacturer="Lovett Software" UpgradeCode="14C1B5E8-3198-4AF2-B4BC-351017A109D3">
+  <Product Id="*" Name="XmlNotepad" Language="1033" Version="2.9.0.20" Manufacturer="Lovett Software" UpgradeCode="14C1B5E8-3198-4AF2-B4BC-351017A109D3">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade Schedule="afterInstallFinalize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
     <MediaTemplate />
diff --git a/tools/Microsoft.XMLNotepad.installer.yaml b/tools/Microsoft.XMLNotepad.installer.yaml
@@ -1,23 +1,20 @@
-# Created using YamlCreate.ps1
-# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+﻿# Created using wingetcreate 1.12.8.0
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.12.0.schema.json
 
 PackageIdentifier: Microsoft.XMLNotepad
-PackageVersion: 2.8.0.40
+PackageVersion: 2.9.0.19
+Platform:
+- Windows.Universal
+- Windows.Desktop
+MinimumOSVersion: 10.0.17763.0
 FileExtensions:
 - xml
-InstallModes:
-- interactive
-- silent
-- silentWithProgress
+InstallerType: msix
+PackageFamilyName: 43906ChrisLovett.XmlNotepad_hndwmj480pefj
 Installers:
-  MinimumOSVersion: 10.0.18362.0
-  Architecture: neutral
-  InstallerType: msix
-  Scope: user
-  InstallerUrl: https://github.com/microsoft/XmlNotepad/releases/download/2.8.0.41/XmlNotepadPackage_2.8.0.41_AnyCPU.msixbundle
-  InstallerSha256: 8f2a014b78e38709bc44766274a94eb99564ac7ba99dec2f35ea790aa34a5e18
-  SignatureSha256: d60165368abc4524e030f442ac630a456ccfb8dbe66af8fb721239ff933cc50e
-  PackageFamilyName: 5632ff08-aa93-439a-b09f-677eb3664250_b2j8apzf1bbh6
-  UpgradeBehavior: install
-ManifestType: installer
-ManifestVersion: 1.0.0
+- Architecture: neutral
+  InstallerUrl: https://github.com/microsoft/XmlNotepad/releases/download/2.9.0.19/XmlNotepadPackage_2.9.0.19_AnyCPU.msixbundle
+  InstallerSha256: 31A7596B2D3204B5F53BB1CE32EDBB2520E8CAB6A8621E37995E2075B0E49439
+  SignatureSha256: 605D07484A17050CEF272BEDBB4FB6036B539810FB90115871EECD04C34F481E
+
+ManifestType: installerManifestVersion: 1.12.0
diff --git a/tools/Microsoft.XMLNotepad.locale.en-US.yaml b/tools/Microsoft.XMLNotepad.locale.en-US.yaml
@@ -1,8 +1,8 @@
-# Created using YamlCreate.ps1
-# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+﻿# Created using wingetcreate 1.12.8.0
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.12.0.schema.json
 
 PackageIdentifier: Microsoft.XMLNotepad
-PackageVersion: 2.8.0.40
+PackageVersion: 2.9.0.19
 PackageLocale: en-US
 Publisher: Microsoft Corporation
 PublisherUrl: https://github.com/microsoft/XmlNotepad
@@ -22,4 +22,5 @@ Tags:
 - xml editor
 - xml
 ManifestType: defaultLocale
-ManifestVersion: 1.0.0
+ManifestVersion: 1.12.0
+
diff --git a/tools/Microsoft.XMLNotepad.yaml b/tools/Microsoft.XMLNotepad.yaml
@@ -1,8 +1,9 @@
-# Created using YamlCreate.ps1
-# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
+﻿# Created using wingetcreate 1.12.8.0
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.12.0.schema.json
 
 PackageIdentifier: Microsoft.XMLNotepad
-PackageVersion: 2.8.0.40
+PackageVersion: 2.9.0.19
 DefaultLocale: en-US
 ManifestType: version
-ManifestVersion: 1.0.0
+ManifestVersion: 1.12.0
+
