Add support for .NET 6 (#600)

Thanks to @Pomianowski.
This commit is contained in:
Pomian
2021-11-19 11:20:12 +01:00
committed by GitHub
parent f1e5fc2b03
commit 5d8c25a304
5 changed files with 27 additions and 18 deletions
+5 -2
View File
@@ -5,13 +5,16 @@
version: 2
updates:
# LibreHardwareMonitor.csproj
- package-ecosystem: "nuget"
directory: "/LibreHardwareMonitor" #LibreHardwareMonitor.csproj
directory: "/LibreHardwareMonitor"
schedule:
interval: "daily"
open-pull-requests-limit: 10
# LibreHardwareMonitorLib.csproj
- package-ecosystem: "nuget"
directory: "/LibreHardwareMonitorLib" #LibreHardwareMonitorLib.csproj
directory: "/LibreHardwareMonitorLib"
schedule:
interval: "daily"
open-pull-requests-limit: 10
+9 -7
View File
@@ -6,14 +6,16 @@ on:
jobs:
build:
runs-on: windows-latest
runs-on: windows-2022
if: contains(github.event.head_commit.message, 'ci skip') == false
steps:
- uses: actions/checkout@v2
- uses: nuget/setup-nuget@v1
- uses: microsoft/setup-msbuild@v1.0.2
- uses: microsoft/setup-msbuild@v1.1
with:
msbuild-architecture: x64
- uses: dorny/paths-filter@v2
id: changes
with:
@@ -29,20 +31,20 @@ jobs:
if(!$m.Success -or $m.Groups[4].Success -or $m.Groups[5].Success) { $_; }
else { $_ -replace $m.Value, ("<Version>{0}.{1}.{2}-pre${{ github.run_number }}</Version>" -f $m.Groups[1].Value,$m.Groups[2].Value,([convert]::ToInt32($m.Groups[3].Value)+1)); }
} | Set-Content Directory.Build.props
- name: NuGet restore
run: nuget restore LibreHardwareMonitor.sln
- name: Build
run: msbuild LibreHardwareMonitor.sln -p:Configuration=Release -m
- name: Publish net452
uses: actions/upload-artifact@v2
with:
name: LibreHardwareMonitor-net452
path: |
bin/Release/net452
- name: Publish netstandard20
uses: actions/upload-artifact@v2
with:
+10 -6
View File
@@ -6,14 +6,16 @@ on:
jobs:
build:
runs-on: windows-latest
runs-on: windows-2022
if: contains(github.event.head_commit.message, 'ci skip') == false
steps:
- uses: actions/checkout@v2
- uses: nuget/setup-nuget@v1
- uses: microsoft/setup-msbuild@v1.0.2
- uses: microsoft/setup-msbuild@v1.1
with:
msbuild-architecture: x64
- uses: dorny/paths-filter@v2
id: changes
with:
@@ -28,32 +30,34 @@ jobs:
if(!$m.Success -or $m.Groups[4].Success -or $m.Groups[5].Success) { $_; }
else { $_ -replace $m.Value, ("<Version>{0}.{1}.{2}-ci${{ github.run_number }}</Version>" -f $m.Groups[1].Value,$m.Groups[2].Value,([convert]::ToInt32($m.Groups[3].Value)+1)); }
} | Set-Content Directory.Build.props
- name: NuGet restore
run: nuget restore LibreHardwareMonitor.sln
- name: Build
run: msbuild LibreHardwareMonitor.sln -p:Configuration=Release -m
- name: Publish net452
uses: actions/upload-artifact@v2
with:
name: LibreHardwareMonitor-net452
path: |
bin/Release/net452
- name: Publish netstandard20
uses: actions/upload-artifact@v2
with:
name: LibreHardwareMonitorLib-netstandard20
path: |
bin/Release/netstandard2.0
- name: Publish net50
uses: actions/upload-artifact@v2
with:
name: LibreHardwareMonitorLib-net50
path: |
bin/Release/net5.0
- name: Publish nupkg
uses: actions/upload-artifact@v2
with:
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net452;netstandard2.0;net5.0</TargetFrameworks>
<TargetFrameworks>net452;netstandard2.0;net5.0;net6.0</TargetFrameworks>
<AssemblyName>LibreHardwareMonitorLib</AssemblyName>
<RootNamespace>LibreHardwareMonitor</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -38,7 +38,7 @@
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
<PackageReference Include="System.Management" Version="5.0.0" />
+1 -1
View File
@@ -7,7 +7,7 @@ Libre Hardware Monitor, a fork of Open Hardware Monitor, is free software that c
| Name| .NET | Build Status |
| --- | --- | --- |
| **LibreHardwareMonitor** <br /> Windows Forms based application that presents all data in a graphical interface | .NET Framework 4.5.2 | [![Build status](https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/workflows/CI/badge.svg)](https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/actions) |
| **LibreHardwareMonitorLib** <br /> Library that allows you to use all features in your own application | .NET Framework 4.5.2,<br />.NET Standard 2.0,<br />.NET 5.0.0 | [![Build status](https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/workflows/CI/badge.svg)](https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/actions) |
| **LibreHardwareMonitorLib** <br /> Library that allows you to use all features in your own application | .NET Framework 4.5.2,<br />.NET Standard 2.0,<br />.NET 5.0,<br />.NET 6.0 | [![Build status](https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/workflows/CI/badge.svg)](https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/actions) |
## What can you do?
With the help of LibreHardwareMonitor you can read information from devices such as: