diff --git a/docs/dev/index.md b/docs/dev/index.md index 8cb39f58..864762ce 100644 --- 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 index 2c630432..abc1a28f 100644 --- 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:
ClickOnce® installer @@ -39,8 +40,7 @@ winget install XmlNotepad
-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). \ No newline at end of file diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj index 58c80070..0a6ea493 100644 --- a/src/Application/Application.csproj +++ b/src/Application/Application.csproj @@ -15,16 +15,13 @@ Resources\XmlNote.ico XmlNotepad.Program $(MyKeyFile) - - - - + + v4.8 3.5 false - - + ..\..\publish\ true Disk @@ -41,8 +38,6 @@ Chris Lovett readme.htm true - 0 - 2.9.0.7 false true true @@ -74,8 +69,7 @@ 50D58171E20BB6188B199ACA7C20A26DA0DFBF35 - - + true @@ -179,8 +173,7 @@ FormSearch.cs - - + @@ -309,80 +302,64 @@ False - - - - + + Include True File False - - - - + + Include True File False - - - - + + Include True File False - - - - + + Include True File False - - - - + + Include True File False - - - - + + Include True File False - - - - + + Include True File False - - - - + + Include True File diff --git a/src/Model/XmlHelpers.cs b/src/Model/XmlHelpers.cs index 190e34f2..998312a5 100644 --- 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 index b367585f..89c5c888 100644 --- 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. Fix Schema dialog row copy so it gives you a valid xsi:schemaLocation value. + Fix new bug in WebView2 initialization. diff --git a/src/Version/Version.props b/src/Version/Version.props index 2eaaaea6..f9a50fd4 100644 --- a/src/Version/Version.props +++ b/src/Version/Version.props @@ -10,6 +10,6 @@ https://microsoft.github.io/XmlNotepad/ Microsoft Corporation Copyright © 2023 Microsoft Corporation - 2.1.0.2088.41 + 1.0.2088.41 \ No newline at end of file