ZipExtractor binary compiled using .NET Framework was bundled with al…

…l version of .NET Core libraries. Fixed the build process to remedy this issue.
ravibpatel · Nov 8, 2023 · dbc59d0 · dbc59d0
1 parent 7b24dc7
commit dbc59d0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/AutoUpdater.NET/AutoUpdater.NET.csproj b/AutoUpdater.NET/AutoUpdater.NET.csproj
@@ -11,10 +11,10 @@
  <Company>RBSoft</Company>
  <Product>AutoUpdater.NET</Product>
  <Copyright>Copyright © 2012-2023 RBSoft</Copyright>
- <Version>1.8.4.0</Version>
- <AssemblyVersion>1.8.4.0</AssemblyVersion>
- <FileVersion>1.8.4.0</FileVersion>
- <PackageVersion>1.8.4.0</PackageVersion>
+ <Version>1.8.5.0</Version>
+ <AssemblyVersion>1.8.5.0</AssemblyVersion>
+ <FileVersion>1.8.5.0</FileVersion>
+ <PackageVersion>1.8.5.0</PackageVersion>
  <SignAssembly>true</SignAssembly>
  <AssemblyOriginatorKeyFile>AutoUpdater.NET.snk</AssemblyOriginatorKeyFile>
  <NeutralLanguage>en</NeutralLanguage>
@@ -51,6 +51,6 @@
  <PackageReference Include="Resource.Embedder" Version="1.2.8" PrivateAssets="All"/>
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1823.32"/>
+ <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2151.40"/>
  </ItemGroup>
 </Project>
diff --git a/AutoUpdater.NET/build/Autoupdater.NET.Official.nuspec b/AutoUpdater.NET/build/Autoupdater.NET.Official.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http:https://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
  <metadata>
  <id>Autoupdater.NET.Official</id>
- <version>1.8.4.0</version>
+ <version>1.8.5.0</version>
  <title>AutoUpdater.NET</title>
  <authors>rbsoft</authors>
  <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -17,16 +17,19 @@
  <tags>autoupdate updater c# vb wpf winforms</tags>
  <dependencies>
  <group targetFramework=".NETFramework4.5">
- <dependency id="Microsoft.Web.WebView2" version="1.0.1823.32" exclude="Build,Analyzers"/>
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2151.40" exclude="Build,Analyzers"/>
  </group>
  <group targetFramework=".NETCoreApp3.1">
- <dependency id="Microsoft.Web.WebView2" version="1.0.1823.32" exclude="Build,Analyzers"/>
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2151.40" exclude="Build,Analyzers"/>
  </group>
  <group targetFramework="net5.0-windows7.0">
- <dependency id="Microsoft.Web.WebView2" version="1.0.1823.32" exclude="Build,Analyzers"/>
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2151.40" exclude="Build,Analyzers"/>
  </group>
  <group targetFramework="net6.0-windows7.0">
- <dependency id="Microsoft.Web.WebView2" version="1.0.1823.32" exclude="Build,Analyzers"/>
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2151.40" exclude="Build,Analyzers"/>
+ </group>
+ <group targetFramework="net7.0-windows7.0">
+ <dependency id="Microsoft.Web.WebView2" version="1.0.2151.40" exclude="Build,Analyzers"/>
  </group>
  </dependencies>
  <frameworkReferences>
@@ -39,6 +42,9 @@
  <group targetFramework="net6.0-windows7.0">
  <frameworkReference name="Microsoft.WindowsDesktop.App"/>
  </group>
+ <group targetFramework="net7.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>net45</TargetFramework>
+ <TargetFramework>net7.0-windows</TargetFramework>
  <Nullable>enable</Nullable>
  <UseWPF>true</UseWPF>
  <LangVersion>latest</LangVersion>
@@ -36,4 +36,7 @@
  </EmbeddedResource>
  </ItemGroup>
 
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+ <Reference Include="System.Core"/>
+ </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -574,7 +574,7 @@ You can follow below steps to build the project on your local development enviro
  <TargetFramework>net5.0-windows</TargetFramework>
  ```
 
-* Build ZipExtractor project in "Release" configuration to create the executable in Resources folder.
+* Build ZipExtractor project in "Release" configuration to create the executable in Resources folder. While compiling it for .NET Core 3.1 or above, you have to use publish command instead of build as shown [here](https://learn.microsoft.com/en-us/dotnet/core/tutorials/publishing-with-visual-studio?pivots=dotnet-7-0) and copy the resulting executable to "AutoUpdater.NET/Resources" folder.
 * VS2022 doesn't allow building .NET Framework 4.5 by default, so if you are using it then you can just change it to any
  supported .NET version, or you have to follow steps from [here](https://stackoverflow.com/a/70109092/1273550) to use
  .NET Framework 4.5. 
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
-version: 1.8.4.{build}
+version: 1.8.5.{build}
 environment:
- my_version: 1.8.4
+ my_version: 1.8.5
  my_secret:
  secure: vbPRaZLQYpGPr4BrZZ4p6TofpSZMud+FKtlpqjgO8aA=
 skip_branch_with_pr: true
@@ -14,13 +14,13 @@ install:
  - secure-file\tools\secure-file -decrypt "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.snk.enc" -secret %my_secret%
  - msbuild "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" /p:TargetFramework=net45;Configuration=Release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
  - msbuild "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" /p:TargetFramework=net45;Configuration=Release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
- - dotnet publish --framework netcoreapp3.1 "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" --output "c:\projects\AutoUpdater.NET\Resources"
+ - dotnet publish --framework netcoreapp3.1 "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\Resources"
  - dotnet publish --framework netcoreapp3.1 "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\build\lib\netcoreapp3.1"
- - dotnet publish --framework net5.0-windows "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" --output "c:\projects\AutoUpdater.NET\Resources"
+ - dotnet publish --framework net5.0-windows "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\Resources"
  - dotnet publish --framework net5.0-windows "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\build\lib\net5.0-windows7.0"
- - dotnet publish --framework net6.0-windows "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" --output "c:\projects\AutoUpdater.NET\Resources"
+ - dotnet publish --framework net6.0-windows "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\Resources"
  - 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\Resources"
+ - 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"
  - 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