Ver Fonte

Merge pull request #271 from nickbabcock/bump-libre

Bump LibreHardwareMonitor and upgrade to Net 6.0
Nick Babcock há 3 anos atrás
pai
commit
a7f2095e80

+ 1 - 1
.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
         submodules: true
         submodules: true
     - uses: actions/setup-dotnet@v1
     - uses: actions/setup-dotnet@v1
       with:
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '6.0.*'
     - run: dotnet test
     - run: dotnet test
       if: matrix.os == 'ubuntu-latest'
       if: matrix.os == 'ubuntu-latest'
     - run: dotnet test --filter 'Category!=integration'
     - run: dotnet test --filter 'Category!=integration'

+ 1 - 1
.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         submodules: true
         submodules: true
     - uses: actions/setup-dotnet@v1
     - uses: actions/setup-dotnet@v1
       with:
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '6.0.*'
     - run: dotnet publish -c Release .\OhmGraphite\
     - run: dotnet publish -c Release .\OhmGraphite\
     - name: Set artifact name
     - name: Set artifact name
       shell: bash
       shell: bash

+ 1 - 1
LibreHardwareMonitor

@@ -1 +1 @@
-Subproject commit 1701eb91b2e11d8ccefa31fca27d490134e9df8e
+Subproject commit d3a38bfa9aed1e23b1ce6b43acbe4156f4d6f481

+ 1 - 1
OhmGraphite.Test/OhmGraphite.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <Project Sdk="Microsoft.NET.Sdk">
 
 
   <PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>8</LangVersion>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
   </PropertyGroup>
 
 

+ 2 - 2
OhmGraphite/OhmGraphite.csproj

@@ -2,11 +2,11 @@
 
 
   <PropertyGroup>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>true</SelfContained>
     <SelfContained>true</SelfContained>
-    <PublishTrimmed>true</PublishTrimmed>
+    <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <PlatformTarget>AnyCPU</PlatformTarget>