Added support for .NET 8.0. This resolves #660.

ravibpatel · Feb 7, 2024 · 060eb7b · 060eb7b
1 parent dbc59d0
commit 060eb7b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 14 deletions.
diff --git a/AutoUpdater.NET/AutoUpdater.NET.csproj b/AutoUpdater.NET/AutoUpdater.NET.csproj
@@ -3,14 +3,14 @@
  <PropertyGroup>
  <ProjectGuid>{FB9E7E6B-B19F-4F37-A708-2996190CEF13}</ProjectGuid>
  <OutputType>library</OutputType>
- <TargetFrameworks>net45;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows</TargetFrameworks>
+ <TargetFrameworks>net45;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
  <UseWindowsForms>true</UseWindowsForms>
  <UseWpf>true</UseWpf>
  <RootNamespace>AutoUpdaterDotNET</RootNamespace>
  <AssemblyTitle>AutoUpdater.NET</AssemblyTitle>
  <Company>RBSoft</Company>
  <Product>AutoUpdater.NET</Product>
- <Copyright>Copyright © 2012-2023 RBSoft</Copyright>
+ <Copyright>Copyright © 2012-2024 RBSoft</Copyright>
  <Version>1.8.5.0</Version>
  <AssemblyVersion>1.8.5.0</AssemblyVersion>
  <FileVersion>1.8.5.0</FileVersion>
@@ -51,6 +51,6 @@
  <PackageReference Include="Resource.Embedder" Version="1.2.8" PrivateAssets="All"/>
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2151.40"/>
+ <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2277.86"/>
  </ItemGroup>
 </Project>
diff --git a/AutoUpdater.NET/AutoUpdater.cs b/AutoUpdater.NET/AutoUpdater.cs
@@ -17,6 +17,7 @@
 using MessageBox = System.Windows.Forms.MessageBox;
 using Size = System.Drawing.Size;
 using Timer = System.Timers.Timer;
+using WinFormsMethodInvoker = System.Windows.Forms.MethodInvoker;
 
 namespace AutoUpdaterDotNET;
 
@@ -620,7 +621,7 @@ internal static void Exit()
  {
  if (_isWinFormsApplication)
  {
- MethodInvoker methodInvoker = Application.Exit;
+ WinFormsMethodInvoker methodInvoker = Application.Exit;
  methodInvoker.Invoke();
  }
  else if (System.Windows.Application.Current != null)

diff --git a/AutoUpdater.NET/UpdateForm.cs b/AutoUpdater.NET/UpdateForm.cs
@@ -60,7 +60,7 @@ private async void InitializeBrowserControl()
  var webView2RuntimeFound = false;
  try
  {
- string availableBrowserVersion = CoreWebView2Environment.GetAvailableBrowserVersionString();
+ string availableBrowserVersion = CoreWebView2Environment.GetAvailableBrowserVersionString(null);
  var requiredMinBrowserVersion = "86.0.616.0";
  if (!string.IsNullOrEmpty(availableBrowserVersion)
  && CoreWebView2Environment.CompareBrowserVersions(availableBrowserVersion,

diff --git a/AutoUpdater.NET/build/Autoupdater.NET.Official.nuspec b/AutoUpdater.NET/build/Autoupdater.NET.Official.nuspec
@@ -13,23 +13,26 @@
  functionality to their WinForms or WPF application projects.
  </description>
  <releaseNotes>https://github.com/ravibpatel/AutoUpdater.NET/releases</releaseNotes>
- <copyright>Copyright © 2012-2023 RBSoft</copyright>
+ <copyright>Copyright © 2012-2024 RBSoft</copyright>
  <tags>autoupdate updater c# vb wpf winforms</tags>
  <dependencies>
  <group targetFramework=".NETFramework4.5">
- <dependency id="Microsoft.Web.WebView2" version="1.0.2151.40" exclude="Build,Analyzers"/>
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2277.86" exclude="Build,Analyzers"/>
  </group>
  <group targetFramework=".NETCoreApp3.1">
- <dependency id="Microsoft.Web.WebView2" version="1.0.2151.40" exclude="Build,Analyzers"/>
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2277.86" exclude="Build,Analyzers"/>
  </group>
  <group targetFramework="net5.0-windows7.0">
- <dependency id="Microsoft.Web.WebView2" version="1.0.2151.40" exclude="Build,Analyzers"/>
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2277.86" exclude="Build,Analyzers"/>
  </group>
  <group targetFramework="net6.0-windows7.0">
- <dependency id="Microsoft.Web.WebView2" version="1.0.2151.40" exclude="Build,Analyzers"/>
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2277.86" exclude="Build,Analyzers"/>
  </group>
  <group targetFramework="net7.0-windows7.0">
- <dependency id="Microsoft.Web.WebView2" version="1.0.2151.40" exclude="Build,Analyzers"/>
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2277.86" exclude="Build,Analyzers"/>
+ </group>
+ <group targetFramework="net8.0-windows7.0">
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2277.86" exclude="Build,Analyzers"/>
  </group>
  </dependencies>
  <frameworkReferences>
@@ -45,6 +48,9 @@
  <group targetFramework="net7.0-windows7.0">
  <frameworkReference name="Microsoft.WindowsDesktop.App"/>
  </group>
+ <group targetFramework="net8.0-windows7.0">
+ <frameworkReference name="Microsoft.WindowsDesktop.App"/>
+ </group>
  <group targetFramework=".NETFramework4.5"/>
  </frameworkReferences>
  <frameworkAssemblies>

diff --git a/AutoUpdaterTest/AutoUpdaterTest.csproj b/AutoUpdaterTest/AutoUpdaterTest.csproj
@@ -2,7 +2,7 @@
 
  <PropertyGroup>
  <OutputType>WinExe</OutputType>
- <TargetFramework>net7.0-windows</TargetFramework>
+ <TargetFramework>net8.0-windows</TargetFramework>
  <Nullable>enable</Nullable>
  <UseWPF>true</UseWPF>
  <LangVersion>latest</LangVersion>

diff --git a/ZipExtractor/ZipExtractor.csproj b/ZipExtractor/ZipExtractor.csproj
@@ -3,12 +3,12 @@
  <PropertyGroup>
  <ProjectGuid>{91DE558C-6DB8-429B-A069-C0491DCFF15B}</ProjectGuid>
  <OutputType>WinExe</OutputType>
- <TargetFrameworks>net45;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows</TargetFrameworks>
+ <TargetFrameworks>net45;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
  <UseWindowsForms>true</UseWindowsForms>
  <AssemblyTitle>ZipExtractor</AssemblyTitle>
  <Company>RBSoft</Company>
  <Product>ZipExtractor</Product>
- <Copyright>Copyright © 2012-2023 RBSoft</Copyright>
+ <Copyright>Copyright © 2012-2024 RBSoft</Copyright>
  <Version>1.4.0.0</Version>
  <AssemblyVersion>1.4.0.0</AssemblyVersion>
  <FileVersion>1.4.0.0</FileVersion>

diff --git a/appveyor.yml b/appveyor.yml
@@ -22,6 +22,8 @@ install:
  - dotnet publish --framework net6.0-windows "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\build\lib\net6.0-windows7.0"
  - dotnet publish --framework net7.0-windows "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\Resources"
  - dotnet publish --framework net7.0-windows "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\build\lib\net7.0-windows7.0"
+ - dotnet publish --framework net8.0-windows "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\Resources"
+ - dotnet publish --framework net8.0-windows "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\build\lib\net8.0-windows7.0"
  - cmd: 7z a AutoUpdater.NET-%my_version%.zip %APPVEYOR_BUILD_FOLDER%\AutoUpdater.NET\build\lib\*
  - ps: Remove-Item -path c:\projects\AutoUpdater.NET\AutoUpdater.NET\build\lib\* -include runtimes,Microsoft.Web.WebView2*,AutoUpdater.NET.deps.json -Recurse
  - nuget pack "c:\projects\AutoUpdater.NET\AutoUpdater.NET\build\Autoupdater.NET.Official.nuspec"