Cross targeting changes for the upcoming 2.0 release. (#1738)

Had an offline chat with @pgrawehr and @raffaeler who approved these changes, so I'm merging this in now.

Documentation/How-to-Deploy-an-IoT-App.md

@@ -33,7 +33,7 @@ This provides information how to prepare a Publish Profile and deploy an applica
           <PublishProtocol>FileSystem</PublishProtocol>
           <Configuration>Release</Configuration>
           <Platform>Any CPU</Platform>
-          <TargetFramework>netcoreapp2.1</TargetFramework>
+          <TargetFramework>netcoreapp3.1</TargetFramework>
           <PublishDir>C:\PublishedApps</PublishDir>
           <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
           <SelfContained>true</SelfContained>

eng/sendToHelix.proj

@@ -12,7 +12,7 @@
 
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
-    <DotNetCliVersion>2.2.300</DotNetCliVersion>
+    <DotNetCliVersion>3.1.405</DotNetCliVersion>
 
     <EnableAzurePipelinesReporter Condition="'$(SYSTEM_ACCESSTOKEN)' != ''">true</EnableAzurePipelinesReporter>
     <TestRunNamePrefix>$(AGENT_JOBNAME)</TestRunNamePrefix>
@@ -34,7 +34,7 @@
   <ItemGroup Condition="'$(TestOS)' == 'Windows_NT'">
     <!-- Xunit project to test -->
     <XUnitProject Include="..\src\System.Device.Gpio.Tests\System.Device.Gpio.Tests.csproj">
-      <TargetFramework>netcoreapp2.1</TargetFramework>
+      <TargetFramework>netcoreapp3.1</TargetFramework>
       <RuntimeTargetFramework>netcoreapp2.0</RuntimeTargetFramework>
     </XUnitProject>
     <!-- Target queues -->
@@ -53,7 +53,7 @@
   <ItemGroup Condition="'$(TestOS)' == 'Unix'">
     <!-- Xunit project to test -->
     <XUnitProject Include="..\src\System.Device.Gpio.Tests\System.Device.Gpio.Tests.csproj">
-      <TargetFramework>netcoreapp2.1</TargetFramework>
+      <TargetFramework>netcoreapp3.1</TargetFramework>
       <RuntimeTargetFramework>netcoreapp2.0</RuntimeTargetFramework>
     </XUnitProject>
     <!-- Target queues -->
@@ -91,4 +91,4 @@
   <PropertyGroup>
     <Language>msbuild</Language>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

global.json

@@ -3,8 +3,7 @@
     "dotnet": "6.0.100",
     "runtimes": {
       "dotnet/x64": [
-        "2.1.25",
-        "5.0.7"
+        "3.1.21"
       ]
     }
   },

samples/bmp280-sensor-azure-iot-hub/DNSensorAzureIoTHub.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Platforms>AnyCPU;ARM32</Platforms>
   </PropertyGroup>
 

samples/bmp280-sensor-azure-iot-hub/Readme.md

@@ -106,7 +106,7 @@ You can deploy and debug your solution or just deploy your solution without debu
 
     ```bash
     dotnet publish -r linux-arm /p:ShowLinkerSizeComparison=true 
-    pushd .\bin\Debug\net5.0\linux-arm\publish
+    pushd .\bin\Debug\net6.0\linux-arm\publish
     pscp -pw 1234 -v -r .\* pi@192.168.1.147:DNSensorAzureIoTHub
     popd
     ```
@@ -117,7 +117,7 @@ You can deploy and debug your solution or just deploy your solution without debu
 
     ```bash
     dotnet publish -r linux-arm   
-    cd .\bin\Debug\net5.0\linux-arm\
+    cd .\bin\Debug\net6.0\linux-arm\
     scp publish\* pi@192.168.1.109:BlinkTutorial
     ```
 

samples/force-sensitive-resistor/force-sensitive-resistor.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

samples/led-animate/led-animate.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

samples/led-blink-multiple/led-blink-multiple.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

samples/led-blink/led-blink.csproj

@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-      <TargetFramework>net5.0</TargetFramework>
+      <TargetFramework>net6.0</TargetFramework>
     <!--
       To target Windows IoT, use the following TargetFramework property instead, or multi-target
-      <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
+      <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
     -->
     <Nullable>enable</Nullable>
   </PropertyGroup>

samples/led-matrix-weather/led-matrix-weather.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

samples/led-more-blinking-lights/led-more-blinking-lights.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

samples/led-shift-register/led-shift-register.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

samples/serialport-arduino/serialport-arduino.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

src/Iot.Device.Bindings/Iot.Device.Bindings.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net5.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;netcoreapp3.1</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <Nullable>enable</Nullable>
     <DefineConstants>$(DefineConstants);BUILDING_IOT_DEVICE_BINDINGS</DefineConstants>

src/System.Device.Gpio.Tests/README.md

@@ -53,7 +53,7 @@ Alternatively, you can run the tests using the xunit console runner, which allow
 XUnit.console.runner is installed as a nuget package on the system in your home directory during the build. From the root of the project directory, execute:
 
 ```shell
-pi@raspberrypi:~/projects/iot $ dotnet exec ~/.nuget/packages/xunit.runner.console/2.4.1/tools/netcoreapp2.0/xunit.console.dll artifacts/bin/System.Device.Gpio.Tests/Debug/netcoreapp2.1/System.Device.Gpio.Tests.dll -notrait "SkipOnTestRun=Windows_NT" -notrait "feature=i2c"
+pi@raspberrypi:~/projects/iot $ dotnet exec ~/.nuget/packages/xunit.runner.console/2.4.1/tools/netcoreapp2.0/xunit.console.dll artifacts/bin/System.Device.Gpio.Tests/Debug/netcoreapp3.1/System.Device.Gpio.Tests.dll -notrait "SkipOnTestRun=Windows_NT" -notrait "feature=i2c"
 ```
 
 This runs the tests excluding the I2C tests (-notrait "feature-i2c") and excluding the Windows tests (-notrait "SkipOnTestRun=Windows_NT").

src/System.Device.Gpio.Tests/System.Device.Gpio.Tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>9</LangVersion>
     <IsPackable>false</IsPackable>
     <!-- Keep quiet about duplicate package references from props files -->

src/System.Device.Gpio/CompatibilitySuppressions.xml

 <?xml version="1.0" encoding="utf-8"?>
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0007</DiagnosticId>
-    <Target>T:System.Device.Gpio.Drivers.HummingBoardDriver</Target>
-    <Left>runtimes/win/lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/netstandard2.0/System.Device.Gpio.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:System.Device.Gpio.Drivers.LibGpiodDriver.#ctor</Target>
-    <Left>runtimes/win/lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/netstandard2.0/System.Device.Gpio.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0007</DiagnosticId>
-    <Target>T:System.Device.Gpio.Drivers.RaspberryPi3Driver</Target>
-    <Left>runtimes/win/lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/netstandard2.0/System.Device.Gpio.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>Windows.Foundation.FoundationContract.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>Windows.Devices.DevicesLowLevelContract.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>Windows.Foundation.UniversalApiContract.dll</Target>
-  </Suppression>
   <Suppression>
     <DiagnosticId>CP1003</DiagnosticId>
-    <Target>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Target>
+    <Target>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Target>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0008</DiagnosticId>
     <Target>T:System.Device.Spi.DataFlow</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:System.Device.Spi.DataFlow.#ctor</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0008</DiagnosticId>
     <Target>T:System.Device.Spi.SpiMode</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:System.Device.Spi.SpiMode.#ctor</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0008</DiagnosticId>
     <Target>T:System.Device.Gpio.PinChangeEventHandler</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0008</DiagnosticId>
     <Target>T:System.Device.Gpio.PinEventTypes</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:System.Device.Gpio.PinEventTypes.#ctor</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0008</DiagnosticId>
     <Target>T:System.Device.Gpio.PinMode</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:System.Device.Gpio.PinMode.#ctor</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0008</DiagnosticId>
     <Target>T:System.Device.Gpio.PinNumberingScheme</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:System.Device.Gpio.PinNumberingScheme.#ctor</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:System.Device.Gpio.PinValue.#ctor</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:System.Device.Gpio.PinValuePair.#ctor</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:System.Device.Gpio.WaitForEventResult.#ctor</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0008</DiagnosticId>
     <Target>T:System.Device.Gpio.Drivers.RaspberryPi3Driver.AltMode</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:System.Device.Gpio.Drivers.RaspberryPi3Driver.AltMode.#ctor</Target>
     <Left>lib/netstandard2.0/System.Device.Gpio.dll</Left>
-    <Right>lib/net5.0-windows10.0.17763/System.Device.Gpio.dll</Right>
+    <Right>lib/net6.0-windows10.0.17763/System.Device.Gpio.dll</Right>
   </Suppression>
   <!--We are changing public key token being used, so the following are baselined:-->
   <Suppression>
@@ -140,6 +107,27 @@
     <Right>lib/netstandard2.0/System.Device.Gpio.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0007</DiagnosticId>
+    <Target>T:System.Device.Gpio.Drivers.HummingBoardDriver</Target>
+    <Left>runtimes/win/lib/netstandard2.0/System.Device.Gpio.dll</Left>
+    <Right>lib/netstandard2.0/System.Device.Gpio.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Device.Gpio.Drivers.LibGpiodDriver.#ctor</Target>
+    <Left>runtimes/win/lib/netstandard2.0/System.Device.Gpio.dll</Left>
+    <Right>lib/netstandard2.0/System.Device.Gpio.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0007</DiagnosticId>
+    <Target>T:System.Device.Gpio.Drivers.RaspberryPi3Driver</Target>
+    <Left>runtimes/win/lib/netstandard2.0/System.Device.Gpio.dll</Left>
+    <Right>lib/netstandard2.0/System.Device.Gpio.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0003</DiagnosticId>
     <Left>runtimes/linux/lib/netstandard2.0/System.Device.Gpio.dll</Left>

src/System.Device.Gpio/System.Device.Gpio.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
-    <TargetFrameworks Condition="$(NETCoreSdkRuntimeIdentifier.StartsWith('win'))">$(TargetFrameworks);net5.0-windows10.0.17763.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="$(NETCoreSdkRuntimeIdentifier.StartsWith('win'))">$(TargetFrameworks);net6.0-windows10.0.17763.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -39,7 +39,7 @@
     </Reference>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net5.0'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
     <!--Remove the Linux-specific code-->
     <Compile Remove="System\Device\Gpio\Drivers\Windows10Driver.notSupported.cs" />
     <Compile Remove="System\Device\I2c\I2cDevice.nonWindows.cs" />
@@ -49,7 +49,7 @@
     <Compile Remove="System\Device\CommonHelpers.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <!--Remove Windows Code-->
     <Compile Remove="Interop\Windows\WinRT\*.cs" />
     <Compile Remove="System\Device\Gpio\Drivers\Windows10DriverPin.cs" />

src/System.Device.Gpio/System/Device/CommonHelpers.cs

@@ -5,7 +5,7 @@ namespace System.Device
 {
     internal static class CommonHelpers
     {
-        private const string WindowsPlatformTargetingFormat = "In order to use {0} on Windows with .NET 5.0 it is required for your application to target net5.0-windows10.0.17763.0 or higher. Please add that to your target frameworks in your project file.";
+        private const string WindowsPlatformTargetingFormat = "In order to use {0} on Windows with .NET 5.0 it is required for your application to target net6.0-windows10.0.17763.0 or higher. Please add that to your target frameworks in your project file.";
 
         public static string GetFormattedWindowsPlatformTargetingErrorMessage(string className)
          => string.Format(WindowsPlatformTargetingFormat, className);

src/System.Device.Gpio/System/Device/Gpio/Drivers/Windows10Driver.notSupported.cs

@@ -15,8 +15,8 @@ namespace System.Device.Gpio.Drivers
         /// </summary>
         public Windows10Driver()
         {
-            // If we land in this method it means the console application is running on Windows and targetting net5.0 (without specifying Windows platform)
-            // In order to call WinRT code in net5.0 it is required for the application to target the specific platform
+            // If we land in this method it means the console application is running on Windows and targetting net6.0 (without specifying Windows platform)
+            // In order to call WinRT code in net6.0 it is required for the application to target the specific platform
             // so we throw the bellow exception with a detailed message in order to instruct the consumer on how to move forward.
             throw new PlatformNotSupportedException(CommonHelpers.GetFormattedWindowsPlatformTargetingErrorMessage(nameof(Windows10Driver)));
         }

src/System.Device.Gpio/System/Device/I2c/I2cBus.nonWindows.cs

@@ -13,8 +13,8 @@ namespace System.Device.I2c
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static I2cBus CreateWindows10I2cBus(int busId)
         {
-            // If we land in this method it means the console application is running on Windows and targetting net5.0 (without specifying Windows platform)
-            // In order to call WinRT code in net5.0 it is required for the application to target the specific platform
+            // If we land in this method it means the console application is running on Windows and targetting net6.0 (without specifying Windows platform)
+            // In order to call WinRT code in net6.0 it is required for the application to target the specific platform
             // so we throw the bellow exception with a detailed message in order to instruct the consumer on how to move forward.
             throw new PlatformNotSupportedException(CommonHelpers.GetFormattedWindowsPlatformTargetingErrorMessage(nameof(I2cDevice)));
         }

src/System.Device.Gpio/System/Device/I2c/I2cDevice.nonWindows.cs

@@ -13,8 +13,8 @@ namespace System.Device.I2c
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static I2cDevice CreateWindows10I2cDevice(I2cConnectionSettings settings)
         {
-            // If we land in this method it means the console application is running on Windows and targetting net5.0 (without specifying Windows platform)
-            // In order to call WinRT code in net5.0 it is required for the application to target the specific platform
+            // If we land in this method it means the console application is running on Windows and targetting net6.0 (without specifying Windows platform)
+            // In order to call WinRT code in net6.0 it is required for the application to target the specific platform
             // so we throw the bellow exception with a detailed message in order to instruct the consumer on how to move forward.
             throw new PlatformNotSupportedException(CommonHelpers.GetFormattedWindowsPlatformTargetingErrorMessage(nameof(I2cDevice)));
         }

src/System.Device.Gpio/System/Device/Pwm/PwmChannel.nonWindows.cs

@@ -13,8 +13,8 @@ namespace System.Device.Pwm
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static PwmChannel CreateWindows10PwmChannel(int chip, int channel, int frequency, double dutyCyclePercentage)
         {
-            // If we land in this method it means the console application is running on Windows and targetting net5.0 (without specifying Windows platform)
-            // In order to call WinRT code in net5.0 it is required for the application to target the specific platform
+            // If we land in this method it means the console application is running on Windows and targetting net6.0 (without specifying Windows platform)
+            // In order to call WinRT code in net6.0 it is required for the application to target the specific platform
             // so we throw the bellow exception with a detailed message in order to instruct the consumer on how to move forward.
             throw new PlatformNotSupportedException(CommonHelpers.GetFormattedWindowsPlatformTargetingErrorMessage(nameof(PwmChannel)));
         }

src/System.Device.Gpio/System/Device/Spi/SpiDevice.nonWindows.cs

@@ -13,8 +13,8 @@ namespace System.Device.Spi
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static SpiDevice CreateWindows10SpiDevice(SpiConnectionSettings settings)
         {
-            // If we land in this method it means the console application is running on Windows and targetting net5.0 (without specifying Windows platform)
-            // In order to call WinRT code in net5.0 it is required for the application to target the specific platform
+            // If we land in this method it means the console application is running on Windows and targetting net6.0 (without specifying Windows platform)
+            // In order to call WinRT code in net6.0 it is required for the application to target the specific platform
             // so we throw the bellow exception with a detailed message in order to instruct the consumer on how to move forward.
             throw new PlatformNotSupportedException(CommonHelpers.GetFormattedWindowsPlatformTargetingErrorMessage(nameof(SpiDevice)));
         }

src/System.Device.Gpio/buildTransitive/net5.0/System.Device.Gpio.targets

 <Project>
   <Target Name="EnsureProjectIsTargetingWindowsPlatformIfRequired"
           BeforeTargets="Build"
-          Condition="'$(TargetFramework)' == 'net5.0' And
+          Condition="'($(TargetFramework)' == 'net6.0' Or $(TargetFramework)' == 'net5.0') And
                      '$(SuppressWindowsPlatformTargetingRequiredError)' == '' And
                      ('$(OutputType)' == 'Exe' Or '$(OutputType)'=='WinExe') And
                      $(RuntimeIdentifier.StartsWith('win'))">
-    <Error Text="In order to use System.Device.Gpio package when running on Windows and targeting net5.0, it is required to add 'net5.0-windows10.0.xxxxx.0' (where xxxxx needs to be a number 17763 or above) to your project's target frameworks. To suppress this error, set the property %3CSuppressWindowsPlatformTargetingRequiredError%3Etrue%3C/SuppressWindowsPlatformTargetingRequiredError%3E in your project." />
+    <Error Text="In order to use System.Device.Gpio package when running on Windows and targeting net5.0 or higher, it is required to add 'net6.0-windows10.0.xxxxx.0' (where xxxxx needs to be a number 17763 or above) to your project's target frameworks. To suppress this error, set the property %3CSuppressWindowsPlatformTargetingRequiredError%3Etrue%3C/SuppressWindowsPlatformTargetingRequiredError%3E in your project." />
   </Target>
 </Project>

src/devices/AD5328/samples/AD5328.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\AD5328.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

src/devices/Ads1115/samples/Ads1115.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="ADS1115_circuit.fzz" />

src/devices/Adxl345/samples/Adxl345.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Adxl345.csproj" />

src/devices/Adxl357/samples/Adxl357.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Adxl357.csproj" />

src/devices/Ags01db/samples/Ags01db.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Ags01db.csproj" />
@@ -12,4 +12,4 @@
     <None Remove="README.md" />
     <None Remove="RunningResult.jpg" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

src/devices/Ahtxx/samples/Ahtxx.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../Ahtxx.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

src/devices/Ak8963/samples/ak8963.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Ak8963.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

src/devices/Amg88xx/samples/Amg88xx.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../Amg88xx.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

src/devices/Amg88xx/tests/Amg88xx.Tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>

src/devices/Arduino/tests/Arduino.Tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>

src/devices/Axp192/samples/Axp192.samples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/Bh1745/samples/Bh1745.Sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   <ItemGroup>

src/devices/Bh1745/samples/Bh1745CustomConfiguration.Sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   <ItemGroup>

src/devices/Bh1750fvi/samples/Bh1750fvi.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Bh1750fvi.csproj" />

src/devices/Bmm150/samples/Bmm150.Sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Bmm150.csproj" />

src/devices/Bmp180/samples/Bmp180.Sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="rpi-bmp180_i2c.fzz" />

src/devices/Bmxx80/samples/Bme280.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   <ItemGroup>

src/devices/Bmxx80/samples/Bme680.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   <ItemGroup>

src/devices/Bmxx80/samples/Bmp280.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   <ItemGroup>

src/devices/Bmxx80/tests/Bmxx80.Tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net48</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <IsPackable>false</IsPackable>

src/devices/Bno055/samples/Bno055.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Bno055.csproj" />

src/devices/Board/samples/Board.Sample.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 

src/devices/Board/tests/Board.Tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>

src/devices/Board/tests/BoardTests.cs

@@ -35,7 +35,7 @@ namespace Iot.Device.Board.Tests
             var board = Board.Create();
             Assert.NotNull(board);
             var property = board.GetType().GetProperty("Initialized", BindingFlags.Instance | BindingFlags.NonPublic)!;
-            Assert.True((bool)property.GetValue(board));
+            Assert.True((bool)property.GetValue(board)!);
             Assert.Equal(PinNumberingScheme.Logical, board.DefaultPinNumberingScheme);
             board.Dispose();
         }

src/devices/BoardLed/samples/BoardLed.Sample.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/BrickPi3/samples/BrickPi3.samples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/Button/samples/Button.samples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/Button/tests/Button.tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>

src/devices/Buzzer/samples/Buzzer.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)../Buzzer.csproj" />

src/devices/Card/Ndef/samples/NdefSamples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />

src/devices/Card/Ndef/tests/Ndef.Tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

src/devices/Ccs811/samples/Ccs811.Sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Ccs811.csproj" />

src/devices/CharacterLcd/samples/CharacterLcd.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../../Mcp23xxx/Mcp23xxx.csproj" />

src/devices/CharacterLcd/tests/CharacterLcd.Tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net48</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <IsPackable>false</IsPackable>

src/devices/Charlieplex/samples/Charlieplex-sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../Charlieplex.csproj" />

src/devices/Charlieplex/tests/Charlieplex.Tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>9</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

src/devices/Common/CommonHelpers.csproj

@@ -20,7 +20,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="FrameworkCompatibilityExtensions.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netstandard2.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="IsExternalInit.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file

src/devices/Common/Iot/Device/Multiplexing/samples/OutputSegment-driver.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/Common/Iot/Device/Multiplexing/tests/OutputSegmentTests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/Common/samples/Common.Samples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/Common/tests/Common.Tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net48</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <IsPackable>false</IsPackable>

src/devices/CpuTemperature/samples/CpuTemperature.Samples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 

src/devices/DCMotor/samples/DCMotor.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)../../SoftPwm\SoftwarePwm.csproj" />

src/devices/Dhtxx/samples/DhtSensor.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)\..\Dhtxx.csproj" />

src/devices/Directory.Build.props

@@ -5,7 +5,8 @@
   <Import Project="../../eng/Versions.external.props" />
   <PropertyGroup>
     <!-- Most projects should use this value to build for all possible target frameworks -->
-    <DefaultBindingTfms>net5.0;netcoreapp2.1;netstandard2.0;</DefaultBindingTfms>
+    <DefaultBindingTfms>net6.0;netcoreapp3.1;netstandard2.0;</DefaultBindingTfms>
+    <DefaultSampleTfms>net6.0</DefaultSampleTfms>
     <NoWarn>$(NoWarn);CS8321</NoWarn>
     <DeterministicSourcePaths>false</DeterministicSourcePaths>
     <IsPackable>false</IsPackable>

src/devices/Display/samples/Large4Digit7SegmentDisplay.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Display.csproj" />

src/devices/ExplorerHat/samples/ExplorerHat.Sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)../ExplorerHat.csproj" />

src/devices/Ft232H/samples/Ft232H.sample.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/GoPiGo3/samples/GoPiGo3.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\GoPiGo3.csproj" />

src/devices/Gpio/samples/Iot.Device.Gpio.Samples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

src/devices/GrovePi/samples/GrovePiDevice.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\GrovePiDevice.csproj" />

src/devices/HardwareMonitor/samples/OpenHardwareMonitor.Samples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/Hcsr04/samples/Hcsr04.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../Hcsr04.csproj" />

src/devices/Hcsr501/samples/Hcsr501.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="circuit.fzz" />

src/devices/Hmc5883l/samples/Hmc5883l.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Hmc5883l.csproj" />

src/devices/Hts221/samples/Hts221.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../Hts221.csproj" />

src/devices/Ili9341/samples/Ili9341.Samples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/Ina219/samples/Ina219.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)\..\Ina219.csproj" />

src/devices/Ip5306/samples/Ip5306.samples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/devices/KeyMatrix/samples/KeyMatrix.Sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\KeyMatrix.csproj" />

src/devices/LidarLiteV3/samples/LidarLiteV3.Sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../LidarLiteV3.csproj" />

src/devices/LiquidLevel/samples/LiquidLevelSwitch.Sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   <ItemGroup>

src/devices/LiquidLevel/samples/Llc200d3sh.Sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
   <ItemGroup>

src/devices/Lm75/samples/Lm75.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Lm75.csproj" />

src/devices/Lps25h/samples/Lps25h.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../Lps25h.csproj" />

src/devices/Lsm9Ds1/samples/Lsm9Ds1.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../Lsm9Ds1.csproj" />

src/devices/Max31856/samples/Max31856.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Max31856.csproj" />

src/devices/Max31865/samples/Max31865.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="MAX31865_circuit.fzz" />

src/devices/Max44009/samples/Max44009.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Max44009.csproj" />

src/devices/Max7219/samples/Max7219.sample.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)/../Max7219.csproj" />

src/devices/Mbi5027/samples/Mbi5027-driver.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../Mbi5027.csproj" />

src/devices/Mcp23xxx/samples/Mcp23xxx.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)\..\Mcp23xxx.csproj" />

src/devices/Mcp23xxx/tests/Mcp23xxx.Tests.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>9</LangVersion>
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>

src/devices/Mcp25xxx/samples/Mcp25xxx.Samples.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(DefaultSampleTfms)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Mcp25xxx.csproj" />