diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2dca1de..687cadc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -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 diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 0cc221d..1c07d67 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -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, ("{0}.{1}.{2}-pre${{ github.run_number }}" -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: diff --git a/.github/workflows/pull requests.yml b/.github/workflows/pull requests.yml index 1b96c68..a106a41 100644 --- a/.github/workflows/pull requests.yml +++ b/.github/workflows/pull requests.yml @@ -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, ("{0}.{1}.{2}-ci${{ github.run_number }}" -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: diff --git a/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj b/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj index 4f270ae..667f540 100644 --- a/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj +++ b/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj @@ -1,6 +1,6 @@  - net452;netstandard2.0;net5.0 + net452;netstandard2.0;net5.0;net6.0 LibreHardwareMonitorLib LibreHardwareMonitor true @@ -38,7 +38,7 @@ - + diff --git a/README.md b/README.md index c05e5fc..0d607aa 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Libre Hardware Monitor, a fork of Open Hardware Monitor, is free software that c | Name| .NET | Build Status | | --- | --- | --- | | **LibreHardwareMonitor**
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**
Library that allows you to use all features in your own application | .NET Framework 4.5.2,
.NET Standard 2.0,
.NET 5.0.0 | [![Build status](https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/workflows/CI/badge.svg)](https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/actions) | +| **LibreHardwareMonitorLib**
Library that allows you to use all features in your own application | .NET Framework 4.5.2,
.NET Standard 2.0,
.NET 5.0,
.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: