Skip to content

Commit 9e4587d

Browse files
ravibpatelravibpatel
committed
Now targeting .NET Framework 4.6.2 instead of .NET Framework 4.5.
1 parent efba394 commit 9e4587d

File tree

9 files changed

+64
-58
lines changed

9 files changed

+64
-58
lines changed

‎AutoUpdater.NET/AutoUpdater.NET.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<PropertyGroup>
44
<ProjectGuid>{FB9E7E6B-B19F-4F37-A708-2996190CEF13}</ProjectGuid>
55
<OutputType>library</OutputType>
6-
<TargetFrameworks>net45;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
6+
<TargetFrameworks>net462;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
77
<UseWindowsForms>true</UseWindowsForms>
88
<UseWpf>true</UseWpf>
99
<RootNamespace>AutoUpdaterDotNET</RootNamespace>
1010
<AssemblyTitle>AutoUpdater.NET</AssemblyTitle>
1111
<Company>RBSoft</Company>
1212
<Product>AutoUpdater.NET</Product>
1313
<Copyright>Copyright © 2012-2024 RBSoft</Copyright>
14-
<Version>1.8.7.0</Version>
15-
<AssemblyVersion>1.8.7.0</AssemblyVersion>
16-
<FileVersion>1.8.7.0</FileVersion>
17-
<PackageVersion>1.8.7.0</PackageVersion>
14+
<Version>1.9.0.0</Version>
15+
<AssemblyVersion>1.9.0.0</AssemblyVersion>
16+
<FileVersion>1.9.0.0</FileVersion>
17+
<PackageVersion>1.9.0.0</PackageVersion>
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>AutoUpdater.NET.snk</AssemblyOriginatorKeyFile>
2020
<NeutralLanguage>en</NeutralLanguage>
@@ -37,7 +37,7 @@
3737
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
3838
<DebugType>full</DebugType>
3939
</PropertyGroup>
40-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
40+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
4141
<Reference Include="System"/>
4242
<Reference Include="System.Data"/>
4343
<Reference Include="System.Drawing"/>
@@ -47,10 +47,10 @@
4747
<Reference Include="PresentationFramework"/>
4848
<Reference Include="System.Xaml"/>
4949
<Reference Include="System.Runtime.Serialization"/>
50-
<PackageReference Include="Resource.Embedder" Version="1.2.8" PrivateAssets="All"/>
5150
</ItemGroup>
5251
<ItemGroup>
53-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2478.35"/>
52+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41"/>
53+
<PackageReference Include="Resource.Embedder" Version="2.2.0"/>
5454
</ItemGroup>
5555
<ItemGroup>
5656
<EmbeddedResource Update="DownloadUpdateDialog.ar.resx">

‎AutoUpdater.NET/DownloadUpdateDialog.cs‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,10 @@ private void WebClientOnDownloadFileCompleted(object sender, AsyncCompletedEvent
227227
{
228228
processStartInfo = new ProcessStartInfo
229229
{
230-
FileName = "msiexec"
230+
FileName = "msiexec",
231+
Arguments = $"/i \"{tempPath}\""
231232
};
232233

233-
processStartInfo.Arguments = $"/i \"{tempPath}\"";
234234
if (!string.IsNullOrEmpty(installerArgs))
235235
{
236236
processStartInfo.Arguments += $" {installerArgs}";
@@ -287,20 +287,29 @@ private static string BytesToString(long byteCount)
287287

288288
private static void CompareChecksum(string fileName, CheckSum checksum)
289289
{
290-
using var hashAlgorithm =
291-
HashAlgorithm.Create(
292-
string.IsNullOrEmpty(checksum.HashingAlgorithm) ? "MD5" : checksum.HashingAlgorithm);
293-
using FileStream stream = File.OpenRead(fileName);
294-
295-
if (hashAlgorithm == null)
290+
HashAlgorithm hashAlgorithm;
291+
if (string.IsNullOrEmpty(checksum.HashingAlgorithm) || checksum.HashingAlgorithm == "MD5")
296292
{
297-
throw new Exception(Resources.HashAlgorithmNotSupportedMessage);
293+
hashAlgorithm = MD5.Create();
298294
}
295+
else
296+
{
297+
hashAlgorithm = checksum.HashingAlgorithm switch
298+
{
299+
"SHA1" => SHA1.Create(),
300+
"SHA256" => SHA256.Create(),
301+
"SHA384" => SHA384.Create(),
302+
"SHA512" => SHA512.Create(),
303+
_ => throw new NotSupportedException(Resources.HashAlgorithmNotSupportedMessage)
304+
};
305+
}
306+
307+
using FileStream stream = File.OpenRead(fileName);
299308

300309
byte[] hash = hashAlgorithm.ComputeHash(stream);
301310
string fileChecksum = BitConverter.ToString(hash).Replace("-", string.Empty).ToLowerInvariant();
302311

303-
if (fileChecksum == checksum.Value.ToLower())
312+
if (fileChecksum.Equals(checksum.Value, StringComparison.OrdinalIgnoreCase))
304313
{
305314
return;
306315
}

‎AutoUpdater.NET/build/Autoupdater.NET.Official.nuspec‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>Autoupdater.NET.Official</id>
5-
<version>1.8.7.0</version>
5+
<version>1.9.0.0</version>
66
<title>AutoUpdater.NET</title>
77
<authors>rbsoft</authors>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -17,23 +17,23 @@
1717
<copyright>Copyright © 2012-2024 RBSoft</copyright>
1818
<tags>autoupdate updater c# vb wpf winforms</tags>
1919
<dependencies>
20-
<group targetFramework=".NETFramework4.5">
21-
<dependency id="Microsoft.Web.WebView2" version="1.0.2478.35" exclude="Build,Analyzers"/>
20+
<group targetFramework=".NETFramework4.6.2">
21+
<dependency id="Microsoft.Web.WebView2" version="1.0.2535.41" exclude="Build,Analyzers"/>
2222
</group>
2323
<group targetFramework=".NETCoreApp3.1">
24-
<dependency id="Microsoft.Web.WebView2" version="1.0.2478.35" exclude="Build,Analyzers"/>
24+
<dependency id="Microsoft.Web.WebView2" version="1.0.2535.41" exclude="Build,Analyzers"/>
2525
</group>
2626
<group targetFramework="net5.0-windows7.0">
27-
<dependency id="Microsoft.Web.WebView2" version="1.0.2478.35" exclude="Build,Analyzers"/>
27+
<dependency id="Microsoft.Web.WebView2" version="1.0.2535.41" exclude="Build,Analyzers"/>
2828
</group>
2929
<group targetFramework="net6.0-windows7.0">
30-
<dependency id="Microsoft.Web.WebView2" version="1.0.2478.35" exclude="Build,Analyzers"/>
30+
<dependency id="Microsoft.Web.WebView2" version="1.0.2535.41" exclude="Build,Analyzers"/>
3131
</group>
3232
<group targetFramework="net7.0-windows7.0">
33-
<dependency id="Microsoft.Web.WebView2" version="1.0.2478.35" exclude="Build,Analyzers"/>
33+
<dependency id="Microsoft.Web.WebView2" version="1.0.2535.41" exclude="Build,Analyzers"/>
3434
</group>
3535
<group targetFramework="net8.0-windows7.0">
36-
<dependency id="Microsoft.Web.WebView2" version="1.0.2478.35" exclude="Build,Analyzers"/>
36+
<dependency id="Microsoft.Web.WebView2" version="1.0.2535.41" exclude="Build,Analyzers"/>
3737
</group>
3838
</dependencies>
3939
<frameworkReferences>
@@ -52,23 +52,23 @@
5252
<group targetFramework="net8.0-windows7.0">
5353
<frameworkReference name="Microsoft.WindowsDesktop.App"/>
5454
</group>
55-
<group targetFramework=".NETFramework4.5"/>
55+
<group targetFramework=".NETFramework4.6.2"/>
5656
</frameworkReferences>
5757
<frameworkAssemblies>
58-
<frameworkAssembly assemblyName="PresentationFramework" targetFramework=".NETFramework4.5"/>
59-
<frameworkAssembly assemblyName="System.Data" targetFramework=".NETFramework4.5"/>
60-
<frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5"/>
61-
<frameworkAssembly assemblyName="System.Drawing" targetFramework=".NETFramework4.5"/>
62-
<frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.5"/>
63-
<frameworkAssembly assemblyName="System.Windows.Forms" targetFramework=".NETFramework4.5"/>
64-
<frameworkAssembly assemblyName="System.Xaml" targetFramework=".NETFramework4.5"/>
65-
<frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.5"/>
66-
<frameworkAssembly assemblyName="WindowsBase" targetFramework=".NETFramework4.5"/>
58+
<frameworkAssembly assemblyName="PresentationFramework" targetFramework=".NETFramework4.6.2"/>
59+
<frameworkAssembly assemblyName="System.Data" targetFramework=".NETFramework4.6.2"/>
60+
<frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6.2"/>
61+
<frameworkAssembly assemblyName="System.Drawing" targetFramework=".NETFramework4.6.2"/>
62+
<frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.6.2"/>
63+
<frameworkAssembly assemblyName="System.Windows.Forms" targetFramework=".NETFramework4.6.2"/>
64+
<frameworkAssembly assemblyName="System.Xaml" targetFramework=".NETFramework4.6.2"/>
65+
<frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.6.2"/>
66+
<frameworkAssembly assemblyName="WindowsBase" targetFramework=".NETFramework4.6.2"/>
6767
</frameworkAssemblies>
6868
</metadata>
6969
<files>
7070
<file src="..\..\README.md" target="docs\"/>
71-
<file src="lib\net45\**\*.*" target="lib\net45\"/>
71+
<file src="lib\net462\**\*.*" target="lib\net462\"/>
7272
<file src="lib\netcoreapp3.1\**\*.*" target="lib\netcoreapp3.1\"/>
7373
<file src="lib\net5.0-windows7.0\**\*.*" target="lib\net5.0-windows7.0\"/>
7474
<file src="lib\net6.0-windows7.0\**\*.*" target="lib\net6.0-windows7.0\"/>

‎AutoUpdaterTest/AutoUpdaterTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</EmbeddedResource>
3737
</ItemGroup>
3838

39-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
39+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
4040
<Reference Include="System.Core"/>
4141
</ItemGroup>
4242
</Project>

‎README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ PM> Install-Package Autoupdater.NET.Official
1313

1414
## Supported .NET versions
1515

16-
* .NET Framework 4.5 or above
16+
* .NET Framework 4.6.2 or above
1717
* .NET Core 3.1
1818
* .NET 5.0 or above
1919

@@ -565,7 +565,7 @@ You can follow below steps to build the project on your local development enviro
565565
Before
566566

567567
```xml
568-
<TargetFrameworks>net45;netcoreapp3.1;net5.0-windows</TargetFrameworks>
568+
<TargetFrameworks>net462;netcoreapp3.1;net5.0-windows</TargetFrameworks>
569569
```
570570

571571
After
@@ -578,6 +578,3 @@ You can follow below steps to build the project on your local development enviro
578578
for .NET Core 3.1 or above, you have to use publish command instead of build as
579579
shown [here](https://learn.microsoft.com/en-us/dotnet/core/tutorials/publishing-with-visual-studio?pivots=dotnet-7-0)
580580
and copy the resulting executable to "AutoUpdater.NET/Resources" folder.
581-
* 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
582-
supported .NET version, or you have to follow steps from [here](https://stackoverflow.com/a/70109092/1273550) to use
583-
.NET Framework 4.5.

‎ZipExtractor/FormMain.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ private void FormMain_Shown(object sender, EventArgs e)
253253
_backgroundWorker.ProgressChanged += (_, eventArgs) =>
254254
{
255255
progressBar.Value = eventArgs.ProgressPercentage;
256-
textBoxInformation.Text = eventArgs.UserState?.ToString();
256+
textBoxInformation.Text = eventArgs.UserState?.ToString() ?? string.Empty;
257257
if (textBoxInformation.Text == null)
258258
{
259259
return;

‎ZipExtractor/ZipExtractor.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<PropertyGroup>
44
<ProjectGuid>{91DE558C-6DB8-429B-A069-C0491DCFF15B}</ProjectGuid>
55
<OutputType>WinExe</OutputType>
6-
<TargetFrameworks>net45;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
6+
<TargetFrameworks>net462;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
77
<UseWindowsForms>true</UseWindowsForms>
88
<AssemblyTitle>ZipExtractor</AssemblyTitle>
99
<Company>RBSoft</Company>
1010
<Product>ZipExtractor</Product>
1111
<Copyright>Copyright © 2012-2024 RBSoft</Copyright>
12-
<Version>1.4.1.0</Version>
13-
<AssemblyVersion>1.4.1.0</AssemblyVersion>
14-
<FileVersion>1.4.1.0</FileVersion>
15-
<ApplicationVersion>1.4.1.0</ApplicationVersion>
12+
<Version>1.5.0.0</Version>
13+
<AssemblyVersion>1.5.0.0</AssemblyVersion>
14+
<FileVersion>1.5.0.0</FileVersion>
15+
<ApplicationVersion>1.5.0.0</ApplicationVersion>
1616
<ApplicationIcon>ZipExtractor.ico</ApplicationIcon>
1717
<ApplicationManifest>app.manifest</ApplicationManifest>
1818
<SignAssembly>true</SignAssembly>
@@ -21,7 +21,7 @@
2121
<LangVersion>default</LangVersion>
2222
<IsPackable>false</IsPackable>
2323
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(TargetFramework)' != 'net45' ">
24+
<PropertyGroup Condition=" '$(TargetFramework)' != 'net462' ">
2525
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
2626
<PublishSingleFile>true</PublishSingleFile>
2727
<SelfContained>false</SelfContained>
@@ -39,7 +39,7 @@
3939
<DebugType>none</DebugType>
4040
<DebugSymbols>false</DebugSymbols>
4141
</PropertyGroup>
42-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
42+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
4343
<Reference Include="System.IO.Compression"/>
4444
<Reference Include="System.IO.Compression.FileSystem"/>
4545
<Reference Include="System.Windows.Forms"/>

‎appveyor.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
version: 1.8.7.{build}
1+
version: 1.9.0.{build}
22
environment:
3-
my_version: 1.8.7
3+
my_version: 1.9.0
44
my_secret:
55
secure: vbPRaZLQYpGPr4BrZZ4p6TofpSZMud+FKtlpqjgO8aA=
66
skip_branch_with_pr: true
@@ -12,8 +12,8 @@ install:
1212
- cmd: nuget restore
1313
- secure-file\tools\secure-file -decrypt "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.snk.enc" -secret %my_secret%
1414
- secure-file\tools\secure-file -decrypt "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.snk.enc" -secret %my_secret%
15-
- msbuild "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" /p:TargetFramework=net45;Configuration=Release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
16-
- msbuild "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" /p:OutputPath=build\lib\net45;TargetFramework=net45;Configuration=Release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
15+
- msbuild "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" /p:TargetFramework=net462;Configuration=Release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
16+
- msbuild "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" /p:OutputPath=build\lib\net462;TargetFramework=net462;Configuration=Release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
1717
- dotnet publish --configuration Release --framework netcoreapp3.1 "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\Resources"
1818
- dotnet publish --configuration Release --framework netcoreapp3.1 "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\build\lib\netcoreapp3.1"
1919
- dotnet publish --configuration Release --framework net5.0-windows "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" --output "c:\projects\AutoUpdater.NET\AutoUpdater.NET\Resources"

‎build.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
:: .NET Framework 4.5
2-
msbuild "ZipExtractor\ZipExtractor.csproj" /p:TargetFramework=net45;Configuration=Release /verbosity:minimal
3-
msbuild "AutoUpdater.NET\AutoUpdater.NET.csproj" /p:OutputPath=build\lib\net45;TargetFramework=net45;Configuration=Release /verbosity:minimal
1+
:: .NET Framework 4.6.2
2+
msbuild "ZipExtractor\ZipExtractor.csproj" /p:TargetFramework=net462;Configuration=Release /verbosity:minimal
3+
msbuild "AutoUpdater.NET\AutoUpdater.NET.csproj" /p:OutputPath=build\lib\net462;TargetFramework=net462;Configuration=Release /verbosity:minimal
44

55
:: .NET Core 3.1
66
dotnet publish --configuration Release --framework netcoreapp3.1 "ZipExtractor\ZipExtractor.csproj" --output "AutoUpdater.NET\Resources"

0 commit comments

Comments
 (0)