Skip to content

Commit

Permalink
Update to WebView2 version 1.0.2739.15
Browse files Browse the repository at this point in the history
  • Loading branch information
lovettchris committed Sep 20, 2024
1 parent f6a7359 commit 7a4ff39
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/Application/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LovettSoftware.XmlDiff" version="1.1.0" targetFramework="net472" requireReinstallation="true" />
<package id="Microsoft.Web.WebView2" version="1.0.2478.35" targetFramework="net48" />
<package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="net48" />
<package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net472" />
<package id="Microsoft.Xml.SgmlReader" version="1.8.30" targetFramework="net472" requireReinstallation="true" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
Expand Down
1 change: 1 addition & 0 deletions src/Updates/Updates.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<feature>Issue 324: Generate xml from schema, see ttps://youtu.be/5I_q1oXz02I.</feature>
<feature>Issue 385:: "XML Reload" removes loaded XSLT. You can now get auto-reload when xml file changes on disk
and you can turn off the prompt in options dialog and it will reapply the XSLT automatically.</feature>
<feature>update to WebView2 version 1.0.2739.15</feature>
<bug>Also preserve the selection in the XML tree view across file reloads.</bug>
</version>
<version number="2.9.0.11">
Expand Down
4 changes: 2 additions & 2 deletions src/Version/Version.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<PackageProjectUrl>https://microsoft.github.io/XmlNotepad/</PackageProjectUrl>
<Company>Microsoft Corporation</Company>
<Copyright>Copyright © 2024 Microsoft Corporation</Copyright>
<WebView2Version>1.0.2478.35</WebView2Version>
<WebView2Version>1.0.2739.15</WebView2Version>
</PropertyGroup>
</Project>
</Project>
16 changes: 8 additions & 8 deletions src/XmlNotepad/XmlNotepad.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -248,14 +248,14 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.2478.35, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2478.35\lib\net45\Microsoft.Web.WebView2.Core.dll</HintPath>
<Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.2739.15, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2739.15\lib\net462\Microsoft.Web.WebView2.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.2478.35, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2478.35\lib\net45\Microsoft.Web.WebView2.WinForms.dll</HintPath>
<Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.2739.15, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2739.15\lib\net462\Microsoft.Web.WebView2.WinForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.2478.35, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2478.35\lib\net45\Microsoft.Web.WebView2.Wpf.dll</HintPath>
<Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.2739.15, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2739.15\lib\net462\Microsoft.Web.WebView2.Wpf.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -316,11 +316,11 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.2478.35\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.2478.35\build\Microsoft.Web.WebView2.targets')" />
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\Microsoft.Web.WebView2.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2478.35\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2478.35\build\Microsoft.Web.WebView2.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\Microsoft.Web.WebView2.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion src/XmlNotepad/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LovettSoftware.XmlDiff" version="1.1.0" targetFramework="net472" requireReinstallation="true" />
<package id="Microsoft.Web.WebView2" version="1.0.2478.35" targetFramework="net48" />
<package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="net48" />
</packages>

0 comments on commit 7a4ff39

Please sign in to comment.