Upgrade to .NET 7

SteveDesmond-ca · SteveDesmond-ca · commit 2a07dd9bf2c6 · 2022-11-09T16:38:22.000-05:00
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
 
       - name: Restore
         run: dotnet restore
diff --git a/.github/workflows/CodeQL.yml b/.github/workflows/CodeQL.yml
@@ -50,10 +50,10 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - name: Setup .NET 6
+    - name: Setup .NET 7
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
diff --git a/.github/workflows/Sonar.yml b/.github/workflows/Sonar.yml
@@ -12,10 +12,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup .NET 6
+      - name: Setup .NET 7
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
 
       - name: Install Sonar Scanner
         run: dotnet tool install --global dotnet-sonarscanner
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -14,7 +14,7 @@ jobs:
 
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Run tests
       run: dotnet test
diff --git a/Examples/CLI/CLI.csproj b/Examples/CLI/CLI.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RuntimeIdentifiers>linux-arm</RuntimeIdentifiers>
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
diff --git a/Examples/Components/DotMatrix/DotMatrix.csproj b/Examples/Components/DotMatrix/DotMatrix.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>SimpleGPIO.Examples.Components.DotMatrix</RootNamespace>
diff --git a/Examples/Components/Motor/Motor.csproj b/Examples/Components/Motor/Motor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>SimpleGPIO.Examples.Components.Motor</RootNamespace>
diff --git a/Examples/Components/RGBLED/RGBLED.csproj b/Examples/Components/RGBLED/RGBLED.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>SimpleGPIO.Examples.Components.RGBLED</RootNamespace>
diff --git a/Examples/Components/RotaryEncoder/RotaryEncoder.csproj b/Examples/Components/RotaryEncoder/RotaryEncoder.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/Examples/Components/SevenSegmentDisplay/SevenSegmentDisplay.csproj b/Examples/Components/SevenSegmentDisplay/SevenSegmentDisplay.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>SimpleGPIO.Examples.Components.SevenSegmentDisplay</RootNamespace>
diff --git a/Examples/Components/ShiftRegister/ShiftRegister.csproj b/Examples/Components/ShiftRegister/ShiftRegister.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>SimpleGPIO.Examples.Components.ShiftRegister</RootNamespace>
diff --git a/Examples/Input/Input.csproj b/Examples/Input/Input.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>SimpleGPIO.Examples.Input</RootNamespace>
diff --git a/Examples/PWM/PWM.csproj b/Examples/PWM/PWM.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<RootNamespace>SimpleGPIO.Examples.PWM</RootNamespace>
diff --git a/Examples/Web/Web.csproj b/Examples/Web/Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>SimpleGPIO.Examples.Web</RootNamespace>
diff --git a/SimpleGPIO.Tests/MathTests.cs b/SimpleGPIO.Tests/MathTests.cs
@@ -0,0 +1,21 @@
+using Xunit;
+
+namespace SimpleGPIO.Tests;
+
+public class MathTests
+{
+	[Theory]
+	[InlineData(1, 2, 4, 2)]
+	[InlineData(2, 2, 4, 2)]
+	[InlineData(3, 2, 4, 3)]
+	[InlineData(4, 2, 4, 4)]
+	[InlineData(5, 2, 4, 4)]
+	public void CanClampNumber(int value, int min, int max, int expected)
+	{
+		//act
+		var actual = value.Clamp(min, max);
+
+		//assert
+		Assert.Equal(expected, actual);
+	}
+}
diff --git a/SimpleGPIO.Tests/SimpleGPIO.Tests.csproj b/SimpleGPIO.Tests/SimpleGPIO.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
diff --git a/SimpleGPIO/GPIO/PinInterface.cs b/SimpleGPIO/GPIO/PinInterface.cs
@@ -44,7 +44,7 @@ public double Strength
 		get => _strength;
 		set
 		{
-			_strength = Math.Clamp(value, 0, 100);
+			_strength = value.Clamp(0, 100);
 
 			if (Power == PowerValue.On && _strength == 0)
 			{
@@ -60,7 +60,6 @@ public double Strength
 		}
 	}
 
-
 	protected abstract void RefreshPWM();
 
 	public void Enable() => Enabled = true;
@@ -127,7 +126,7 @@ private async Task RunToggleHalfIteration(Stopwatch stopwatch, long delay)
 	}
 
 
-	private static long Delay(double hz) => (long)(TimeSpan.TicksPerSecond / hz / 2);
+	private static long Delay(double hz) => (long) (TimeSpan.TicksPerSecond / hz / 2);
 
 	public async Task FadeIn(TimeSpan duration) => await FadeTo(100, duration);
 	public async Task FadeOut(TimeSpan duration) => await FadeTo(0, duration);
@@ -139,7 +138,7 @@ public async Task FadeTo(double strength, TimeSpan duration)
 
 		while (timer.Elapsed < duration)
 		{
-			var progress = timer.Elapsed / duration;
+			var progress = timer.Elapsed.TotalMilliseconds / duration.TotalMilliseconds;
 			Strength = initial + (strength - initial) * progress;
 			await Task.Delay(TimeSpan.FromSeconds(1.0 / 60));
 		}
diff --git a/SimpleGPIO/IsExternalInit.cs b/SimpleGPIO/IsExternalInit.cs
@@ -0,0 +1,11 @@
+// ReSharper disable once CheckNamespace
+
+namespace System.Runtime.CompilerServices;
+
+using ComponentModel;
+
+// ReSharper disable once UnusedType.Global
+[EditorBrowsable(EditorBrowsableState.Never)]
+internal static class IsExternalInit
+{
+}
diff --git a/SimpleGPIO/Math.cs b/SimpleGPIO/Math.cs
@@ -0,0 +1,9 @@
+namespace SimpleGPIO;
+
+public static class Math
+{
+	public static T Clamp<T>(this T value, T min, T max) where T : IComparable<T>
+		=> value.CompareTo(min) < 0 ? min
+			: value.CompareTo(max) > 0 ? max
+			: value;
+}
diff --git a/SimpleGPIO/SimpleGPIO.csproj b/SimpleGPIO/SimpleGPIO.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>2.0.0</Version>
-		<TargetFramework>net6.0</TargetFramework>
+		<Version>2.0.1</Version>
+		<TargetFramework>netstandard2.0</TargetFramework>
 		<OutputType>Library</OutputType>
 		<LangVersion>latest</LangVersion>
 		<Description>A simple, low-ceremony GPIO library for all your IoT needs</Description>
