Skip to content

Commit

Permalink
switch from .NET 6.0 to .NET 8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
striezel committed Nov 9, 2024
1 parent 3dbcca4 commit e84cc48
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Build
run: |
cd $GITHUB_WORKSPACE && pwd && ls -lah
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2
Expand Down Expand Up @@ -70,9 +70,9 @@ jobs:
for /f %%i IN ('git describe --always') do set "VERSION=%%i"
echo Version is %VERSION%.
md updater-%VERSION%
copy updater\bin\Release\net6.0-windows\updater.exe updater-%VERSION%
copy updater\bin\Release\net6.0-windows\updater.dll updater-%VERSION%
copy updater\bin\Release\net6.0-windows\updater.runtimeconfig.json updater-%VERSION%
copy updater\bin\Release\net8.0-windows7.0\updater.exe updater-%VERSION%
copy updater\bin\Release\net8.0-windows7.0\updater.dll updater-%VERSION%
copy updater\bin\Release\net8.0-windows7.0\updater.runtimeconfig.json updater-%VERSION%
copy "%USERPROFILE%\.nuget\packages\nlog\5.3.4\lib\netstandard2.0\NLog.dll" updater-%VERSION%
copy "%USERPROFILE%\.nuget\packages\newtonsoft.json\13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll" updater-%VERSION%
copy LICENSE updater-%VERSION%
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Use the official .NET image, based on Debian.
# See https://hub.docker.com/_/microsoft-dotnet-sdk/ for more info.
image: mcr.microsoft.com/dotnet/sdk:6.0
image: mcr.microsoft.com/dotnet/sdk:8.0

build:
stage: build
Expand Down
10 changes: 10 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ improvements may be omitted.)_

## Next Version

__[breaking change]__

The required version of the .NET is bumped from .NET 6 to .NET 8.
If your system does not have .NET 8 yet, then you can download the .NET 8
runtime at <https://dotnet.microsoft.com/en-us/download/dotnet/8.0/runtime>.
Reason for that change is that Microsoft will end support for .NET 6 on
12th November 2024. From that date onwards, .NET 6 will not receive any
maintenance or security fixes, so this application is switching to .NET 8, the
current Long Term Support release of .NET.

__[maintenance]__

* Update certificate information for WinMerge installers.
Expand Down
2 changes: 1 addition & 1 deletion moz-checksum-generator/moz-checksum-generator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<RootNamespace>moz_checksum_generator</RootNamespace>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
6 changes: 3 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ currently be updated with this application is available

## Prerequisites

To run the `updater` program you need the .NET 6 runtime.
The current .NET 6 runtime can be downloaded from
<https://dotnet.microsoft.com/en-us/download/dotnet/6.0/runtime>.
To run the `updater` program you need the .NET 8 runtime.
The current .NET 8 runtime can be downloaded from
<https://dotnet.microsoft.com/en-us/download/dotnet/8.0/runtime>.

## Usage

Expand Down
6 changes: 3 additions & 3 deletions setup/setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ Name: "uk"; MessagesFile: "compiler:Languages\Ukrainian.isl"

[Files]
;main executable
Source: "..\updater\bin\Release\net6.0-windows\updater.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\updater\bin\Release\net6.0-windows\updater.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\updater\bin\Release\net6.0-windows\updater.runtimeconfig.json"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\updater\bin\Release\net8.0-windows7.0\updater.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\updater\bin\Release\net8.0-windows7.0\updater.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\updater\bin\Release\net8.0-windows7.0\updater.runtimeconfig.json"; DestDir: "{app}"; Flags: ignoreversion
; Newtonsoft.Json assembly (JSON deserialization)
Source: "{#GetEnv('USERPROFILE')}\.nuget\packages\newtonsoft.json\13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
; NLog main assembly (logging)
Expand Down
2 changes: 1 addition & 1 deletion updater-test/updater-test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<RootNamespace>updater_test</RootNamespace>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>disable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion updater/updater.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>disable</Nullable>
<AssemblyVersion>2024.10.25.0</AssemblyVersion>
Expand Down

0 comments on commit e84cc48

Please sign in to comment.