Upgrade webview2.

Publish version 2.9.0.7
microsoft · Oct 23, 2023 · 39bc0ee · 39bc0ee
1 parent edd76bf
commit 39bc0ee
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 52 deletions.
diff --git a/docs/dev/index.md b/docs/dev/index.md
@@ -2,7 +2,7 @@
 
 You can build and test XML Notepad using [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/). It uses
 .NET frameworks, so be sure to install the ".NET desktop development" feature when using the Visual Studio Installer.
-XML Notepad targets .NET Framework version 4.8.
+XML Notepad targets [.NET Framework version 4.8](https://dotnet.microsoft.com/en-us/download/dotnet-framework/net48).
 
 ### Coding Guidelines
 

diff --git a/docs/install.md b/docs/install.md
@@ -2,8 +2,9 @@
 
 There are thee ways to install XML Notepad.
 
-This most convenient is to install it directly from the web browser.  If the browser downloads this
-file, click "Open file" to install it.
+First you must install [.NET Framework version 4.8](https://dotnet.microsoft.com/en-us/download/dotnet-framework/net48).
+
+Then the most convenient is to install it directly from the web browser using the ClickOnce installer:
 
 <div>
 <a href="https://lovettsoftwarestorage.blob.core.windows.net/downloads/XmlNotepad/XmlNotepad.application" class="btn btn-primary mt-20 mr-30" target="_blank">ClickOnce® installer</a>
@@ -39,8 +40,7 @@ winget install XmlNotepad
 <br/>
 </div>
 
-WebView2 is an optional component that you can install from Microsoft. XML Notepad will use this component as the HTML rendering engine
-behind the [XSLT Output tab](help/xslt.md).  WebView2 provides a
+WebView2 is an optional component that you can install from Microsoft. XML Notepad will use this component as the HTML rendering engine behind the [XSLT Output tab](help/xslt.md).  WebView2 provides a
 significant performance boost on large XSLT outputs.
 
 See [XML Notepad File Association](help/fileassociation.md).
diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -15,16 +15,13 @@
     <ApplicationIcon>Resources\XmlNote.ico</ApplicationIcon>
     <StartupObject>XmlNotepad.Program</StartupObject>
     <AssemblyOriginatorKeyFile>$(MyKeyFile)</AssemblyOriginatorKeyFile>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <FileUpgradeFlags></FileUpgradeFlags>
+    <UpgradeBackupLocation></UpgradeBackupLocation>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
     <PublishUrl>..\..\publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -41,8 +38,6 @@
     <PublisherName>Chris Lovett</PublisherName>
     <WebPage>readme.htm</WebPage>
     <DisallowUrlActivation>true</DisallowUrlActivation>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>2.9.0.7</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -74,8 +69,7 @@
     <ManifestCertificateThumbprint>50D58171E20BB6188B199ACA7C20A26DA0DFBF35</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestTimestampUrl>
-    </ManifestTimestampUrl>
+    <ManifestTimestampUrl></ManifestTimestampUrl>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -179,8 +173,7 @@
     <Compile Include="FormSearch.Designer.cs">
       <DependentUpon>FormSearch.cs</DependentUpon>
     </Compile>
-    <Compile Include="Program.cs">
-    </Compile>
+    <Compile Include="Program.cs"></Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="XmlDiffWrapper.cs" />
     <EmbeddedResource Include="FormGotoLine.resx">
@@ -309,80 +302,64 @@
   <ItemGroup>
     <PublishFile Include="Samples\basket.xml">
       <Visible>False</Visible>
-      <Group>
-      </Group>
-      <TargetPath>
-      </TargetPath>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\basket.xsd">
       <Visible>False</Visible>
-      <Group>
-      </Group>
-      <TargetPath>
-      </TargetPath>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\Employee.xml">
       <Visible>False</Visible>
-      <Group>
-      </Group>
-      <TargetPath>
-      </TargetPath>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\Employee.xsd">
       <Visible>False</Visible>
-      <Group>
-      </Group>
-      <TargetPath>
-      </TargetPath>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\Hamlet.xml">
       <Visible>False</Visible>
-      <Group>
-      </Group>
-      <TargetPath>
-      </TargetPath>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\rss.xml">
       <Visible>False</Visible>
-      <Group>
-      </Group>
-      <TargetPath>
-      </TargetPath>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\rsspretty.xsl">
       <Visible>False</Visible>
-      <Group>
-      </Group>
-      <TargetPath>
-      </TargetPath>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
     <PublishFile Include="Samples\willy.xsl">
       <Visible>False</Visible>
-      <Group>
-      </Group>
-      <TargetPath>
-      </TargetPath>
+      <Group></Group>
+      <TargetPath></TargetPath>
       <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>

diff --git a/src/Model/XmlHelpers.cs b/src/Model/XmlHelpers.cs
@@ -138,7 +138,7 @@ public static XmlNamespaceManager GetNamespaceScope(XmlNode context)
             XmlNameTable nt = owner.NameTable;
             XmlNamespaceManager nsmgr = new XmlNamespaceManager(nt);
             XmlNode parent = context;
-            
+
             while (parent != null)
             {
                 if (parent is XmlElement)
@@ -173,7 +173,6 @@ public static XmlNamespaceManager GetNamespaceScope(XmlNode context)
 
         public static string GetXPathLocation(XmlNode context, XmlNamespaceManager scope)
         {
-            string path = null;
             XPathGenerator gen = new XPathGenerator();
             return gen.GetXPath(context, scope);
         }

diff --git a/src/Updates/Updates.xml b/src/Updates/Updates.xml
@@ -27,6 +27,7 @@
       Add a Copy XPath command that gives you the XPath location of the selected element.
     </feature>
     <bug>Fix Schema dialog row copy so it gives you a valid xsi:schemaLocation value.</bug>
+    <bug>Fix new bug in WebView2 initialization.</bug>
   </version>
   <version number="2.9.0.6">
     <feature>

diff --git a/src/Version/Version.props b/src/Version/Version.props
@@ -10,6 +10,6 @@
     <PackageProjectUrl>https://microsoft.github.io/XmlNotepad/</PackageProjectUrl>
     <Company>Microsoft Corporation</Company>
     <Copyright>Copyright © 2023 Microsoft Corporation</Copyright>
-    <WebView2Version>2.1.0.2088.41</WebView2Version>
+    <WebView2Version>1.0.2088.41</WebView2Version>
   </PropertyGroup>
 </Project>