diff --git a/Archive/GpioChangeCounter/GpioChangeCounter.sln b/Archive/GpioChangeCounter/GpioChangeCounter.sln
index 929a62e97..a6ab74f9f 100644
--- a/Archive/GpioChangeCounter/GpioChangeCounter.sln
+++ b/Archive/GpioChangeCounter/GpioChangeCounter.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.421
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "GpioChangeCounter", "GpioChangeCounter\GpioChangeCounter.nfproj", "{4FD0EEFE-B90A-43E7-9FDD-17FA413F2A44}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GpioChangeCounter", "GpioChangeCounter\GpioChangeCounter.csproj", "{4FD0EEFE-B90A-43E7-9FDD-17FA413F2A44}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Archive/GpioChangeCounter/GpioChangeCounter/GpioChangeCounter.csproj b/Archive/GpioChangeCounter/GpioChangeCounter/GpioChangeCounter.csproj
new file mode 100644
index 000000000..454d5082d
--- /dev/null
+++ b/Archive/GpioChangeCounter/GpioChangeCounter/GpioChangeCounter.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ChangeCounter</RootNamespace>
+    <AssemblyName>ChangeCounter</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Windows.Devices.Gpio" Version="1.5.5" />
+    <PackageReference Include="nanoFramework.Windows.Devices.Pwm" Version="1.6.2" />
+  </ItemGroup>
+
+</Project>
diff --git a/Archive/GpioChangeCounter/GpioChangeCounter/GpioChangeCounter.nfproj b/Archive/GpioChangeCounter/GpioChangeCounter/GpioChangeCounter.nfproj
deleted file mode 100644
index bd249edfc..000000000
--- a/Archive/GpioChangeCounter/GpioChangeCounter/GpioChangeCounter.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>4fd0eefe-b90a-43e7-9fdd-17fa413f2a44</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ChangeCounter</RootNamespace>
-    <AssemblyName>ChangeCounter</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.Gpio, Version=1.5.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Devices.Gpio.1.5.5\lib\Windows.Devices.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.Pwm, Version=1.6.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Devices.Pwm.1.6.2\lib\Windows.Devices.Pwm.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Archive/GpioChangeCounter/GpioChangeCounter/Properties/AssemblyInfo.cs b/Archive/GpioChangeCounter/GpioChangeCounter/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/Archive/GpioChangeCounter/GpioChangeCounter/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Archive/GpioChangeCounter/GpioChangeCounter/packages.config b/Archive/GpioChangeCounter/GpioChangeCounter/packages.config
deleted file mode 100644
index f5a80cfb3..000000000
--- a/Archive/GpioChangeCounter/GpioChangeCounter/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Devices.Gpio" version="1.5.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Windows.Devices.Pwm" version="1.6.2" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/Archive/Storage/AccessRemovableDevices/AccessRemovableDevices.csproj b/Archive/Storage/AccessRemovableDevices/AccessRemovableDevices.csproj
new file mode 100644
index 000000000..38132a4e7
--- /dev/null
+++ b/Archive/Storage/AccessRemovableDevices/AccessRemovableDevices.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AccessSDcard</RootNamespace>
+    <AssemblyName>AccessSDcard</AssemblyName>
+    <Name>AccessRemovableDevices</Name>
+    <NF_GenerateStubsRootName>AccessRemovableDevices</NF_GenerateStubsRootName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Runtime" Version="1.0.28" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.Windows.Storage" Version="1.5.62" />
+    <PackageReference Include="nanoFramework.Windows.Storage.Streams" Version="1.14.44" />
+  </ItemGroup>
+
+</Project>
diff --git a/Archive/Storage/AccessRemovableDevices/AccessRemovableDevices.nfproj b/Archive/Storage/AccessRemovableDevices/AccessRemovableDevices.nfproj
deleted file mode 100644
index 8179048de..000000000
--- a/Archive/Storage/AccessRemovableDevices/AccessRemovableDevices.nfproj
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>59548c76-0b49-46c7-a5e8-3a956a5b5daf</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AccessSDcard</RootNamespace>
-    <AssemblyName>AccessSDcard</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <Name>AccessRemovableDevices</Name>
-  </PropertyGroup>
-  <PropertyGroup Label="nanoFramework">
-    <NF_GenerateStubsRootName>AccessRemovableDevices</NF_GenerateStubsRootName>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Runtime, Version=1.0.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Runtime.1.0.28\lib\nanoFramework.System.Runtime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Storage, Version=1.5.62.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Storage.1.5.62\lib\Windows.Storage.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Storage.Streams, Version=1.14.44.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Storage.Streams.1.14.44\lib\Windows.Storage.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Archive/Storage/AccessRemovableDevices/Properties/AssemblyInfo.cs b/Archive/Storage/AccessRemovableDevices/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/Archive/Storage/AccessRemovableDevices/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Archive/Storage/AccessRemovableDevices/packages.config b/Archive/Storage/AccessRemovableDevices/packages.config
deleted file mode 100644
index 7f2cc02e1..000000000
--- a/Archive/Storage/AccessRemovableDevices/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Runtime" version="1.0.28" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Storage" version="1.5.62" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Storage.Streams" version="1.14.44" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/Archive/Storage/FileAccess/FileAccess.csproj b/Archive/Storage/FileAccess/FileAccess.csproj
new file mode 100644
index 000000000..9e373085f
--- /dev/null
+++ b/Archive/Storage/FileAccess/FileAccess.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>FileAccess</RootNamespace>
+    <AssemblyName>FileAccess</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Runtime" Version="1.0.28" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.Windows.Storage" Version="1.5.62" />
+    <PackageReference Include="nanoFramework.Windows.Storage.Streams" Version="1.14.44" />
+  </ItemGroup>
+
+</Project>
diff --git a/Archive/Storage/FileAccess/FileAccess.nfproj b/Archive/Storage/FileAccess/FileAccess.nfproj
deleted file mode 100644
index 0d850fb95..000000000
--- a/Archive/Storage/FileAccess/FileAccess.nfproj
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{27187DF4-1F7E-49CC-AC16-BE194C1E1CCD}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>FileAccess</RootNamespace>
-    <AssemblyName>FileAccess</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="ScenarioA_UnmountDevice.cs" />
-    <Compile Include="Scenario7_RenameFolder.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Scenario0_MountDevice.cs" />
-    <Compile Include="Scenario3_WriteAndReadTextInAFile.cs" />
-    <Compile Include="Scenario2_CreateAFileInStorage.cs" />
-    <Compile Include="Scenario1_CreateAFolderInStorage.cs" />
-    <Compile Include="Scenario5_CreateMultiLevelFolders.cs" />
-    <Compile Include="Scenario6_CreateFilesInFolder.cs" />
-    <Compile Include="Scenario8_DeleteFIlesAndFolders.cs" />
-    <Compile Include="Scenario9_RenameFile.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Runtime, Version=1.0.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Runtime.1.0.28\lib\nanoFramework.System.Runtime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Storage, Version=1.5.62.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Storage.1.5.62\lib\Windows.Storage.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Storage.Streams, Version=1.14.44.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Storage.Streams.1.14.44\lib\Windows.Storage.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Archive/Storage/FileAccess/Properties/AssemblyInfo.cs b/Archive/Storage/FileAccess/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/Archive/Storage/FileAccess/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Archive/Storage/FileAccess/packages.config b/Archive/Storage/FileAccess/packages.config
deleted file mode 100644
index fc022bf64..000000000
--- a/Archive/Storage/FileAccess/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Runtime" version="1.0.28" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Storage" version="1.5.62" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Storage.Streams" version="1.14.44" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/Archive/Storage/MountDevices/MountDevices.csproj b/Archive/Storage/MountDevices/MountDevices.csproj
new file mode 100644
index 000000000..ccb327737
--- /dev/null
+++ b/Archive/Storage/MountDevices/MountDevices.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>MountDevices</RootNamespace>
+    <AssemblyName>MountDevices</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Runtime" Version="1.0.28" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.Windows.Storage" Version="1.5.62" />
+    <PackageReference Include="nanoFramework.Windows.Storage.Streams" Version="1.14.44" />
+  </ItemGroup>
+
+</Project>
diff --git a/Archive/Storage/MountDevices/MountDevices.nfproj b/Archive/Storage/MountDevices/MountDevices.nfproj
deleted file mode 100644
index 95c9db685..000000000
--- a/Archive/Storage/MountDevices/MountDevices.nfproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>829ebaf9-1bba-41c7-9175-7944cf001c9c</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>MountDevices</RootNamespace>
-    <AssemblyName>MountDevices</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Runtime, Version=1.0.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Runtime.1.0.28\lib\nanoFramework.System.Runtime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Storage, Version=1.5.62.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Storage.1.5.62\lib\Windows.Storage.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Storage.Streams, Version=1.14.44.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Storage.Streams.1.14.44\lib\Windows.Storage.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Archive/Storage/MountDevices/Properties/AssemblyInfo.cs b/Archive/Storage/MountDevices/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/Archive/Storage/MountDevices/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Archive/Storage/MountDevices/packages.config b/Archive/Storage/MountDevices/packages.config
deleted file mode 100644
index 7f2cc02e1..000000000
--- a/Archive/Storage/MountDevices/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Runtime" version="1.0.28" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Storage" version="1.5.62" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Storage.Streams" version="1.14.44" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/Archive/Storage/RemovableDeviceEvent/Properties/AssemblyInfo.cs b/Archive/Storage/RemovableDeviceEvent/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/Archive/Storage/RemovableDeviceEvent/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Archive/Storage/RemovableDeviceEvent/RemovableDeviceEvent.csproj b/Archive/Storage/RemovableDeviceEvent/RemovableDeviceEvent.csproj
new file mode 100644
index 000000000..2ab219ac6
--- /dev/null
+++ b/Archive/Storage/RemovableDeviceEvent/RemovableDeviceEvent.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>RemovableDeviceEvent</RootNamespace>
+    <AssemblyName>RemovableDeviceEvent</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Runtime" Version="1.0.28" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.Windows.Storage" Version="1.5.62" />
+    <PackageReference Include="nanoFramework.Windows.Storage.Streams" Version="1.14.44" />
+  </ItemGroup>
+
+</Project>
diff --git a/Archive/Storage/RemovableDeviceEvent/RemovableDeviceEvent.nfproj b/Archive/Storage/RemovableDeviceEvent/RemovableDeviceEvent.nfproj
deleted file mode 100644
index e647fe12f..000000000
--- a/Archive/Storage/RemovableDeviceEvent/RemovableDeviceEvent.nfproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>4464304e-8a03-4076-8605-cbb29040a88a</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>RemovableDeviceEvent</RootNamespace>
-    <AssemblyName>RemovableDeviceEvent</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Runtime, Version=1.0.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Runtime.1.0.28\lib\nanoFramework.System.Runtime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Storage, Version=1.5.62.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Storage.1.5.62\lib\Windows.Storage.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Storage.Streams, Version=1.14.44.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Storage.Streams.1.14.44\lib\Windows.Storage.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Archive/Storage/RemovableDeviceEvent/packages.config b/Archive/Storage/RemovableDeviceEvent/packages.config
deleted file mode 100644
index 7f2cc02e1..000000000
--- a/Archive/Storage/RemovableDeviceEvent/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Runtime" version="1.0.28" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Storage" version="1.5.62" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Storage.Streams" version="1.14.44" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/Archive/Storage/Storage.sln b/Archive/Storage/Storage.sln
index 201ccdcd2..8f707692d 100644
--- a/Archive/Storage/Storage.sln
+++ b/Archive/Storage/Storage.sln
@@ -2,13 +2,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "FileAccess", "FileAccess\FileAccess.nfproj", "{27187DF4-1F7E-49CC-AC16-BE194C1E1CCD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileAccess", "FileAccess\FileAccess.csproj", "{27187DF4-1F7E-49CC-AC16-BE194C1E1CCD}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AccessRemovableDevices", "AccessRemovableDevices\AccessRemovableDevices.nfproj", "{59548C76-0B49-46C7-A5E8-3A956A5B5DAF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessRemovableDevices", "AccessRemovableDevices\AccessRemovableDevices.csproj", "{59548C76-0B49-46C7-A5E8-3A956A5B5DAF}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "RemovableDeviceEvent", "RemovableDeviceEvent\RemovableDeviceEvent.nfproj", "{4464304E-8A03-4076-8605-CBB29040A88A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RemovableDeviceEvent", "RemovableDeviceEvent\RemovableDeviceEvent.csproj", "{4464304E-8A03-4076-8605-CBB29040A88A}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "MountDevices", "MountDevices\MountDevices.nfproj", "{829EBAF9-1BBA-41C7-9175-7944CF001C9C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MountDevices", "MountDevices\MountDevices.csproj", "{829EBAF9-1BBA-41C7-9175-7944CF001C9C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Archive/Windows.Devices.I2c/Display/I2C.csproj b/Archive/Windows.Devices.I2c/Display/I2C.csproj
new file mode 100644
index 000000000..b41972a79
--- /dev/null
+++ b/Archive/Windows.Devices.I2c/Display/I2C.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>I2CDemoApp</RootNamespace>
+    <AssemblyName>I2C.DemoApp</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Windows.Devices.Gpio" Version="1.5.5" />
+    <PackageReference Include="nanoFramework.Windows.Devices.I2c" Version="1.4.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/Archive/Windows.Devices.I2c/Display/I2C.nfproj b/Archive/Windows.Devices.I2c/Display/I2C.nfproj
deleted file mode 100644
index ad66aeb2a..000000000
--- a/Archive/Windows.Devices.I2c/Display/I2C.nfproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>dc9f03eb-614e-4b7b-9578-da78922487e7</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>I2CDemoApp</RootNamespace>
-    <AssemblyName>I2C.DemoApp</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="STMPE811.Driver\STMPE811.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.Gpio, Version=1.5.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Windows.Devices.Gpio.1.5.5\lib\Windows.Devices.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.I2c, Version=1.4.3.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Windows.Devices.I2c.1.4.3\lib\Windows.Devices.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Archive/Windows.Devices.I2c/Display/I2C.sln b/Archive/Windows.Devices.I2c/Display/I2C.sln
index a861fda18..538b4e228 100644
--- a/Archive/Windows.Devices.I2c/Display/I2C.sln
+++ b/Archive/Windows.Devices.I2c/Display/I2C.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27428.2037
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "I2C", "I2C.nfproj", "{DC9F03EB-614E-4B7B-9578-DA78922487E7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "I2C", "I2C.csproj", "{DC9F03EB-614E-4B7B-9578-DA78922487E7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Archive/Windows.Devices.I2c/Display/Properties/AssemblyInfo.cs b/Archive/Windows.Devices.I2c/Display/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3cb1d99d8..000000000
--- a/Archive/Windows.Devices.I2c/Display/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © 2018 ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/Archive/Windows.Devices.I2c/Display/packages.config b/Archive/Windows.Devices.I2c/Display/packages.config
deleted file mode 100644
index 79c4cadc7..000000000
--- a/Archive/Windows.Devices.I2c/Display/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Devices.Gpio" version="1.5.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Windows.Devices.I2c" version="1.4.3" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS.sln b/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS.sln
index 263aa9cd3..90b8270e4 100644
--- a/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS.sln
+++ b/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28922.388
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "nfGPSTest", "nanoframework.Samples.GPS\nanoframework.Samples.GPS.nfproj", "{0C999724-B003-4ED6-B5AA-AC857759380B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nanoframework.Samples.GPS", "nanoframework.Samples.GPS\nanoframework.Samples.GPS.csproj", "{0C999724-B003-4ED6-B5AA-AC857759380B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/Properties/AssemblyInfo.cs b/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.csproj b/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.csproj
new file mode 100644
index 000000000..adc522d42
--- /dev/null
+++ b/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>nfGPSTest</RootNamespace>
+    <AssemblyName>nfGPSTest</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.Windows.Devices.I2c" Version="1.4.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.nfproj b/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.nfproj
deleted file mode 100644
index 829e798c2..000000000
--- a/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.nfproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>0c999724-b003-4ed6-b5aa-ac857759380b</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>nfGPSTest</RootNamespace>
-    <AssemblyName>nfGPSTest</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Drivers\GPS\IesShieldGps.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.I2c, Version=1.4.3.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Devices.I2c.1.4.3\lib\Windows.Devices.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/packages.config b/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/packages.config
deleted file mode 100644
index 832b3ca1e..000000000
--- a/Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Devices.I2c" version="1.4.3" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/Archive/Windows.Devices.Pwm/PWM.csproj b/Archive/Windows.Devices.Pwm/PWM.csproj
new file mode 100644
index 000000000..46ce3352a
--- /dev/null
+++ b/Archive/Windows.Devices.Pwm/PWM.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>PwmTest</RootNamespace>
+    <AssemblyName>PwmTest</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Windows.Devices.Gpio" Version="1.5.5" />
+    <PackageReference Include="nanoFramework.Windows.Devices.Pwm" Version="1.6.2" />
+  </ItemGroup>
+
+</Project>
diff --git a/Archive/Windows.Devices.Pwm/PWM.nfproj b/Archive/Windows.Devices.Pwm/PWM.nfproj
deleted file mode 100644
index 342d83bb1..000000000
--- a/Archive/Windows.Devices.Pwm/PWM.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>38F490AB-A9A9-4B68-9C76-9F9374D1D846</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>PwmTest</RootNamespace>
-    <AssemblyName>PwmTest</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.Gpio, Version=1.5.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Windows.Devices.Gpio.1.5.5\lib\Windows.Devices.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.Pwm, Version=1.6.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Windows.Devices.Pwm.1.6.2\lib\Windows.Devices.Pwm.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Archive/Windows.Devices.Pwm/PWM.sln b/Archive/Windows.Devices.Pwm/PWM.sln
index 97440c76d..3148f4593 100644
--- a/Archive/Windows.Devices.Pwm/PWM.sln
+++ b/Archive/Windows.Devices.Pwm/PWM.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "PWM", "PWM.nfproj", "{38F490AB-A9A9-4B68-9C76-9F9374D1D846}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PWM", "PWM.csproj", "{38F490AB-A9A9-4B68-9C76-9F9374D1D846}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Archive/Windows.Devices.Pwm/Properties/AssemblyInfo.cs b/Archive/Windows.Devices.Pwm/Properties/AssemblyInfo.cs
deleted file mode 100644
index 698f2c951..000000000
--- a/Archive/Windows.Devices.Pwm/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Archive/Windows.Devices.Pwm/packages.config b/Archive/Windows.Devices.Pwm/packages.config
deleted file mode 100644
index f5a80cfb3..000000000
--- a/Archive/Windows.Devices.Pwm/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Devices.Gpio" version="1.5.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Windows.Devices.Pwm" version="1.6.2" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/Archive/Windows.Devices.SerialCommunication/Properties/AssemblyInfo.cs b/Archive/Windows.Devices.SerialCommunication/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3bea5f08b..000000000
--- a/Archive/Windows.Devices.SerialCommunication/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/Archive/Windows.Devices.SerialCommunication/SerialCommunication.csproj b/Archive/Windows.Devices.SerialCommunication/SerialCommunication.csproj
new file mode 100644
index 000000000..3cc74a030
--- /dev/null
+++ b/Archive/Windows.Devices.SerialCommunication/SerialCommunication.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>SerialCommunication</RootNamespace>
+    <AssemblyName>SerialCommunication</AssemblyName>
+    <DefineConstants>$(DefineConstants);</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.CoreLibrary.NoReflection" Version="1.17.12" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.Windows.Devices.SerialCommunication" Version="1.3.7" />
+    <PackageReference Include="nanoFramework.Windows.Storage.Streams" Version="1.14.44" />
+  </ItemGroup>
+
+</Project>
diff --git a/Archive/Windows.Devices.SerialCommunication/SerialCommunication.nfproj b/Archive/Windows.Devices.SerialCommunication/SerialCommunication.nfproj
deleted file mode 100644
index 8ad8487a2..000000000
--- a/Archive/Windows.Devices.SerialCommunication/SerialCommunication.nfproj
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>87a6efd3-a5c9-40ab-a7f7-62cf62ce6b5a</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>SerialCommunication</RootNamespace>
-    <AssemblyName>SerialCommunication</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Scenario4_DataReceivedEvent.cs" />
-    <Compile Include="Scenario3_StreamRead.cs" />
-    <Compile Include="Scenario2_StreamWrite.cs" />
-    <Compile Include="Scenario1_ConfigureDevice.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.12.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.NoReflection.1.17.12\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.3.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731" Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(DefineConstants), '^(.*;)*BUIID_FOR_ESP32(;.*)*$'))">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.3.3-preview.12\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-      <SpecificVersion>True</SpecificVersion>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.SerialCommunication, Version=1.3.7.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Windows.Devices.SerialCommunication.1.3.7\lib\Windows.Devices.SerialCommunication.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Storage.Streams, Version=1.14.44.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Windows.Storage.Streams.1.14.44\lib\Windows.Storage.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Archive/Windows.Devices.SerialCommunication/SerialCommunication.sln b/Archive/Windows.Devices.SerialCommunication/SerialCommunication.sln
index dd84a30c8..4e51a330f 100644
--- a/Archive/Windows.Devices.SerialCommunication/SerialCommunication.sln
+++ b/Archive/Windows.Devices.SerialCommunication/SerialCommunication.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31205.134
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SerialCommunication", "SerialCommunication.nfproj", "{87A6EFD3-A5C9-40AB-A7F7-62CF62CE6B5A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerialCommunication", "SerialCommunication.csproj", "{87A6EFD3-A5C9-40AB-A7F7-62CF62CE6B5A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Archive/Windows.Devices.SerialCommunication/packages.config b/Archive/Windows.Devices.SerialCommunication/packages.config
deleted file mode 100644
index db544e2d3..000000000
--- a/Archive/Windows.Devices.SerialCommunication/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary.NoReflection" version="1.17.12" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Devices.SerialCommunication" version="1.3.7" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Windows.Storage.Streams" version="1.14.44" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/Archive/Windows.Devices.Spi/Properties/AssemblyInfo.cs b/Archive/Windows.Devices.Spi/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3cb1d99d8..000000000
--- a/Archive/Windows.Devices.Spi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © 2018 ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/Archive/Windows.Devices.Spi/SPI.csproj b/Archive/Windows.Devices.Spi/SPI.csproj
new file mode 100644
index 000000000..65ee1e752
--- /dev/null
+++ b/Archive/Windows.Devices.Spi/SPI.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Spi.DemoApp</RootNamespace>
+    <AssemblyName>Spi.DemoApp</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Windows.Devices.Gpio" Version="1.5.5" />
+    <PackageReference Include="nanoFramework.Windows.Devices.Spi" Version="1.4.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/Archive/Windows.Devices.Spi/SPI.nfproj b/Archive/Windows.Devices.Spi/SPI.nfproj
deleted file mode 100644
index 501437acf..000000000
--- a/Archive/Windows.Devices.Spi/SPI.nfproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>807313C1-D3D8-4102-849C-D8E8F3BA11BF</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Spi.DemoApp</RootNamespace>
-    <AssemblyName>Spi.DemoApp</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="L3GD20.Driver\L3GD20.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.Gpio, Version=1.5.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Windows.Devices.Gpio.1.5.5\lib\Windows.Devices.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.Spi, Version=1.4.3.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Windows.Devices.Spi.1.4.3\lib\Windows.Devices.Spi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Archive/Windows.Devices.Spi/SPI.sln b/Archive/Windows.Devices.Spi/SPI.sln
index 102ddc3d2..4267cd2d9 100644
--- a/Archive/Windows.Devices.Spi/SPI.sln
+++ b/Archive/Windows.Devices.Spi/SPI.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27428.2037
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SPI", "SPI.nfproj", "{807313C1-D3D8-4102-849C-D8E8F3BA11BF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SPI", "SPI.csproj", "{807313C1-D3D8-4102-849C-D8E8F3BA11BF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Archive/Windows.Devices.Spi/packages.config b/Archive/Windows.Devices.Spi/packages.config
deleted file mode 100644
index bc2737b8b..000000000
--- a/Archive/Windows.Devices.Spi/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Devices.Gpio" version="1.5.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Windows.Devices.Spi" version="1.4.3" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/NuGet.Config b/NuGet.Config
index b02a98116..ca7fc4b73 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Dev-local feed for the SDK-style migration; remove 'local-sdk' once the SDK ships to nuget.org. -->
 <configuration>
-    <packageSources>
-        <add key="NuGet" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    </packageSources>
+  <packageSources>
+    <clear />
+    <add key="local-sdk" value="../nanoFramework.Sdk/artifacts" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
 </configuration>
diff --git a/global.json b/global.json
new file mode 100644
index 000000000..46617b179
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+  "msbuild-sdks": {
+    "nanoFramework.NET.Sdk": "1.0.0"
+  }
+}
diff --git a/migration-report.md b/migration-report.md
new file mode 100644
index 000000000..78c1d3b03
--- /dev/null
+++ b/migration-report.md
@@ -0,0 +1,278 @@
+# nanoFramework migration report
+
+- **Root:** `D:\src\nnf\Samples`
+- **Generated (UTC):** 2026-06-16 18:01:08Z
+
+**Summary:** converted 154 · skipped 0 · flagged 0 · errors 0 · total 154
+
+| Project | Result | Packages | Notes |
+| --- | --- | --- | --- |
+| Archive/GpioChangeCounter/GpioChangeCounter/GpioChangeCounter.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Windows.Devices.Gpio 1.5.5<br>nanoFramework.Windows.Devices.Pwm 1.6.2 | clean |
+| Archive/Storage/AccessRemovableDevices/AccessRemovableDevices.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Runtime 1.0.28<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.Windows.Storage 1.5.62<br>nanoFramework.Windows.Storage.Streams 1.14.44 | clean |
+| Archive/Storage/FileAccess/FileAccess.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Runtime 1.0.28<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.Windows.Storage 1.5.62<br>nanoFramework.Windows.Storage.Streams 1.14.44 | clean |
+| Archive/Storage/MountDevices/MountDevices.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Runtime 1.0.28<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.Windows.Storage 1.5.62<br>nanoFramework.Windows.Storage.Streams 1.14.44 | clean |
+| Archive/Storage/RemovableDeviceEvent/RemovableDeviceEvent.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Runtime 1.0.28<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.Windows.Storage 1.5.62<br>nanoFramework.Windows.Storage.Streams 1.14.44 | clean |
+| Archive/Windows.Devices.I2c/Display/I2C.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Windows.Devices.Gpio 1.5.5<br>nanoFramework.Windows.Devices.I2c 1.4.3 | clean |
+| Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.Windows.Devices.I2c 1.4.3 | clean |
+| Archive/Windows.Devices.Pwm/PWM.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Windows.Devices.Gpio 1.5.5<br>nanoFramework.Windows.Devices.Pwm 1.6.2 | clean |
+| Archive/Windows.Devices.SerialCommunication/SerialCommunication.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.CoreLibrary.NoReflection 1.17.12<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.Windows.Devices.SerialCommunication 1.3.7<br>nanoFramework.Windows.Storage.Streams 1.14.44 | clean |
+| Archive/Windows.Devices.Spi/SPI.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Windows.Devices.Gpio 1.5.5<br>nanoFramework.Windows.Devices.Spi 1.4.3 | clean |
+| samples/1-Wire/OneWire.TestApp.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.OneWire 1.4.35 | clean |
+| samples/ADC/ADC.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.System.Device.Adc 1.1.24 | clean |
+| samples/AMQP/Azure-IoT-Hub/Azure-IoT-Hub.nfproj | Converted | AMQPNetLite.nanoFramework 2.4.4-preview.6<br>nanoFramework.CoreLibrary 1.10.5<br>nanoFramework.ResourceManager 1.1.2<br>nanoFramework.Runtime.Events 1.9.1<br>nanoFramework.System.Collections 1.2.0<br>nanoFramework.System.Device.Gpio 1.0.4<br>nanoFramework.System.Math 1.4.1<br>nanoFramework.System.Net 1.7.0<br>nanoFramework.System.Text 1.1.1<br>nanoFramework.System.Threading 1.0.2<br>nanoFramework.Windows.Devices.Wifi 1.3.3 | clean |
+| samples/AMQP/Azure-ServiceBus-Sender/Azure-ServiceBus-Sender.nfproj | Converted | AMQPNetLite.nanoFramework 2.4.4-preview.6<br>nanoFramework.CoreLibrary 1.10.5<br>nanoFramework.ResourceManager 1.1.2<br>nanoFramework.Runtime.Events 1.9.1<br>nanoFramework.System.Collections 1.2.0<br>nanoFramework.System.Device.Gpio 1.0.4<br>nanoFramework.System.Math 1.4.1<br>nanoFramework.System.Net 1.7.0<br>nanoFramework.System.Text 1.1.1<br>nanoFramework.System.Threading 1.0.2 | clean |
+| samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/AzureMQTT.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Iot.Device.Bmxx80 1.2.952<br>nanoFramework.Iot.Device.Common.WeatherHelper 1.2.950<br>nanoFramework.Json 2.2.210<br>nanoFramework.Logging 1.1.161<br>nanoFramework.Logging.Serial 1.1.161<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.Networking.Sntp 1.6.42<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Buffers.Binary.BinaryPrimitives 1.2.862<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.I2c 1.1.29<br>nanoFramework.System.Device.Model 1.2.862<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Ports 1.1.132<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Math 1.5.116<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.UnitsNet.Duration 5.76.15<br>nanoFramework.UnitsNet.ElectricResistance 5.76.15<br>nanoFramework.UnitsNet.Length 5.76.15<br>nanoFramework.UnitsNet.Pressure 5.76.15<br>nanoFramework.UnitsNet.RelativeHumidity 5.76.15<br>nanoFramework.UnitsNet.Temperature 5.76.15 | clean |
+| samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/AzureEdgeOTAEngine.nfproj | Converted | nanoFramework.Azure.Devices.Client 1.2.115<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Json 2.2.210<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.M2Mqtt.Core 5.1.215<br>nanoFramework.Networking.Sntp 1.6.42<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Buffers.Binary.BinaryPrimitives 1.2.862<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.I2c 1.1.29<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.FileSystem 1.1.87<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Net.Http.Client 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/AzureSDK/AzureEdgeOta/CountMeasurement/CountMeasurement.nfproj | Converted | nanoFramework.Azure.Devices.Client 1.2.115<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.M2Mqtt.Core 5.1.215<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.nfproj | Converted | nanoFramework.Azure.Devices.Client 1.2.115<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.M2Mqtt.Core 5.1.215<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.nfproj | Converted | nanoFramework.Azure.Devices.Client.FullyManaged 1.2.115<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Iot.Device.AtModem 1.0.584<br>nanoFramework.Iot.Device.Common.GnssDevice 1.0.344<br>nanoFramework.Json 2.2.210<br>nanoFramework.M2Mqtt.Core 5.1.215<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.IO.Ports 1.1.132<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Math 1.5.116<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.UnitsNet.Angle 5.76.15<br>nanoFramework.UnitsNet.ElectricPotential 5.76.15<br>nanoFramework.UnitsNet.Ratio 5.76.15<br>nanoFramework.UnitsNet.Speed 5.76.15 | clean |
+| samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.nfproj | Converted | nanoFramework.Azure.Devices.Client 1.2.115<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Json 2.2.210<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.M2Mqtt.Core 5.1.215<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/NFSensorAzureIoTHub.nfproj | Converted | nanoFramework.Azure.Devices.Client 1.2.115<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Iot.Device.Bmxx80 1.2.952<br>nanoFramework.Iot.Device.Common.WeatherHelper 1.2.950<br>nanoFramework.Json 2.2.210<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.M2Mqtt.Core 5.1.215<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Buffers.Binary.BinaryPrimitives 1.2.862<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.I2c 1.1.29<br>nanoFramework.System.Device.Model 1.2.862<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Math 1.5.116<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Net.Http.Client 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.UnitsNet.Duration 5.76.15<br>nanoFramework.UnitsNet.ElectricResistance 5.76.15<br>nanoFramework.UnitsNet.Length 5.76.15<br>nanoFramework.UnitsNet.Pressure 5.76.15<br>nanoFramework.UnitsNet.RelativeHumidity 5.76.15<br>nanoFramework.UnitsNet.Temperature 5.76.15 | clean |
+| samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.nfproj | Converted | nanoFramework.Azure.Devices.Client 1.2.115<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Iot.Device.Bmxx80 1.2.952<br>nanoFramework.Iot.Device.Common.WeatherHelper 1.2.950<br>nanoFramework.Json 2.2.210<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.M2Mqtt.Core 5.1.215<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Buffers.Binary.BinaryPrimitives 1.2.862<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.I2c 1.1.29<br>nanoFramework.System.Device.Model 1.2.862<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Math 1.5.116<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.UnitsNet.Duration 5.76.15<br>nanoFramework.UnitsNet.ElectricResistance 5.76.15<br>nanoFramework.UnitsNet.Length 5.76.15<br>nanoFramework.UnitsNet.Pressure 5.76.15<br>nanoFramework.UnitsNet.RelativeHumidity 5.76.15<br>nanoFramework.UnitsNet.Temperature 5.76.15 | clean |
+| samples/AzureSDK/AzureSDK/AzureIoTExample.nfproj | Converted | nanoFramework.Azure.Devices.Client 1.2.115<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Iot.Device.Bmxx80 1.2.952<br>nanoFramework.Iot.Device.Common.WeatherHelper 1.2.950<br>nanoFramework.Json 2.2.210<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.M2Mqtt.Core 5.1.215<br>nanoFramework.Networking.Sntp 1.6.42<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Buffers.Binary.BinaryPrimitives 1.2.862<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.I2c 1.1.29<br>nanoFramework.System.Device.Model 1.2.862<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Math 1.5.116<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Net.Http.Client 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.UnitsNet.Duration 5.76.15<br>nanoFramework.UnitsNet.ElectricResistance 5.76.15<br>nanoFramework.UnitsNet.Length 5.76.15<br>nanoFramework.UnitsNet.Pressure 5.76.15<br>nanoFramework.UnitsNet.RelativeHumidity 5.76.15<br>nanoFramework.UnitsNet.Temperature 5.76.15 | clean |
+| samples/AzureSDK/DpsSampleApp/DpsSampleApp.nfproj | Converted | nanoFramework.Azure.Devices.Client 1.2.115<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.M2Mqtt.Core 5.1.215<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/Beginner/AnalogRainSensor/7-AnalogRainSensor.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Adc 1.1.24 | clean |
+| samples/Beginner/BlinkLed/1-BlinkLed.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/Beginner/ButtonNuget/3-ButtonNuget.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Iot.Device.Button 1.2.931<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/Beginner/Button/2-Button.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/Beginner/Buzzer/5-Buzzer.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Iot.Device.Buzzer 1.2.952<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Model 1.2.862<br>nanoFramework.System.Device.Pwm 1.1.23<br>nanoFramework.System.Math 1.5.116<br>nanoFramework.UnitsNet.Frequency 5.76.15 | clean |
+| samples/Beginner/PwmLed/4-PwmLed.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Pwm 1.1.23 | clean |
+| samples/Beginner/ServoMotor/6-ServoMotor.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Iot.Device.ServoMotor 1.2.907<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Pwm 1.1.23 | clean |
+| samples/Beginner/TempHumI2c/8-TempHumI2c.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Iot.Device.Am2320 1.2.952<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Buffers.Binary.BinaryPrimitives 1.2.862<br>nanoFramework.System.Device.I2c 1.1.29<br>nanoFramework.System.Device.Model 1.2.862<br>nanoFramework.UnitsNet.RelativeHumidity 5.76.15<br>nanoFramework.UnitsNet.Temperature 5.76.15 | clean |
+| samples/Blinky/Blinky/Blinky.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/Bluetooth/BroadcastValues/BroadcastValues.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Bluetooth/Central1/Central1.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Bluetooth/Central2/Central2.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Bluetooth/Central3/Central3.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Bluetooth/ImprovWifi/ImprovWifi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/Bluetooth/WatcherFilters/WatcherFilters.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Bluetooth 1.1.115<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/CAN/Can.TestApp/Can.TestApp.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Device.Can 1.3.26<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/Collections/Collections/Collections.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.System.Collections 1.5.67 | clean |
+| samples/Converter.Base64/Base64Test/Base64Test.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/DAC/DacSample/DacSample.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.System.Device.Dac 1.5.26<br>nanoFramework.System.Math 1.5.116 | clean |
+| samples/DebugGC.Test/DebugGC.Test.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/DependencyInjection/Simple/Simple.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.DependencyInjection 1.1.32 | clean |
+| samples/DependencyInjection/SlowBlink/SlowBlink.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.DependencyInjection 1.1.32<br>nanoFramework.Logging 1.1.161<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/ExecutionConstraint/ExecutionConstraint/ExecutionConstraint.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Native 1.7.11 | clean |
+| samples/GCStressTest/GCStressTest.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/GiantGecko.Adc/ContinuousSampling/ContinuousSampling.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.GiantGecko.Adc 1.0.49 | clean |
+| samples/GiantGecko.Adc/Read.Channel/Read.Channel.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.GiantGecko.Adc 1.0.49 | clean |
+| samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Pwm 1.1.23 | clean |
+| samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).nfproj | Converted | nanoFramework.CoreLibrary 1.14.2<br>nanoFramework.Runtime.Events 1.11.6<br>nanoFramework.System.Device.Gpio 1.1.28 | clean |
+| samples/Gpio/Gpio+Events/Gpio+Events.nfproj | Converted | nanoFramework.CoreLibrary 1.14.2<br>nanoFramework.Runtime.Events 1.11.6<br>nanoFramework.System.Device.Gpio 1.1.28 | clean |
+| samples/Graphics/GenericDriver/GenericDriver.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Graphics 1.2.45<br>nanoFramework.Graphics.Core 1.2.45<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67 | clean |
+| samples/Graphics/Primitives/Primitives.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Graphics 1.2.45<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Math 1.5.116 | clean |
+| samples/Graphics/Screens/m5stack-screen/m5stack.screen.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Graphics 1.2.45<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.Pwm 1.1.23 | clean |
+| samples/Graphics/Screens/m5stick-screen/m5stick.screen.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Graphics 1.2.45<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Iot.Device.Axp192 1.2.952<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.I2c 1.1.29<br>nanoFramework.UnitsNet.ElectricCurrent 5.76.15<br>nanoFramework.UnitsNet.ElectricPotential 5.76.15<br>nanoFramework.UnitsNet.Power 5.76.15<br>nanoFramework.UnitsNet.Temperature 5.76.15 | clean |
+| samples/Graphics/SimpleWpf/SimpleWpf.Esp32/SimpleWpf.Esp32.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Graphics 1.2.45<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Math 1.5.116 | clean |
+| samples/Graphics/SimpleWpf/SimpleWpf/SimpleWpf.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Graphics 1.2.45<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Math 1.5.116 | clean |
+| samples/Graphics/Tetris/Tetris.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Graphics 1.2.45<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/Graphics/UsingGenericDriver/UsingGenericDriver.nfproj | Converted | nanoFramework.CoreLibrary 1.14.2<br>nanoFramework.Graphics.St7735 1.1.37<br>nanoFramework.Hardware.Esp32 1.6.8<br>nanoFramework.ResourceManager 1.2.13<br>nanoFramework.Runtime.Events 1.11.6<br>nanoFramework.Runtime.Native 1.6.6<br>nanoFramework.System.Collections 1.5.18 | clean |
+| samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/InfraredRemoteReceiverSample.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32.Rmt 2.0.35<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/NeoPixel.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32.Rmt 2.0.35<br>nanoFramework.Runtime.Events 1.11.32 | clean |
+| samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/NeoPixel.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32.Rmt 2.0.35<br>nanoFramework.Runtime.Events 1.11.32 | clean |
+| samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32.Rmt 2.0.35<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/Hardware.Esp32/HardwareEsp32.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/Hardware.GiantGecko/GiantGecko.PowerMode/GiantGecko.PowerMode.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.GiantGecko 1.1.16<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/GiantGecko.ReadDeviceIDs.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.GiantGecko 1.1.16 | clean |
+| samples/Hardware.Stm32/Stm32.BackupMemory/Stm32BackupMemory.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Stm32 1.10.37 | clean |
+| samples/Hardware.Stm32/Stm32.PowerMode/Stm32.PowerMode.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Extensions.Stm32.GpioController 1.13.0<br>nanoFramework.Hardware.Stm32 1.10.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.Windows.Devices.Gpio 1.5.5 | clean |
+| samples/Hardware.Stm32/Stm32.ReadDeviceIDs/Stm32.ReadDeviceIDs.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Stm32 1.10.37 | clean |
+| samples/Hardware.Stm32/Stm32.TestAlarms/Stm32.TestAlarms.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Stm32 1.10.37 | clean |
+| samples/Hardware.TI/TI.PowerMode/TI.PowerMode.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.TI 1.1.27<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/Hardware.TI/TI.Utilities/TI.Utilities.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.TI 1.1.27 | clean |
+| samples/Hosting/Logging/Logging.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.DependencyInjection 1.1.32<br>nanoFramework.Hosting 2.0.11<br>nanoFramework.Logging 1.1.161<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/Hosting/SensorQueue/SensorQueue.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.DependencyInjection 1.1.32<br>nanoFramework.Hosting 2.0.11<br>nanoFramework.Logging 1.1.161<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/Hosting/Simple/Simple.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.DependencyInjection 1.1.32<br>nanoFramework.Hosting 2.0.11<br>nanoFramework.Logging 1.1.161<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/Hosting/SlowBlink/SlowBlink.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.DependencyInjection 1.1.32<br>nanoFramework.Hosting 2.0.11<br>nanoFramework.Logging 1.1.161<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/HTTP/HttpAzureGET/HttpAzureGET.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Client 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/HTTP/HttpAzureGET_Wifi/HttpAzureGET_Wifi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Client 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/HTTP/HttpAzurePOST/HttpAzurePOST.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Client 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/HTTP/HttpAzurePOST_Wifi/HttpAzurePOST_Wifi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Client 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/HTTP/HttpListener/HttpListener.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Server 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/HTTP/HttpListener_Wifi/HttpListener_Wifi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Server 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/HTTP/HttpWebRequest/HttpWebRequest.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Client 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/HTTP/HttpWebRequest_Wifi/HttpWebRequest_Wifi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Client 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/I2C/I2cMasterSlave/I2cMasterDevice/I2cMasterDevice.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.I2c 1.1.29 | clean |
+| samples/I2C/I2cMasterSlave/I2cSlaveDevice/I2cSlaveDevice.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.I2c.Slave 1.0.23 | clean |
+| samples/I2C/NanoI2cScanner/NanoI2cScanner.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.I2c 1.1.29 | clean |
+| samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.System.Device.I2c 1.1.29<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/I2S/Input/MicrophoneIn.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.I2s 1.0.28<br>nanoFramework.System.IO.FileSystem 1.1.87<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/I2S/Output/AudioPlayer.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.I2s 1.0.28<br>nanoFramework.System.IO.FileSystem 1.1.87<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Math 1.5.116<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/Interop/awesome-library/NF.AwesomeLib.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11 | clean |
+| samples/Interop/test-application/Test.Interop.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11 | clean |
+| samples/Json/JsonConfigurationStore/JsonConfigurationStore.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.IO.FileSystem 1.1.87<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Logging/Logging.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Logging 1.1.161<br>nanoFramework.Logging.Serial 1.1.161<br>nanoFramework.Logging.Stream 1.1.161<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.IO.FileSystem 1.1.87<br>nanoFramework.System.IO.Ports 1.1.132<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/ManagedResources/ManagedResources.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.ResourceManager 1.2.32 | clean |
+| samples/McpAi/McpAi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Json 2.2.210<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Server 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.WebServer.Mcp 1.2.147 | clean |
+| samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.Networking.Sntp 1.6.42<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.Networking.Sntp 1.6.42<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/MQTT/BasicExample.WiFi/BasicExample.Wifi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.M2Mqtt 5.1.215<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/NativeEvents/NativeEvents.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11 | clean |
+| samples/Networking/Socket.Client/Socket.Client.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/Networking/Socket.Client_Wifi/Socket.Client_Wifi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/NumberParser/NumberParserTest/NumberParserTest.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/OpenThread/UdpThreadClient/UdpThreadClient.nfproj | Converted | CCSWE.nanoFramework.Graphics 1.1.135<br>CCSWE.nanoFramework.Math 1.1.135<br>CCSWE.nanoFramework.NeoPixel 1.1.135<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Graphics.Core 1.2.45<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Hardware.Esp32.Rmt 2.0.35<br>nanoFramework.Networking.Thread 1.0.51<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Math 1.5.116<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/OpenThread/UdpThreadServer/UdpThreadServer.nfproj | Converted | CCSWE.nanoFramework.Graphics 1.1.135<br>CCSWE.nanoFramework.Math 1.1.135<br>CCSWE.nanoFramework.NeoPixel 1.1.135<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Graphics.Core 1.2.45<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Hardware.Esp32.Rmt 2.0.35<br>nanoFramework.Networking.Thread 1.0.51<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Math 1.5.116<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/PWM/System.Device.Pwm/PwmSample.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Pwm 1.1.23 | clean |
+| samples/Reflection/CustomAttributes/CustomAttributes.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11 | clean |
+| samples/RTC/RTC.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Native 1.7.11 | clean |
+| samples/SerialCommunication/SerialCommunication/SerialCommunication.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.IO.Ports 1.1.132<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/SPI/SpiExamples.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.Spi 1.3.82 | clean |
+| samples/SSL/ParseCertificate/ParseCertificate.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/SSL/SecureClient/SecureClient.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/SSL/SecureClient_Wifi/SecureClient_Wifi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/SSL/SecureServer/SecureServer.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/SSL/SecureServer_Wifi/SecureServer_Wifi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.IO.FileSystem 1.1.87<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/System.IO.FileSystem/MountExample/MountExample.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.IO.FileSystem 1.1.87<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/System.Random/System.Random.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11 | clean |
+| samples/Threading/01-Basic Threading/01-Basic Threading.nfproj | Converted | nanoFramework.CoreLibrary 1.10.5 | clean |
+| samples/Threading/02-Passing Parameters/02-Passing Parameters.nfproj | Converted | nanoFramework.CoreLibrary 1.10.5 | clean |
+| samples/Threading/03-Retrieving data from threads/03-Retrieving data from threads.nfproj | Converted | nanoFramework.CoreLibrary 1.10.5 | clean |
+| samples/Threading/04-Controlling threads/04-Controlling threads.nfproj | Converted | nanoFramework.CoreLibrary 1.10.5 | clean |
+| samples/Threading/05-ManualResetEvent/05-ManualResetEvent.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11 | clean |
+| samples/Threading/06-AutoResetEvent/06-AutoResetEvent.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11 | clean |
+| samples/Threading/07-Sharing resources/07-Sharing resources.nfproj | Converted | nanoFramework.CoreLibrary 1.10.5<br>nanoFramework.System.Math 1.4.1 | clean |
+| samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.IO.Ports 1.1.132<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.TI.EasyLink 1.4.28 | clean |
+| samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.TI.EasyLink 1.4.28 | clean |
+| samples/Timer/Timer.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Gpio 1.1.57 | clean |
+| samples/ToStringTest/ToStringTest/ToStringTesting.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11 | clean |
+| samples/TouchESP32/TestTouchApp.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32 | clean |
+| samples/UdpClient/DumpSSDPRequests/DumpSSDPRequests.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Sockets.UdpClient 1.1.102<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/UdpClient/QOTDClient/QOTDClient.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Sockets.UdpClient 1.1.102<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/UdpClient/UdpEchoServer/UdpEchoServer.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Sockets.UdpClient 1.1.102<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/UnitTest/NFUnitTestDemo/NFUnitTest.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.TestFramework 3.0.80 | clean |
+| samples/UsbClient/UsbClient/UsbStream/UsbStream.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.UsbStream 1.0.84<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Text 1.3.42 | clean |
+| samples/Webserver/ServoMotorTester/ServoMotorTester.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Pwm 1.1.23<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Server 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.WebServer 1.2.147 | clean |
+| samples/Webserver/WebServer.DI/WebServer.Sample.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.DependencyInjection 1.1.32<br>nanoFramework.Hosting 2.0.11<br>nanoFramework.Logging 1.1.161<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Server 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.WebServer 1.2.147 | clean |
+| samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.FileSystem 1.1.87<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Server 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.WebServer 1.2.147 | clean |
+| samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/WebServer.Sample.FileSystem.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.FileSystem 1.1.87<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Server 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.WebServer.FileSystem 1.2.147 | clean |
+| samples/Webserver/WebServer.Sample/WebServer.Sample/WebServer.Sample.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Server 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.WebServer 1.2.147 | clean |
+| samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.WebSockets.Client 1.1.164<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.nfproj | Converted | nanoFramework.AtomLite 1.1.291<br>nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Graphics.Core 1.2.45<br>nanoFramework.Hardware.Esp32 1.6.37<br>nanoFramework.Hardware.Esp32.Rmt 2.0.35<br>nanoFramework.Iot.Device.Button 1.2.931<br>nanoFramework.Iot.Device.Ws28xx.Esp32 1.2.955<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Adc 1.1.24<br>nanoFramework.System.Device.Dac 1.5.26<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.I2c 1.1.29<br>nanoFramework.System.Device.Spi 1.3.82<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.FileSystem 1.1.87<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Net.Http.Server 1.5.207<br>nanoFramework.System.Net.WebSockets.Server 1.1.164<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52<br>nanoFramework.WebServer 1.2.147 | clean |
+| samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http 1.5.207<br>nanoFramework.System.Net.WebSockets 1.1.164<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/WiFiAP/WifiAP.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Iot.Device.DhcpServer 1.2.951<br>nanoFramework.ResourceManager 1.2.32<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.Runtime.Native 1.7.11<br>nanoFramework.System.Collections 1.5.67<br>nanoFramework.System.Device.Gpio 1.1.57<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Net.Http.Server 1.5.207<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+| samples/Wifi/ScanWifi/ScanWifi.nfproj | Converted | nanoFramework.CoreLibrary 1.17.11<br>nanoFramework.Runtime.Events 1.11.32<br>nanoFramework.System.Device.Wifi 1.5.144<br>nanoFramework.System.IO.Streams 1.1.96<br>nanoFramework.System.Net 1.11.52<br>nanoFramework.System.Text 1.3.42<br>nanoFramework.System.Threading 1.1.52 | clean |
+
+## Solutions
+
+- `Archive/GpioChangeCounter/GpioChangeCounter.sln`
+- `Archive/Storage/Storage.sln`
+- `Archive/Windows.Devices.I2c/Display/I2C.sln`
+- `Archive/Windows.Devices.I2c/GPS/nanoframework.Samples.GPS.sln`
+- `Archive/Windows.Devices.Pwm/PWM.sln`
+- `Archive/Windows.Devices.SerialCommunication/SerialCommunication.sln`
+- `Archive/Windows.Devices.Spi/SPI.sln`
+- `samples/1-Wire/OneWire.TestApp.sln`
+- `samples/ADC/ADC.sln`
+- `samples/AMQP/Amqp.Samples.sln`
+- `samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT.sln`
+- `samples/AzureSDK/AzureEdgeOta/AzureEdgeOTA.sln`
+- `samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.sln`
+- `samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.sln`
+- `samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.sln`
+- `samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub.sln`
+- `samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.sln`
+- `samples/AzureSDK/AzureSDK/AzureIoTExample.sln`
+- `samples/AzureSDK/DpsSampleApp/DpsSampleApp.sln`
+- `samples/Beginner/Beginner.sln`
+- `samples/Blinky/Blinky.sln`
+- `samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.sln`
+- `samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.sln`
+- `samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.sln`
+- `samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.sln`
+- `samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.sln`
+- `samples/Bluetooth/BroadcastValues/BroadcastValues.sln`
+- `samples/Bluetooth/Central1/Central1.sln`
+- `samples/Bluetooth/Central2/Central2.sln`
+- `samples/Bluetooth/Central3/Central3.sln`
+- `samples/Bluetooth/ImprovWifi/ImprovWifi.sln`
+- `samples/Bluetooth/WatcherFilters/WatcherFilters.sln`
+- `samples/CAN/Can.TestApp.sln`
+- `samples/Collections/Collections.sln`
+- `samples/Converter.Base64/Base64Test.sln`
+- `samples/DAC/DacSample.sln`
+- `samples/DebugGC.Test/DebugGC.Test.sln`
+- `samples/DependencyInjection/Simple/Simple.sln`
+- `samples/DependencyInjection/SlowBlink/SlowBlink.sln`
+- `samples/ExecutionConstraint/ExecutionConstraint.sln`
+- `samples/GCStressTest/GCStressTest.sln`
+- `samples/GiantGecko.Adc/Gecko ADC samples.sln`
+- `samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.sln`
+- `samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).sln`
+- `samples/Gpio/Gpio+Events/Gpio+Events.sln`
+- `samples/Graphics/GenericDriver/GenericDriver.sln`
+- `samples/Graphics/Primitives/Primitives.sln`
+- `samples/Graphics/Screens/m5stack-screen/m5stack.screen.sln`
+- `samples/Graphics/Screens/m5stick-screen/m5stick.screen.sln`
+- `samples/Graphics/SimpleWpf/SimpleWpf.sln`
+- `samples/Graphics/Tetris/Tetris.sln`
+- `samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiver.sln`
+- `samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel.sln`
+- `samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel.sln`
+- `samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.sln`
+- `samples/Hardware.Esp32/HardwareEsp32.sln`
+- `samples/Hardware.GiantGecko/Hardware.GiantGecko.sln`
+- `samples/Hardware.Stm32/Hardware.Stm32.sln`
+- `samples/Hardware.TI/Hardware.TI.sln`
+- `samples/Hosting/Logging/Logging.sln`
+- `samples/Hosting/SensorQueue/SensorQueue.sln`
+- `samples/Hosting/Simple/Simple.sln`
+- `samples/Hosting/SlowBlink/SlowBlink.sln`
+- `samples/HTTP/HTTP.Samples.sln`
+- `samples/I2C/I2cMasterSlave/I2cMasterSlave.sln`
+- `samples/I2C/NanoI2cScanner/NanoI2cScanner.sln`
+- `samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS.sln`
+- `samples/I2S/Input/MicrophoneIn.sln`
+- `samples/I2S/Output/AudioPlayer.sln`
+- `samples/Interop/awesome-library/NF.AwesomeLib.sln`
+- `samples/Interop/test-application/Test.Interop.sln`
+- `samples/Json/JsonConfigurationStore.sln`
+- `samples/Logging/Logging.sln`
+- `samples/ManagedResources/ManagedResources.sln`
+- `samples/McpAi/McpAi.sln`
+- `samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.sln`
+- `samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.sln`
+- `samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.sln`
+- `samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.sln`
+- `samples/MQTT/BasicExample.WiFi/BasicExample.WiFi.sln`
+- `samples/NativeEvents/NativeEvents.sln`
+- `samples/Networking/Networking.sln`
+- `samples/NumberParser/NumberParser.sln`
+- `samples/OpenThread/UdpThreadSamples.sln`
+- `samples/PWM/System.Device.Pwm/System.Device.Pwm.sln`
+- `samples/Reflection/Reflection.sln`
+- `samples/RTC/RTC.sln`
+- `samples/SerialCommunication/SerialCommunication/SerialCommunication.sln`
+- `samples/SPI/SpiExamples.sln`
+- `samples/SSL/TLS.sln`
+- `samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.sln`
+- `samples/System.IO.FileSystem/MountExample/MountExample.sln`
+- `samples/System.Random/System.Random.sln`
+- `samples/Threading/Threading.sln`
+- `samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.sln`
+- `samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.sln`
+- `samples/Timer/Timer.sln`
+- `samples/ToStringTest/ToStringTest.sln`
+- `samples/TouchESP32/TestTouchApp.sln`
+- `samples/UdpClient/UdpClient.sln`
+- `samples/UnitTest/NFUnitTestDemo.sln`
+- `samples/UsbClient/UsbClient/UsbClient.sln`
+- `samples/Webserver/ServoMotorTester/ServoMotorTester.sln`
+- `samples/Webserver/WebServer.DI/WebServer.Sample.sln`
+- `samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.sln`
+- `samples/Webserver/WebServer.Sample/WebServer.Sample.sln`
+- `samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.sln`
+- `samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.sln`
+- `samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.sln`
+- `samples/WiFiAP/WiFiAP.sln`
+- `samples/Wifi/Wifi.sln`
+
diff --git a/samples/1-Wire/OneWire.TestApp.csproj b/samples/1-Wire/OneWire.TestApp.csproj
new file mode 100644
index 000000000..aca8252ac
--- /dev/null
+++ b/samples/1-Wire/OneWire.TestApp.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>OneWire.TestApp</RootNamespace>
+    <AssemblyName>OneWire.TestApp</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.OneWire" Version="1.4.35" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/1-Wire/OneWire.TestApp.nfproj b/samples/1-Wire/OneWire.TestApp.nfproj
deleted file mode 100644
index 4780ea894..000000000
--- a/samples/1-Wire/OneWire.TestApp.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>a33bfcef-f0ca-463c-b090-611a3f7714ab</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>OneWire.TestApp</RootNamespace>
-    <AssemblyName>OneWire.TestApp</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.OneWire, Version=1.4.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.OneWire.1.4.35\lib\nanoFramework.Device.OneWire.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/1-Wire/OneWire.TestApp.sln b/samples/1-Wire/OneWire.TestApp.sln
index 9adf093b6..5b10f87e8 100644
--- a/samples/1-Wire/OneWire.TestApp.sln
+++ b/samples/1-Wire/OneWire.TestApp.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32505.173
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "OneWire.TestApp", "OneWire.TestApp.nfproj", "{A33BFCEF-F0CA-463C-B090-611A3F7714AB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OneWire.TestApp", "OneWire.TestApp.csproj", "{A33BFCEF-F0CA-463C-B090-611A3F7714AB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{29FEC7CF-D0E6-4B28-8BBE-AED50CCFFDF9}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/samples/1-Wire/Properties/AssemblyInfo.cs b/samples/1-Wire/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/1-Wire/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/1-Wire/packages.config b/samples/1-Wire/packages.config
deleted file mode 100644
index aec76ba05..000000000
--- a/samples/1-Wire/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.OneWire" version="1.4.35" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/ADC/ADC.csproj b/samples/ADC/ADC.csproj
new file mode 100644
index 000000000..f124a6cbc
--- /dev/null
+++ b/samples/ADC/ADC.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ADC</RootNamespace>
+    <AssemblyName>ADC</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.System.Device.Adc" Version="1.1.24" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/ADC/ADC.nfproj b/samples/ADC/ADC.nfproj
deleted file mode 100644
index f5642754e..000000000
--- a/samples/ADC/ADC.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>be189160-77c4-4af4-9560-4a0d2c22de10</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ADC</RootNamespace>
-    <AssemblyName>ADC</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Adc, Version=1.1.24.44037, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Adc.1.1.24\lib\System.Device.Adc.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/ADC/ADC.sln b/samples/ADC/ADC.sln
index fdad94fec..6995b755d 100644
--- a/samples/ADC/ADC.sln
+++ b/samples/ADC/ADC.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "ADC", "ADC.nfproj", "{BE189160-77C4-4AF4-9560-4A0D2C22DE10}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ADC", "ADC.csproj", "{BE189160-77C4-4AF4-9560-4A0D2C22DE10}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/ADC/Properties/AssemblyInfo.cs b/samples/ADC/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/ADC/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/ADC/packages.config b/samples/ADC/packages.config
deleted file mode 100644
index 2f2e7e12d..000000000
--- a/samples/ADC/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Adc" version="1.1.24" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/AMQP/Amqp.Samples.sln b/samples/AMQP/Amqp.Samples.sln
index 704e615ae..dd8027588 100644
--- a/samples/AMQP/Amqp.Samples.sln
+++ b/samples/AMQP/Amqp.Samples.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31105.61
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Azure-ServiceBus-Sender", "Azure-ServiceBus-Sender\Azure-ServiceBus-Sender.nfproj", "{366B583C-2BF4-4BEF-A598-9EF13D27EB69}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure-ServiceBus-Sender", "Azure-ServiceBus-Sender\Azure-ServiceBus-Sender.csproj", "{366B583C-2BF4-4BEF-A598-9EF13D27EB69}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Azure-IoT-Hub", "Azure-IoT-Hub\Azure-IoT-Hub.nfproj", "{5B1F824C-8921-4C51-9E08-09CC3D0A7979}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure-IoT-Hub", "Azure-IoT-Hub\Azure-IoT-Hub.csproj", "{5B1F824C-8921-4C51-9E08-09CC3D0A7979}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/AMQP/Azure-IoT-Hub/Azure-IoT-Hub.csproj b/samples/AMQP/Azure-IoT-Hub/Azure-IoT-Hub.csproj
new file mode 100644
index 000000000..f3facd2a9
--- /dev/null
+++ b/samples/AMQP/Azure-IoT-Hub/Azure-IoT-Hub.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AmqpSamples.AzureIoTHub</RootNamespace>
+    <AssemblyName>Azure.IoTHub</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AMQPNetLite.nanoFramework" Version="2.4.4-preview.6" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.10.5" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.1.2" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.9.1" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.2.0" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.0.4" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.4.1" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.7.0" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.1.1" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.0.2" />
+    <PackageReference Include="nanoFramework.Windows.Devices.Wifi" Version="1.3.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AMQP/Azure-IoT-Hub/Azure-IoT-Hub.nfproj b/samples/AMQP/Azure-IoT-Hub/Azure-IoT-Hub.nfproj
deleted file mode 100644
index bbfa2215d..000000000
--- a/samples/AMQP/Azure-IoT-Hub/Azure-IoT-Hub.nfproj
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>5b1f824c-8921-4c51-9e08-09cc3d0a7979</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AmqpSamples.AzureIoTHub</RootNamespace>
-    <AssemblyName>Azure.IoTHub</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Amqp.nanoFramework">
-      <HintPath>..\packages\AMQPNetLite.nanoFramework.2.4.4-preview.6\lib\Amqp.nanoFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.1.2\lib\nanoFramework.ResourceManager.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.9.1\lib\nanoFramework.Runtime.Events.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.2.0\lib\nanoFramework.System.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text">
-      <HintPath>..\packages\nanoFramework.System.Text.1.1.1\lib\nanoFramework.System.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Device.Gpio">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.0.4\lib\System.Device.Gpio.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Math">
-      <HintPath>..\packages\nanoFramework.System.Math.1.4.1\lib\System.Math.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net">
-      <HintPath>..\packages\nanoFramework.System.Net.1.7.0\lib\System.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.0.2\lib\System.Threading.dll</HintPath>
-    </Reference>
-    <Reference Include="Windows.Devices.Wifi">
-      <HintPath>..\packages\nanoFramework.Windows.Devices.Wifi.1.3.3\lib\Windows.Devices.Wifi.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AMQP/Azure-IoT-Hub/Properties/AssemblyInfo.cs b/samples/AMQP/Azure-IoT-Hub/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/AMQP/Azure-IoT-Hub/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AMQP/Azure-IoT-Hub/packages.config b/samples/AMQP/Azure-IoT-Hub/packages.config
deleted file mode 100644
index 5670dd2b8..000000000
--- a/samples/AMQP/Azure-IoT-Hub/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AMQPNetLite.nanoFramework" version="2.4.4-preview.6" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.ResourceManager" version="1.1.2" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Runtime.Events" version="1.9.1" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Collections" version="1.2.0" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.0.4" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Math" version="1.4.1" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Net" version="1.7.0" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Text" version="1.1.1" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Threading" version="1.0.2" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Windows.Devices.Wifi" version="1.3.3" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/samples/AMQP/Azure-ServiceBus-Sender/Azure-ServiceBus-Sender.csproj b/samples/AMQP/Azure-ServiceBus-Sender/Azure-ServiceBus-Sender.csproj
new file mode 100644
index 000000000..d574fa091
--- /dev/null
+++ b/samples/AMQP/Azure-ServiceBus-Sender/Azure-ServiceBus-Sender.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AmqpSamples.AzureSB.Sender</RootNamespace>
+    <AssemblyName>AzureSB.Sender</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AMQPNetLite.nanoFramework" Version="2.4.4-preview.6" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.10.5" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.1.2" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.9.1" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.2.0" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.0.4" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.4.1" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.7.0" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.1.1" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.0.2" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AMQP/Azure-ServiceBus-Sender/Azure-ServiceBus-Sender.nfproj b/samples/AMQP/Azure-ServiceBus-Sender/Azure-ServiceBus-Sender.nfproj
deleted file mode 100644
index 5d100284d..000000000
--- a/samples/AMQP/Azure-ServiceBus-Sender/Azure-ServiceBus-Sender.nfproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>366b583c-2bf4-4bef-a598-9ef13d27eb69</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AmqpSamples.AzureSB.Sender</RootNamespace>
-    <AssemblyName>AzureSB.Sender</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Amqp.nanoFramework">
-      <HintPath>..\packages\AMQPNetLite.nanoFramework.2.4.4-preview.6\lib\Amqp.nanoFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.1.2\lib\nanoFramework.ResourceManager.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.9.1\lib\nanoFramework.Runtime.Events.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.2.0\lib\nanoFramework.System.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text">
-      <HintPath>..\packages\nanoFramework.System.Text.1.1.1\lib\nanoFramework.System.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Device.Gpio">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.0.4\lib\System.Device.Gpio.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Math">
-      <HintPath>..\packages\nanoFramework.System.Math.1.4.1\lib\System.Math.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net">
-      <HintPath>..\packages\nanoFramework.System.Net.1.7.0\lib\System.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.0.2\lib\System.Threading.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AMQP/Azure-ServiceBus-Sender/Properties/AssemblyInfo.cs b/samples/AMQP/Azure-ServiceBus-Sender/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/AMQP/Azure-ServiceBus-Sender/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AMQP/Azure-ServiceBus-Sender/Sender.nfproj b/samples/AMQP/Azure-ServiceBus-Sender/Sender.nfproj
deleted file mode 100644
index b9d4e5e21..000000000
--- a/samples/AMQP/Azure-ServiceBus-Sender/Sender.nfproj
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
diff --git a/samples/AMQP/Azure-ServiceBus-Sender/packages.config b/samples/AMQP/Azure-ServiceBus-Sender/packages.config
deleted file mode 100644
index bdd6194d6..000000000
--- a/samples/AMQP/Azure-ServiceBus-Sender/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AMQPNetLite.nanoFramework" version="2.4.4-preview.6" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.ResourceManager" version="1.1.2" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Runtime.Events" version="1.9.1" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Collections" version="1.2.0" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.0.4" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Math" version="1.4.1" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Net" version="1.7.0" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Text" version="1.1.1" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Threading" version="1.0.2" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT.sln b/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT.sln
index fc580b69a..5dac0c3e5 100644
--- a/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT.sln
+++ b/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31321.278
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AzureMQTT", "AzureMQTT\AzureMQTT.nfproj", "{134D1FF7-73CC-4B27-AA43-58FE42996DD1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureMQTT", "AzureMQTT\AzureMQTT.csproj", "{134D1FF7-73CC-4B27-AA43-58FE42996DD1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/AzureMQTT.csproj b/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/AzureMQTT.csproj
new file mode 100644
index 000000000..c89a01b68
--- /dev/null
+++ b/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/AzureMQTT.csproj
@@ -0,0 +1,50 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AzureMQTT</RootNamespace>
+    <AssemblyName>AzureMQTT</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Iot.Device.Bmxx80" Version="1.2.952" />
+    <PackageReference Include="nanoFramework.Iot.Device.Common.WeatherHelper" Version="1.2.950" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.Logging" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.Logging.Serial" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.Networking.Sntp" Version="1.6.42" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Buffers.Binary.BinaryPrimitives" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+    <PackageReference Include="nanoFramework.System.Device.Model" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Ports" Version="1.1.132" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.UnitsNet.Duration" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.ElectricResistance" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Length" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Pressure" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.RelativeHumidity" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Temperature" Version="5.76.15" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/AzureMQTT.nfproj b/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/AzureMQTT.nfproj
deleted file mode 100644
index 258052e8d..000000000
--- a/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/AzureMQTT.nfproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>134d1ff7-73cc-4b27-aa43-58fe42996dd1</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AzureMQTT</RootNamespace>
-    <AssemblyName>AzureMQTT</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-    <Compile Include="StringExtensions.cs" />
-    <Compile Include="TwinProperties.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="HMACSHA256.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resource\AzureRootCerts.pem" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.Bmxx80, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Iot.Device.Bmxx80.1.2.952\lib\Iot.Device.Bmxx80.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Iot.Device.Common.WeatherHelper, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Iot.Device.Common.WeatherHelper.1.2.950\lib\Iot.Device.Common.WeatherHelper.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Logging.1.1.161\lib\nanoFramework.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging.Serial, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Logging.Serial.1.1.161\lib\nanoFramework.Logging.Serial.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Networking.Sntp, Version=1.6.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Networking.Sntp.1.6.42\lib\nanoFramework.Networking.Sntp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Duration, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.Duration.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Duration.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.ElectricResistance, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.ElectricResistance.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.ElectricResistance.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Length, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.Length.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Length.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Pressure, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.Pressure.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Pressure.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.RelativeHumidity, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.RelativeHumidity.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.RelativeHumidity.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Temperature, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.Temperature.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Temperature.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Buffers.Binary.BinaryPrimitives, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Buffers.Binary.BinaryPrimitives.1.2.862\lib\System.Buffers.Binary.BinaryPrimitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Model, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Model.1.2.862\lib\System.Device.Model.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Ports, Version=1.1.132.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Ports.1.1.132\lib\System.IO.Ports.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/Properties/AssemblyInfo.cs b/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/packages.config b/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/packages.config
deleted file mode 100644
index c6514c616..000000000
--- a/samples/AzureMQTTTwinsBMP280Sleep/AzureMQTT/packages.config
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Bmxx80" version="1.2.952" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Common.WeatherHelper" version="1.2.950" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging.Serial" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Networking.Sntp" version="1.6.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Buffers.Binary.BinaryPrimitives" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Model" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Ports" version="1.1.132" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Duration" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.ElectricResistance" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Length" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Pressure" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.RelativeHumidity" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Temperature" version="5.76.15" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTA.sln b/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTA.sln
index 71579049a..a62d8216e 100644
--- a/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTA.sln
+++ b/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTA.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32126.317
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AzureEdgeOTAEngine", "AzureEdgeOTAEngine\AzureEdgeOTAEngine.nfproj", "{134D1FF7-73CC-4B27-AA43-58FE42996DD1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureEdgeOTAEngine", "AzureEdgeOTAEngine\AzureEdgeOTAEngine.csproj", "{134D1FF7-73CC-4B27-AA43-58FE42996DD1}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "CountMeasurement", "CountMeasurement\CountMeasurement.nfproj", "{D5F674EE-F974-4E8D-ACA2-D15AEF662C74}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CountMeasurement", "CountMeasurement\CountMeasurement.csproj", "{D5F674EE-F974-4E8D-ACA2-D15AEF662C74}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "OtaInterface", "OtaInterface\OtaInterface.shproj", "{D836967A-A9EE-4A90-8AF1-3DAE5E3F64FE}"
 EndProject
diff --git a/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/AzureEdgeOTAEngine.csproj b/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/AzureEdgeOTAEngine.csproj
new file mode 100644
index 000000000..d716687f4
--- /dev/null
+++ b/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/AzureEdgeOTAEngine.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AzureEdgeOTAEngine</RootNamespace>
+    <AssemblyName>AzureEdgeOTAEngine</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.Azure.Devices.Client" Version="1.2.115" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.M2Mqtt.Core" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.Networking.Sntp" Version="1.6.42" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Buffers.Binary.BinaryPrimitives" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.FileSystem" Version="1.1.87" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Client" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <Import Project="..\OtaInterface\OtaInterface.projitems" Label="Shared" />
+
+</Project>
diff --git a/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/AzureEdgeOTAEngine.nfproj b/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/AzureEdgeOTAEngine.nfproj
deleted file mode 100644
index f76f3cbe1..000000000
--- a/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/AzureEdgeOTAEngine.nfproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>134d1ff7-73cc-4b27-aa43-58fe42996dd1</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AzureEdgeOTAEngine</RootNamespace>
-    <AssemblyName>AzureEdgeOTAEngine</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Secrets.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resource\AzureRootCerts.pem" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Azure.Devices.Client, Version=1.2.115.6482, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Azure.Devices.Client.1.2.115\lib\nanoFramework.Azure.Devices.Client.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Networking.Sntp, Version=1.6.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Networking.Sntp.1.6.42\lib\nanoFramework.Networking.Sntp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Buffers.Binary.BinaryPrimitives, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Buffers.Binary.BinaryPrimitives.1.2.862\lib\System.Buffers.Binary.BinaryPrimitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=1.1.87.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.FileSystem.1.1.87\lib\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Client.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="..\OtaInterface\OtaInterface.projitems" Label="Shared" />
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/Properties/AssemblyInfo.cs b/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/packages.config b/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/packages.config
deleted file mode 100644
index f7be2e3bd..000000000
--- a/samples/AzureSDK/AzureEdgeOta/AzureEdgeOTAEngine/packages.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.Azure.Devices.Client" version="1.2.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt.Core" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Networking.Sntp" version="1.6.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Buffers.Binary.BinaryPrimitives" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.FileSystem" version="1.1.87" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Client" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureEdgeOta/CountMeasurement/CountMeasurement.csproj b/samples/AzureSDK/AzureEdgeOta/CountMeasurement/CountMeasurement.csproj
new file mode 100644
index 000000000..813b4d0cf
--- /dev/null
+++ b/samples/AzureSDK/AzureEdgeOta/CountMeasurement/CountMeasurement.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <RootNamespace>CountMeasurement</RootNamespace>
+    <AssemblyName>CountMeasurement</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.Azure.Devices.Client" Version="1.2.115" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.M2Mqtt.Core" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AzureSDK/AzureEdgeOta/CountMeasurement/CountMeasurement.nfproj b/samples/AzureSDK/AzureEdgeOta/CountMeasurement/CountMeasurement.nfproj
deleted file mode 100644
index 55f0ed6c5..000000000
--- a/samples/AzureSDK/AzureEdgeOta/CountMeasurement/CountMeasurement.nfproj
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>d5f674ee-f974-4e8d-aca2-d15aef662c74</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>CountMeasurement</RootNamespace>
-    <AssemblyName>CountMeasurement</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="CountMeasurement.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Azure.Devices.Client, Version=1.2.115.6482, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Azure.Devices.Client.1.2.115\lib\nanoFramework.Azure.Devices.Client.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureEdgeOta/CountMeasurement/packages.config b/samples/AzureSDK/AzureEdgeOta/CountMeasurement/packages.config
deleted file mode 100644
index 8f2117f22..000000000
--- a/samples/AzureSDK/AzureEdgeOta/CountMeasurement/packages.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.Azure.Devices.Client" version="1.2.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt.Core" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.csproj b/samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.csproj
new file mode 100644
index 000000000..76049ffee
--- /dev/null
+++ b/samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AzureIoTPnP</RootNamespace>
+    <AssemblyName>AzureIoTPnP</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.Azure.Devices.Client" Version="1.2.115" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.M2Mqtt.Core" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.nfproj b/samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.nfproj
deleted file mode 100644
index a245302c4..000000000
--- a/samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.nfproj
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>22bfed9e-378b-428a-8014-1354c80d7f2b</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AzureIoTPnP</RootNamespace>
-    <AssemblyName>AzureIoTPnP</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Secrets.cs" />
-    <Compile Include="TemperatureReporting.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resource\AzureRootCerts.pem" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Azure.Devices.Client, Version=1.2.115.6482, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Azure.Devices.Client.1.2.115\lib\nanoFramework.Azure.Devices.Client.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.sln b/samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.sln
index 56d3637bc..e133ee175 100644
--- a/samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.sln
+++ b/samples/AzureSDK/AzureIoTPnP/AzureIoTPnP.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AzureIoTPnP", "AzureIoTPnP.nfproj", "{22BFED9E-378B-428A-8014-1354C80D7F2B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureIoTPnP", "AzureIoTPnP.csproj", "{22BFED9E-378B-428A-8014-1354C80D7F2B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/AzureSDK/AzureIoTPnP/Properties/AssemblyInfo.cs b/samples/AzureSDK/AzureIoTPnP/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/AzureSDK/AzureIoTPnP/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AzureSDK/AzureIoTPnP/packages.config b/samples/AzureSDK/AzureIoTPnP/packages.config
deleted file mode 100644
index e0725ef26..000000000
--- a/samples/AzureSDK/AzureIoTPnP/packages.config
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.Azure.Devices.Client" version="1.2.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt.Core" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureSDK/AzureIoTExample.csproj b/samples/AzureSDK/AzureSDK/AzureIoTExample.csproj
new file mode 100644
index 000000000..42634ee07
--- /dev/null
+++ b/samples/AzureSDK/AzureSDK/AzureIoTExample.csproj
@@ -0,0 +1,50 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AzureIoTExample</RootNamespace>
+    <AssemblyName>AzureIoTExample</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.Azure.Devices.Client" Version="1.2.115" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Iot.Device.Bmxx80" Version="1.2.952" />
+    <PackageReference Include="nanoFramework.Iot.Device.Common.WeatherHelper" Version="1.2.950" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.M2Mqtt.Core" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.Networking.Sntp" Version="1.6.42" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Buffers.Binary.BinaryPrimitives" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+    <PackageReference Include="nanoFramework.System.Device.Model" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Client" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.UnitsNet.Duration" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.ElectricResistance" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Length" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Pressure" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.RelativeHumidity" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Temperature" Version="5.76.15" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AzureSDK/AzureSDK/AzureIoTExample.nfproj b/samples/AzureSDK/AzureSDK/AzureIoTExample.nfproj
deleted file mode 100644
index 7aea1bba1..000000000
--- a/samples/AzureSDK/AzureSDK/AzureIoTExample.nfproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>134d1ff7-73cc-4b27-aa43-58fe42996dd1</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AzureIoTExample</RootNamespace>
-    <AssemblyName>AzureIoTExample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resource\AzureRootCerts.pem" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.Bmxx80, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Iot.Device.Bmxx80.1.2.952\lib\Iot.Device.Bmxx80.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Iot.Device.Common.WeatherHelper, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Iot.Device.Common.WeatherHelper.1.2.950\lib\Iot.Device.Common.WeatherHelper.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Azure.Devices.Client, Version=1.2.115.6482, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Azure.Devices.Client.1.2.115\lib\nanoFramework.Azure.Devices.Client.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Networking.Sntp, Version=1.6.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Networking.Sntp.1.6.42\lib\nanoFramework.Networking.Sntp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Duration, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Duration.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Duration.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.ElectricResistance, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.ElectricResistance.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.ElectricResistance.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Length, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Length.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Length.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Pressure, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Pressure.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Pressure.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.RelativeHumidity, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.RelativeHumidity.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.RelativeHumidity.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Temperature, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Temperature.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Temperature.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Buffers.Binary.BinaryPrimitives, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Buffers.Binary.BinaryPrimitives.1.2.862\lib\System.Buffers.Binary.BinaryPrimitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Model, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Model.1.2.862\lib\System.Device.Model.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.Client.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureSDK/AzureIoTExample.sln b/samples/AzureSDK/AzureSDK/AzureIoTExample.sln
index 14b951cdd..8e4b3448d 100644
--- a/samples/AzureSDK/AzureSDK/AzureIoTExample.sln
+++ b/samples/AzureSDK/AzureSDK/AzureIoTExample.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31410.357
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AzureIoTExample", "AzureIoTExample.nfproj", "{134D1FF7-73CC-4B27-AA43-58FE42996DD1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureIoTExample", "AzureIoTExample.csproj", "{134D1FF7-73CC-4B27-AA43-58FE42996DD1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/AzureSDK/AzureSDK/Properties/AssemblyInfo.cs b/samples/AzureSDK/AzureSDK/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/AzureSDK/AzureSDK/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AzureSDK/AzureSDK/packages.config b/samples/AzureSDK/AzureSDK/packages.config
deleted file mode 100644
index 9e576a2d7..000000000
--- a/samples/AzureSDK/AzureSDK/packages.config
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.Azure.Devices.Client" version="1.2.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Bmxx80" version="1.2.952" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Common.WeatherHelper" version="1.2.950" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt.Core" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Networking.Sntp" version="1.6.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Buffers.Binary.BinaryPrimitives" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Model" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Client" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Duration" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.ElectricResistance" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Length" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Pressure" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.RelativeHumidity" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Temperature" version="5.76.15" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.csproj b/samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.csproj
new file mode 100644
index 000000000..73b1ca206
--- /dev/null
+++ b/samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AzureSDKBasic</RootNamespace>
+    <AssemblyName>AzureSDKBasic</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.Azure.Devices.Client" Version="1.2.115" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.M2Mqtt.Core" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.nfproj b/samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.nfproj
deleted file mode 100644
index 32522992a..000000000
--- a/samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.nfproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>eff73131-09b6-4451-8390-3c6ddb225acd</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AzureSDKBasic</RootNamespace>
-    <AssemblyName>AzureSDKBasic</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resource\AzureRootCerts.pem" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Azure.Devices.Client, Version=1.2.115.6482, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Azure.Devices.Client.1.2.115\lib\nanoFramework.Azure.Devices.Client.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.sln b/samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.sln
index adccba6ec..1df55995e 100644
--- a/samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.sln
+++ b/samples/AzureSDK/AzureSDKBasic/AzureSDKBasic.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AzureSDKBasic", "AzureSDKBasic.nfproj", "{EFF73131-09B6-4451-8390-3C6DDB225ACD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureSDKBasic", "AzureSDKBasic.csproj", "{EFF73131-09B6-4451-8390-3C6DDB225ACD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,18 +16,6 @@ Global
 		{EFF73131-09B6-4451-8390-3C6DDB225ACD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFF73131-09B6-4451-8390-3C6DDB225ACD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EFF73131-09B6-4451-8390-3C6DDB225ACD}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/samples/AzureSDK/AzureSDKBasic/Properties/AssemblyInfo.cs b/samples/AzureSDK/AzureSDKBasic/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/AzureSDK/AzureSDKBasic/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AzureSDK/AzureSDKBasic/packages.config b/samples/AzureSDK/AzureSDKBasic/packages.config
deleted file mode 100644
index 667b4415e..000000000
--- a/samples/AzureSDK/AzureSDKBasic/packages.config
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.Azure.Devices.Client" version="1.2.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt.Core" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.csproj b/samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.csproj
new file mode 100644
index 000000000..a80002d2b
--- /dev/null
+++ b/samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.csproj
@@ -0,0 +1,40 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AzureSDKBasic</RootNamespace>
+    <AssemblyName>AzureSDKBasic</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.Azure.Devices.Client.FullyManaged" Version="1.2.115" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Iot.Device.AtModem" Version="1.0.584" />
+    <PackageReference Include="nanoFramework.Iot.Device.Common.GnssDevice" Version="1.0.344" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.M2Mqtt.Core" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.IO.Ports" Version="1.1.132" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.UnitsNet.Angle" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.ElectricPotential" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Ratio" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Speed" Version="5.76.15" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.nfproj b/samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.nfproj
deleted file mode 100644
index 148073e7e..000000000
--- a/samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.nfproj
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>d6fac34f-230e-4b57-9fca-831a60f5a03a</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AzureSDKBasic</RootNamespace>
-    <AssemblyName>AzureSDKBasic</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\DigiCertGlobalRootG2.der" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.AtModem, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Iot.Device.AtModem.1.0.584\lib\Iot.Device.AtModem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Iot.Device.Common.GnssDevice, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Iot.Device.Common.GnssDevice.1.0.344\lib\Iot.Device.Common.GnssDevice.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Azure.Devices.Client, Version=1.2.115.6482, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Azure.Devices.Client.FullyManaged.1.2.115\lib\nanoFramework.Azure.Devices.Client.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.Core.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Angle, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Angle.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Angle.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.ElectricPotential, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.ElectricPotential.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.ElectricPotential.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Ratio, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Ratio.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Ratio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Speed, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Speed.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Speed.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Ports, Version=1.1.132.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Ports.1.1.132\lib\System.IO.Ports.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.sln b/samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.sln
index ad82cf371..1a656cd3e 100644
--- a/samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.sln
+++ b/samples/AzureSDK/AzureSDKBasicFullyManaged/AzureSDKBasic.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AzureSDKBasic", "AzureSDKBasic.nfproj", "{d6fac34f-230e-4b57-9fca-831a60f5a03a}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureSDKBasic", "AzureSDKBasic.csproj", "{D6FAC34F-230E-4B57-9FCA-831A60F5A03A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,24 +10,12 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{d6fac34f-230e-4b57-9fca-831a60f5a03a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{d6fac34f-230e-4b57-9fca-831a60f5a03a}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{d6fac34f-230e-4b57-9fca-831a60f5a03a}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{d6fac34f-230e-4b57-9fca-831a60f5a03a}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{d6fac34f-230e-4b57-9fca-831a60f5a03a}.Release|Any CPU.Build.0 = Release|Any CPU
-		{d6fac34f-230e-4b57-9fca-831a60f5a03a}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9EDF2863-99AC-4CA1-93FE-F48ED3C6D45F}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35948E70-4CE5-45B4-B305-B66B20AB67AD}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{D6FAC34F-230E-4B57-9FCA-831A60F5A03A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6FAC34F-230E-4B57-9FCA-831A60F5A03A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6FAC34F-230E-4B57-9FCA-831A60F5A03A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{D6FAC34F-230E-4B57-9FCA-831A60F5A03A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6FAC34F-230E-4B57-9FCA-831A60F5A03A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6FAC34F-230E-4B57-9FCA-831A60F5A03A}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/samples/AzureSDK/AzureSDKBasicFullyManaged/Properties/AssemblyInfo.cs b/samples/AzureSDK/AzureSDKBasicFullyManaged/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/AzureSDK/AzureSDKBasicFullyManaged/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AzureSDK/AzureSDKBasicFullyManaged/packages.config b/samples/AzureSDK/AzureSDKBasicFullyManaged/packages.config
deleted file mode 100644
index 3b7d3159e..000000000
--- a/samples/AzureSDK/AzureSDKBasicFullyManaged/packages.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.Azure.Devices.Client.FullyManaged" version="1.2.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.AtModem" version="1.0.584" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Common.GnssDevice" version="1.0.344" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt.Core" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Ports" version="1.1.132" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Angle" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.ElectricPotential" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Ratio" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Speed" version="5.76.15" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub.sln b/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub.sln
index b28af416e..cd4b0a81f 100644
--- a/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub.sln
+++ b/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31624.102
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFSensorAzureIoTHub", "NFSensorAzureIoTHub\NFSensorAzureIoTHub.nfproj", "{767AE5F8-17B8-4034-B9B4-DF0740428EAB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NFSensorAzureIoTHub", "NFSensorAzureIoTHub\NFSensorAzureIoTHub.csproj", "{767AE5F8-17B8-4034-B9B4-DF0740428EAB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/NFSensorAzureIoTHub.csproj b/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/NFSensorAzureIoTHub.csproj
new file mode 100644
index 000000000..a298b83b2
--- /dev/null
+++ b/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/NFSensorAzureIoTHub.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BMP280Sensor</RootNamespace>
+    <AssemblyName>BMP280Sensor</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.Azure.Devices.Client" Version="1.2.115" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Iot.Device.Bmxx80" Version="1.2.952" />
+    <PackageReference Include="nanoFramework.Iot.Device.Common.WeatherHelper" Version="1.2.950" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.M2Mqtt.Core" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Buffers.Binary.BinaryPrimitives" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+    <PackageReference Include="nanoFramework.System.Device.Model" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Client" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.UnitsNet.Duration" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.ElectricResistance" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Length" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Pressure" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.RelativeHumidity" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Temperature" Version="5.76.15" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/NFSensorAzureIoTHub.nfproj b/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/NFSensorAzureIoTHub.nfproj
deleted file mode 100644
index f16c8b6d6..000000000
--- a/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/NFSensorAzureIoTHub.nfproj
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>767ae5f8-17b8-4034-b9b4-df0740428eab</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BMP280Sensor</RootNamespace>
-    <AssemblyName>BMP280Sensor</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.Bmxx80, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Iot.Device.Bmxx80.1.2.952\lib\Iot.Device.Bmxx80.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Iot.Device.Common.WeatherHelper, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Iot.Device.Common.WeatherHelper.1.2.950\lib\Iot.Device.Common.WeatherHelper.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Azure.Devices.Client, Version=1.2.115.6482, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Azure.Devices.Client.1.2.115\lib\nanoFramework.Azure.Devices.Client.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Duration, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.Duration.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Duration.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.ElectricResistance, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.ElectricResistance.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.ElectricResistance.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Length, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.Length.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Length.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Pressure, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.Pressure.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Pressure.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.RelativeHumidity, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.RelativeHumidity.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.RelativeHumidity.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Temperature, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.Temperature.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Temperature.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Buffers.Binary.BinaryPrimitives, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Buffers.Binary.BinaryPrimitives.1.2.862\lib\System.Buffers.Binary.BinaryPrimitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Model, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Model.1.2.862\lib\System.Device.Model.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Client.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/Properties/AssemblyInfo.cs b/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/packages.config b/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/packages.config
deleted file mode 100644
index 3a1358d2f..000000000
--- a/samples/AzureSDK/AzureSDKSensorCertificate/NFSensorAzureIoTHub/packages.config
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.Azure.Devices.Client" version="1.2.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Bmxx80" version="1.2.952" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Common.WeatherHelper" version="1.2.950" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt.Core" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Buffers.Binary.BinaryPrimitives" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Model" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Client" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Duration" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.ElectricResistance" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Length" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Pressure" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.RelativeHumidity" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Temperature" version="5.76.15" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.csproj b/samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.csproj
new file mode 100644
index 000000000..c6c4cdab2
--- /dev/null
+++ b/samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.csproj
@@ -0,0 +1,48 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AzureSDKSleepBMP280</RootNamespace>
+    <AssemblyName>AzureSDKSleepBMP280</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.Azure.Devices.Client" Version="1.2.115" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Iot.Device.Bmxx80" Version="1.2.952" />
+    <PackageReference Include="nanoFramework.Iot.Device.Common.WeatherHelper" Version="1.2.950" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.M2Mqtt.Core" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Buffers.Binary.BinaryPrimitives" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+    <PackageReference Include="nanoFramework.System.Device.Model" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.UnitsNet.Duration" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.ElectricResistance" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Length" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Pressure" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.RelativeHumidity" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Temperature" Version="5.76.15" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.nfproj b/samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.nfproj
deleted file mode 100644
index 9c6d1e6e5..000000000
--- a/samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.nfproj
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>5afe04b8-e844-4d16-ac9a-0de7031ea593</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AzureSDKSleepBMP280</RootNamespace>
-    <AssemblyName>AzureSDKSleepBMP280</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resource\AzureRootCerts.pem" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.Bmxx80, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Iot.Device.Bmxx80.1.2.952\lib\Iot.Device.Bmxx80.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Iot.Device.Common.WeatherHelper, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Iot.Device.Common.WeatherHelper.1.2.950\lib\Iot.Device.Common.WeatherHelper.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Azure.Devices.Client, Version=1.2.115.6482, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Azure.Devices.Client.1.2.115\lib\nanoFramework.Azure.Devices.Client.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Duration, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Duration.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Duration.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.ElectricResistance, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.ElectricResistance.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.ElectricResistance.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Length, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Length.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Length.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Pressure, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Pressure.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Pressure.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.RelativeHumidity, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.RelativeHumidity.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.RelativeHumidity.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Temperature, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Temperature.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Temperature.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Buffers.Binary.BinaryPrimitives, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Buffers.Binary.BinaryPrimitives.1.2.862\lib\System.Buffers.Binary.BinaryPrimitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Model, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Model.1.2.862\lib\System.Device.Model.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.sln b/samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.sln
index 59465e18a..be2a0d1ec 100644
--- a/samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.sln
+++ b/samples/AzureSDK/AzureSDKSleepBMP280/AzureSDKSleepBMP280.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31410.357
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AzureSDKSleepBMP280", "AzureSDKSleepBMP280.nfproj", "{5AFE04B8-E844-4D16-AC9A-0DE7031EA593}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureSDKSleepBMP280", "AzureSDKSleepBMP280.csproj", "{5AFE04B8-E844-4D16-AC9A-0DE7031EA593}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/AzureSDK/AzureSDKSleepBMP280/Properties/AssemblyInfo.cs b/samples/AzureSDK/AzureSDKSleepBMP280/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/AzureSDK/AzureSDKSleepBMP280/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AzureSDK/AzureSDKSleepBMP280/packages.config b/samples/AzureSDK/AzureSDKSleepBMP280/packages.config
deleted file mode 100644
index 77bf6f9dd..000000000
--- a/samples/AzureSDK/AzureSDKSleepBMP280/packages.config
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.Azure.Devices.Client" version="1.2.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Bmxx80" version="1.2.952" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Common.WeatherHelper" version="1.2.950" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt.Core" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Buffers.Binary.BinaryPrimitives" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Model" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Duration" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.ElectricResistance" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Length" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Pressure" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.RelativeHumidity" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Temperature" version="5.76.15" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/AzureSDK/DpsSampleApp/DpsSampleApp.csproj b/samples/AzureSDK/DpsSampleApp/DpsSampleApp.csproj
new file mode 100644
index 000000000..29e7f0b15
--- /dev/null
+++ b/samples/AzureSDK/DpsSampleApp/DpsSampleApp.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>DpsSampleApp</RootNamespace>
+    <AssemblyName>DpsSampleApp</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.Azure.Devices.Client" Version="1.2.115" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.M2Mqtt.Core" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/AzureSDK/DpsSampleApp/DpsSampleApp.nfproj b/samples/AzureSDK/DpsSampleApp/DpsSampleApp.nfproj
deleted file mode 100644
index 22020020a..000000000
--- a/samples/AzureSDK/DpsSampleApp/DpsSampleApp.nfproj
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>78b925be-f9d8-40ea-9277-4494d5e0b6b6</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>DpsSampleApp</RootNamespace>
-    <AssemblyName>DpsSampleApp</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resource\AzureRootCerts.pem" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Azure.Devices.Client, Version=1.2.115.6482, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Azure.Devices.Client.1.2.115\lib\nanoFramework.Azure.Devices.Client.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/AzureSDK/DpsSampleApp/DpsSampleApp.sln b/samples/AzureSDK/DpsSampleApp/DpsSampleApp.sln
index cf86c30ea..e56fddde7 100644
--- a/samples/AzureSDK/DpsSampleApp/DpsSampleApp.sln
+++ b/samples/AzureSDK/DpsSampleApp/DpsSampleApp.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31515.178
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "DpsSampleApp", "DpsSampleApp.nfproj", "{78B925BE-F9D8-40EA-9277-4494D5E0B6B6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DpsSampleApp", "DpsSampleApp.csproj", "{78B925BE-F9D8-40EA-9277-4494D5E0B6B6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/AzureSDK/DpsSampleApp/Properties/AssemblyInfo.cs b/samples/AzureSDK/DpsSampleApp/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/AzureSDK/DpsSampleApp/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AzureSDK/DpsSampleApp/packages.config b/samples/AzureSDK/DpsSampleApp/packages.config
deleted file mode 100644
index e0725ef26..000000000
--- a/samples/AzureSDK/DpsSampleApp/packages.config
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.Azure.Devices.Client" version="1.2.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt.Core" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Beginner/AnalogRainSensor/7-AnalogRainSensor.csproj b/samples/Beginner/AnalogRainSensor/7-AnalogRainSensor.csproj
new file mode 100644
index 000000000..b939181c1
--- /dev/null
+++ b/samples/Beginner/AnalogRainSensor/7-AnalogRainSensor.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AnalogRainSensor</RootNamespace>
+    <AssemblyName>AnalogRainSensor</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Adc" Version="1.1.24" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Beginner/AnalogRainSensor/7-AnalogRainSensor.nfproj b/samples/Beginner/AnalogRainSensor/7-AnalogRainSensor.nfproj
deleted file mode 100644
index 18ad1df7e..000000000
--- a/samples/Beginner/AnalogRainSensor/7-AnalogRainSensor.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>337ee449-ea4f-4ae6-8634-5faa582603d0</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AnalogRainSensor</RootNamespace>
-    <AssemblyName>AnalogRainSensor</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Adc, Version=1.1.24.44037, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Adc.1.1.24\lib\System.Device.Adc.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Beginner/AnalogRainSensor/Properties/AssemblyInfo.cs b/samples/Beginner/AnalogRainSensor/Properties/AssemblyInfo.cs
deleted file mode 100644
index b7baab623..000000000
--- a/samples/Beginner/AnalogRainSensor/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Beginner/AnalogRainSensor/packages.config b/samples/Beginner/AnalogRainSensor/packages.config
deleted file mode 100644
index 0fe2dab14..000000000
--- a/samples/Beginner/AnalogRainSensor/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Adc" version="1.1.24" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Beginner/Beginner.sln b/samples/Beginner/Beginner.sln
index 0dc97c6e0..015704ca1 100644
--- a/samples/Beginner/Beginner.sln
+++ b/samples/Beginner/Beginner.sln
@@ -1,23 +1,22 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.12.35506.116
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "1-BlinkLed", "BlinkLed\1-BlinkLed.nfproj", "{558B53B9-75E0-4C13-AFF1-8614B3E0BAA6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "1-BlinkLed", "BlinkLed\1-BlinkLed.csproj", "{558B53B9-75E0-4C13-AFF1-8614B3E0BAA6}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "2-Button", "Button\2-Button.nfproj", "{3FA7A8F9-31FB-45B6-8727-D02C17D15BBA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "2-Button", "Button\2-Button.csproj", "{3FA7A8F9-31FB-45B6-8727-D02C17D15BBA}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "3-ButtonNuget", "ButtonNuget\3-ButtonNuget.nfproj", "{5B17A480-3C0F-4D73-B941-E9F8C2A07925}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "3-ButtonNuget", "ButtonNuget\3-ButtonNuget.csproj", "{5B17A480-3C0F-4D73-B941-E9F8C2A07925}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "5-Buzzer", "Buzzer\5-Buzzer.nfproj", "{9419FC61-403F-4E3D-BE93-B26D4A23B682}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "5-Buzzer", "Buzzer\5-Buzzer.csproj", "{9419FC61-403F-4E3D-BE93-B26D4A23B682}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "4-PwmLed", "PwmLed\4-PwmLed.nfproj", "{24D24536-E9B9-45B8-939A-0FB80EDBDD5D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "4-PwmLed", "PwmLed\4-PwmLed.csproj", "{24D24536-E9B9-45B8-939A-0FB80EDBDD5D}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "6-ServoMotor", "ServoMotor\6-ServoMotor.nfproj", "{9D9F9AF9-8199-457B-89C9-4B4932EB2035}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "6-ServoMotor", "ServoMotor\6-ServoMotor.csproj", "{9D9F9AF9-8199-457B-89C9-4B4932EB2035}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "7-AnalogRainSensor", "AnalogRainSensor\7-AnalogRainSensor.nfproj", "{337EE449-EA4F-4AE6-8634-5FAA582603D0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "7-AnalogRainSensor", "AnalogRainSensor\7-AnalogRainSensor.csproj", "{337EE449-EA4F-4AE6-8634-5FAA582603D0}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "8-TempHumI2c", "TempHumI2c\8-TempHumI2c.nfproj", "{755022BA-BA69-4B18-B9AD-5333010C9FC1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "8-TempHumI2c", "TempHumI2c\8-TempHumI2c.csproj", "{755022BA-BA69-4B18-B9AD-5333010C9FC1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Beginner/BlinkLed/1-BlinkLed.csproj b/samples/Beginner/BlinkLed/1-BlinkLed.csproj
new file mode 100644
index 000000000..02540bb57
--- /dev/null
+++ b/samples/Beginner/BlinkLed/1-BlinkLed.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BlinkLed</RootNamespace>
+    <AssemblyName>BlinkLed</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Beginner/BlinkLed/1-BlinkLed.nfproj b/samples/Beginner/BlinkLed/1-BlinkLed.nfproj
deleted file mode 100644
index 5a9ff4ae8..000000000
--- a/samples/Beginner/BlinkLed/1-BlinkLed.nfproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>558b53b9-75e0-4c13-aff1-8614b3e0baa6</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BlinkLed</RootNamespace>
-    <AssemblyName>BlinkLed</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Beginner/BlinkLed/Properties/AssemblyInfo.cs b/samples/Beginner/BlinkLed/Properties/AssemblyInfo.cs
deleted file mode 100644
index b7baab623..000000000
--- a/samples/Beginner/BlinkLed/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Beginner/BlinkLed/packages.config b/samples/Beginner/BlinkLed/packages.config
deleted file mode 100644
index b5f6ab316..000000000
--- a/samples/Beginner/BlinkLed/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Beginner/Button/2-Button.csproj b/samples/Beginner/Button/2-Button.csproj
new file mode 100644
index 000000000..ff984bb67
--- /dev/null
+++ b/samples/Beginner/Button/2-Button.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Button</RootNamespace>
+    <AssemblyName>Button</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Beginner/Button/2-Button.nfproj b/samples/Beginner/Button/2-Button.nfproj
deleted file mode 100644
index 0118a3b0e..000000000
--- a/samples/Beginner/Button/2-Button.nfproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>3fa7a8f9-31fb-45b6-8727-d02c17d15bba</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Button</RootNamespace>
-    <AssemblyName>Button</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Beginner/Button/Properties/AssemblyInfo.cs b/samples/Beginner/Button/Properties/AssemblyInfo.cs
deleted file mode 100644
index b7baab623..000000000
--- a/samples/Beginner/Button/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Beginner/Button/packages.config b/samples/Beginner/Button/packages.config
deleted file mode 100644
index b5f6ab316..000000000
--- a/samples/Beginner/Button/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Beginner/ButtonNuget/3-ButtonNuget.csproj b/samples/Beginner/ButtonNuget/3-ButtonNuget.csproj
new file mode 100644
index 000000000..9a49b181f
--- /dev/null
+++ b/samples/Beginner/ButtonNuget/3-ButtonNuget.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ButtonNuget</RootNamespace>
+    <AssemblyName>ButtonNuget</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Iot.Device.Button" Version="1.2.931" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Beginner/ButtonNuget/3-ButtonNuget.nfproj b/samples/Beginner/ButtonNuget/3-ButtonNuget.nfproj
deleted file mode 100644
index a4393ba49..000000000
--- a/samples/Beginner/ButtonNuget/3-ButtonNuget.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>5b17a480-3c0f-4d73-b941-e9f8c2a07925</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ButtonNuget</RootNamespace>
-    <AssemblyName>ButtonNuget</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.Button, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Iot.Device.Button.1.2.931\lib\Iot.Device.Button.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Beginner/ButtonNuget/Properties/AssemblyInfo.cs b/samples/Beginner/ButtonNuget/Properties/AssemblyInfo.cs
deleted file mode 100644
index b7baab623..000000000
--- a/samples/Beginner/ButtonNuget/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Beginner/ButtonNuget/packages.config b/samples/Beginner/ButtonNuget/packages.config
deleted file mode 100644
index 8bc8b3b2b..000000000
--- a/samples/Beginner/ButtonNuget/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Button" version="1.2.931" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Beginner/Buzzer/5-Buzzer.csproj b/samples/Beginner/Buzzer/5-Buzzer.csproj
new file mode 100644
index 000000000..fb0f76772
--- /dev/null
+++ b/samples/Beginner/Buzzer/5-Buzzer.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Buzzer</RootNamespace>
+    <AssemblyName>Buzzer</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Iot.Device.Buzzer" Version="1.2.952" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Model" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Device.Pwm" Version="1.1.23" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+    <PackageReference Include="nanoFramework.UnitsNet.Frequency" Version="5.76.15" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Beginner/Buzzer/5-Buzzer.nfproj b/samples/Beginner/Buzzer/5-Buzzer.nfproj
deleted file mode 100644
index 093d60f6e..000000000
--- a/samples/Beginner/Buzzer/5-Buzzer.nfproj
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>9419fc61-403f-4e3d-be93-b26d4a23b682</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Buzzer</RootNamespace>
-    <AssemblyName>Buzzer</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Enums.cs" />
-    <Compile Include="ListMelodyElement.cs" />
-    <Compile Include="MelodyElement.cs" />
-    <Compile Include="MelodyPlayer.cs" />
-    <Compile Include="NoteElement.cs" />
-    <Compile Include="PauseElement.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.Buzzer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Iot.Device.Buzzer.1.2.952\lib\Iot.Device.Buzzer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Frequency, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.Frequency.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Frequency.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Model, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Model.1.2.862\lib\System.Device.Model.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Pwm, Version=1.1.23.36628, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Pwm.1.1.23\lib\System.Device.Pwm.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Beginner/Buzzer/Properties/AssemblyInfo.cs b/samples/Beginner/Buzzer/Properties/AssemblyInfo.cs
deleted file mode 100644
index b7baab623..000000000
--- a/samples/Beginner/Buzzer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Beginner/Buzzer/packages.config b/samples/Beginner/Buzzer/packages.config
deleted file mode 100644
index f67c168da..000000000
--- a/samples/Beginner/Buzzer/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Buzzer" version="1.2.952" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Model" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Pwm" version="1.1.23" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Frequency" version="5.76.15" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Beginner/PwmLed/4-PwmLed.csproj b/samples/Beginner/PwmLed/4-PwmLed.csproj
new file mode 100644
index 000000000..2c9fd73f8
--- /dev/null
+++ b/samples/Beginner/PwmLed/4-PwmLed.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>PwmLed</RootNamespace>
+    <AssemblyName>PwmLed</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Pwm" Version="1.1.23" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Beginner/PwmLed/4-PwmLed.nfproj b/samples/Beginner/PwmLed/4-PwmLed.nfproj
deleted file mode 100644
index baf51e4d7..000000000
--- a/samples/Beginner/PwmLed/4-PwmLed.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>24d24536-e9b9-45b8-939a-0fb80edbdd5d</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>PwmLed</RootNamespace>
-    <AssemblyName>PwmLed</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Pwm, Version=1.1.23.36628, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Pwm.1.1.23\lib\System.Device.Pwm.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Beginner/PwmLed/Properties/AssemblyInfo.cs b/samples/Beginner/PwmLed/Properties/AssemblyInfo.cs
deleted file mode 100644
index b7baab623..000000000
--- a/samples/Beginner/PwmLed/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Beginner/PwmLed/packages.config b/samples/Beginner/PwmLed/packages.config
deleted file mode 100644
index 11a1a06d2..000000000
--- a/samples/Beginner/PwmLed/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Pwm" version="1.1.23" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Beginner/ServoMotor/6-ServoMotor.csproj b/samples/Beginner/ServoMotor/6-ServoMotor.csproj
new file mode 100644
index 000000000..668b39843
--- /dev/null
+++ b/samples/Beginner/ServoMotor/6-ServoMotor.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ServoMotor</RootNamespace>
+    <AssemblyName>ServoMotor</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Iot.Device.ServoMotor" Version="1.2.907" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Pwm" Version="1.1.23" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Beginner/ServoMotor/6-ServoMotor.nfproj b/samples/Beginner/ServoMotor/6-ServoMotor.nfproj
deleted file mode 100644
index 95a188ff0..000000000
--- a/samples/Beginner/ServoMotor/6-ServoMotor.nfproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>9d9f9af9-8199-457b-89c9-4b4932eb2035</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ServoMotor</RootNamespace>
-    <AssemblyName>ServoMotor</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.ServoMotor, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Iot.Device.ServoMotor.1.2.907\lib\Iot.Device.ServoMotor.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Pwm, Version=1.1.23.36628, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Pwm.1.1.23\lib\System.Device.Pwm.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Beginner/ServoMotor/Properties/AssemblyInfo.cs b/samples/Beginner/ServoMotor/Properties/AssemblyInfo.cs
deleted file mode 100644
index b7baab623..000000000
--- a/samples/Beginner/ServoMotor/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Beginner/ServoMotor/packages.config b/samples/Beginner/ServoMotor/packages.config
deleted file mode 100644
index 098a175c3..000000000
--- a/samples/Beginner/ServoMotor/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.ServoMotor" version="1.2.907" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Pwm" version="1.1.23" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Beginner/TempHumI2c/8-TempHumI2c.csproj b/samples/Beginner/TempHumI2c/8-TempHumI2c.csproj
new file mode 100644
index 000000000..55a866ad6
--- /dev/null
+++ b/samples/Beginner/TempHumI2c/8-TempHumI2c.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>TempHumI2c</RootNamespace>
+    <AssemblyName>TempHumI2c</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Iot.Device.Am2320" Version="1.2.952" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Buffers.Binary.BinaryPrimitives" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+    <PackageReference Include="nanoFramework.System.Device.Model" Version="1.2.862" />
+    <PackageReference Include="nanoFramework.UnitsNet.RelativeHumidity" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Temperature" Version="5.76.15" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Beginner/TempHumI2c/8-TempHumI2c.nfproj b/samples/Beginner/TempHumI2c/8-TempHumI2c.nfproj
deleted file mode 100644
index 6ca03bd28..000000000
--- a/samples/Beginner/TempHumI2c/8-TempHumI2c.nfproj
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>755022ba-ba69-4b18-b9ad-5333010c9fc1</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>TempHumI2c</RootNamespace>
-    <AssemblyName>TempHumI2c</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.Am2320, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Iot.Device.Am2320.1.2.952\lib\Iot.Device.Am2320.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.RelativeHumidity, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.RelativeHumidity.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.RelativeHumidity.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Temperature, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.UnitsNet.Temperature.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Temperature.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Buffers.Binary.BinaryPrimitives, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Buffers.Binary.BinaryPrimitives.1.2.862\lib\System.Buffers.Binary.BinaryPrimitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Model, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Model.1.2.862\lib\System.Device.Model.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Beginner/TempHumI2c/Properties/AssemblyInfo.cs b/samples/Beginner/TempHumI2c/Properties/AssemblyInfo.cs
deleted file mode 100644
index b7baab623..000000000
--- a/samples/Beginner/TempHumI2c/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Beginner/TempHumI2c/packages.config b/samples/Beginner/TempHumI2c/packages.config
deleted file mode 100644
index 9aa42b009..000000000
--- a/samples/Beginner/TempHumI2c/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Am2320" version="1.2.952" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Buffers.Binary.BinaryPrimitives" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Model" version="1.2.862" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.RelativeHumidity" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Temperature" version="5.76.15" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Blinky/Blinky.sln b/samples/Blinky/Blinky.sln
index e2932498d..e79dde0e3 100644
--- a/samples/Blinky/Blinky.sln
+++ b/samples/Blinky/Blinky.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Blinky", "Blinky\Blinky.nfproj", "{29BACBB9-C5B6-4BEF-AEEF-9AFE39B678D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blinky", "Blinky\Blinky.csproj", "{29BACBB9-C5B6-4BEF-AEEF-9AFE39B678D9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Blinky/Blinky/Blinky.csproj b/samples/Blinky/Blinky/Blinky.csproj
new file mode 100644
index 000000000..519f6e8f6
--- /dev/null
+++ b/samples/Blinky/Blinky/Blinky.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Blinky</RootNamespace>
+    <AssemblyName>Blinky</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Blinky/Blinky/Blinky.nfproj b/samples/Blinky/Blinky/Blinky.nfproj
deleted file mode 100644
index 1db6cbca1..000000000
--- a/samples/Blinky/Blinky/Blinky.nfproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>29bacbb9-c5b6-4bef-aeef-9afe39b678d9</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Blinky</RootNamespace>
-    <AssemblyName>Blinky</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Blinky/Blinky/Properties/AssemblyInfo.cs b/samples/Blinky/Blinky/Properties/AssemblyInfo.cs
deleted file mode 100644
index 698f2c951..000000000
--- a/samples/Blinky/Blinky/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Blinky/Blinky/packages.config b/samples/Blinky/Blinky/packages.config
deleted file mode 100644
index b5f6ab316..000000000
--- a/samples/Blinky/Blinky/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.csproj b/samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.csproj
new file mode 100644
index 000000000..18ac50c66
--- /dev/null
+++ b/samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BluetoothBeacon</RootNamespace>
+    <AssemblyName>BluetoothBeacon</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.nfproj b/samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.nfproj
deleted file mode 100644
index 42372a2b3..000000000
--- a/samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.nfproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>6b721831-4042-4626-85a1-3242cc75a602</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BluetoothBeacon</RootNamespace>
-    <AssemblyName>BluetoothBeacon</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="IBeacon.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.sln b/samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.sln
index e4452ce71..b433c941a 100644
--- a/samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.sln
+++ b/samples/Bluetooth/BluetoothBeacon/BluetoothBeacon.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33414.496
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "BluetoothBeacon", "BluetoothBeacon.nfproj", "{6B721831-4042-4626-85A1-3242CC75A602}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BluetoothBeacon", "BluetoothBeacon.csproj", "{6B721831-4042-4626-85A1-3242CC75A602}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/BluetoothBeacon/Properties/AssemblyInfo.cs b/samples/Bluetooth/BluetoothBeacon/Properties/AssemblyInfo.cs
deleted file mode 100644
index eda6c3449..000000000
--- a/samples/Bluetooth/BluetoothBeacon/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Bluetooth/BluetoothBeacon/packages.config b/samples/Bluetooth/BluetoothBeacon/packages.config
deleted file mode 100644
index ecb5b2d11..000000000
--- a/samples/Bluetooth/BluetoothBeacon/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.csproj b/samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.csproj
new file mode 100644
index 000000000..6c5f0f116
--- /dev/null
+++ b/samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BluetoothLESample1</RootNamespace>
+    <AssemblyName>BluetoothLESample1</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.nfproj b/samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.nfproj
deleted file mode 100644
index e8c1d7214..000000000
--- a/samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.nfproj
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>e5353d20-0d64-4a0c-b0f8-65aa69dc22a7</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BluetoothLESample1</RootNamespace>
-    <AssemblyName>BluetoothLESample1</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.sln b/samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.sln
index 79cf21390..4d1af2fe5 100644
--- a/samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.sln
+++ b/samples/Bluetooth/BluetoothLESample1/BluetoothLESample1.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32126.315
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "BluetoothLESample1", "BluetoothLESample1.nfproj", "{E5353D20-0D64-4A0C-B0F8-65AA69DC22A7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BluetoothLESample1", "BluetoothLESample1.csproj", "{E5353D20-0D64-4A0C-B0F8-65AA69DC22A7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/BluetoothLESample1/Properties/AssemblyInfo.cs b/samples/Bluetooth/BluetoothLESample1/Properties/AssemblyInfo.cs
deleted file mode 100644
index 13fb595d6..000000000
--- a/samples/Bluetooth/BluetoothLESample1/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/samples/Bluetooth/BluetoothLESample1/packages.config b/samples/Bluetooth/BluetoothLESample1/packages.config
deleted file mode 100644
index 98f19ee94..000000000
--- a/samples/Bluetooth/BluetoothLESample1/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.csproj b/samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.csproj
new file mode 100644
index 000000000..aa4177f5f
--- /dev/null
+++ b/samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BluetoothLESample2</RootNamespace>
+    <AssemblyName>BluetoothLESample2</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.nfproj b/samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.nfproj
deleted file mode 100644
index 509cd956d..000000000
--- a/samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.nfproj
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>2802df92-f5f8-46fe-a946-99610dce32bc</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BluetoothLESample2</RootNamespace>
-    <AssemblyName>BluetoothLESample2</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.sln b/samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.sln
index b3887f6d2..06321c5e4 100644
--- a/samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.sln
+++ b/samples/Bluetooth/BluetoothLESample2/BluetoothLESample2.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32126.315
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "BluetoothLESample2", "BluetoothLESample2.nfproj", "{2802DF92-F5F8-46FE-A946-99610DCE32BC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BluetoothLESample2", "BluetoothLESample2.csproj", "{2802DF92-F5F8-46FE-A946-99610DCE32BC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/BluetoothLESample2/Properties/AssemblyInfo.cs b/samples/Bluetooth/BluetoothLESample2/Properties/AssemblyInfo.cs
deleted file mode 100644
index 13fb595d6..000000000
--- a/samples/Bluetooth/BluetoothLESample2/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/samples/Bluetooth/BluetoothLESample2/packages.config b/samples/Bluetooth/BluetoothLESample2/packages.config
deleted file mode 100644
index 98f19ee94..000000000
--- a/samples/Bluetooth/BluetoothLESample2/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.csproj b/samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.csproj
new file mode 100644
index 000000000..892b3cd08
--- /dev/null
+++ b/samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BluetoothLESample3</RootNamespace>
+    <AssemblyName>BluetoothLESample3</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Services2\BatteryService.cs" />
+    <Compile Remove="Services2\CurrentTimeService.cs" />
+    <Compile Remove="Services2\DeviceInformationService.cs" />
+    <Compile Remove="Services2\EnvironmentalSensorService.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.nfproj b/samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.nfproj
deleted file mode 100644
index 394cd1acb..000000000
--- a/samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.nfproj
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>7e45875f-6644-472e-8768-0590b15b724b</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BluetoothLESample3</RootNamespace>
-    <AssemblyName>BluetoothLESample3</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\BatteryService.cs" />
-    <Compile Include="Services\CurrentTimeService.cs" />
-    <Compile Include="Services\DeviceInformationService.cs" />
-    <Compile Include="Services\EnvironmentalSensorService.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.sln b/samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.sln
index f6c99c237..f19259873 100644
--- a/samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.sln
+++ b/samples/Bluetooth/BluetoothLESample3/BluetoothLESample3.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32126.315
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "BluetoothLESample3", "BluetoothLESample3.nfproj", "{7E45875F-6644-472E-8768-0590B15B724B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BluetoothLESample3", "BluetoothLESample3.csproj", "{7E45875F-6644-472E-8768-0590B15B724B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/BluetoothLESample3/Properties/AssemblyInfo.cs b/samples/Bluetooth/BluetoothLESample3/Properties/AssemblyInfo.cs
deleted file mode 100644
index 13fb595d6..000000000
--- a/samples/Bluetooth/BluetoothLESample3/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/samples/Bluetooth/BluetoothLESample3/packages.config b/samples/Bluetooth/BluetoothLESample3/packages.config
deleted file mode 100644
index 98f19ee94..000000000
--- a/samples/Bluetooth/BluetoothLESample3/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.csproj b/samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.csproj
new file mode 100644
index 000000000..250e39d57
--- /dev/null
+++ b/samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BluetoothLESerial</RootNamespace>
+    <AssemblyName>BluetoothLESerial</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.nfproj b/samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.nfproj
deleted file mode 100644
index 4f95ed676..000000000
--- a/samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.nfproj
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>f24f5287-0d8e-46a8-9a90-f34883b4f1b9</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BluetoothLESerial</RootNamespace>
-    <AssemblyName>BluetoothLESerial</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.sln b/samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.sln
index a8c4b449e..6e8cf8344 100644
--- a/samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.sln
+++ b/samples/Bluetooth/BluetoothLESerial/BluetoothLESerial.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31729.503
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "BluetoothLESerial", "BluetoothLESerial.nfproj", "{F24F5287-0D8E-46A8-9A90-F34883B4F1B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BluetoothLESerial", "BluetoothLESerial.csproj", "{F24F5287-0D8E-46A8-9A90-F34883B4F1B9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/BluetoothLESerial/Properties/AssemblyInfo.cs b/samples/Bluetooth/BluetoothLESerial/Properties/AssemblyInfo.cs
deleted file mode 100644
index 13fb595d6..000000000
--- a/samples/Bluetooth/BluetoothLESerial/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/samples/Bluetooth/BluetoothLESerial/packages.config b/samples/Bluetooth/BluetoothLESerial/packages.config
deleted file mode 100644
index 14d55e54f..000000000
--- a/samples/Bluetooth/BluetoothLESerial/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/BroadcastValues/BroadcastValues.csproj b/samples/Bluetooth/BroadcastValues/BroadcastValues.csproj
new file mode 100644
index 000000000..7823678ce
--- /dev/null
+++ b/samples/Bluetooth/BroadcastValues/BroadcastValues.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BroadcastValues</RootNamespace>
+    <AssemblyName>BroadcastValues</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/BroadcastValues/BroadcastValues.nfproj b/samples/Bluetooth/BroadcastValues/BroadcastValues.nfproj
deleted file mode 100644
index 6d351222e..000000000
--- a/samples/Bluetooth/BroadcastValues/BroadcastValues.nfproj
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>d567031f-6747-473f-811d-c778a8f0ee86</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BroadcastValues</RootNamespace>
-    <AssemblyName>BroadcastValues</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/BroadcastValues/BroadcastValues.sln b/samples/Bluetooth/BroadcastValues/BroadcastValues.sln
index 71fa6a69d..69e2e435d 100644
--- a/samples/Bluetooth/BroadcastValues/BroadcastValues.sln
+++ b/samples/Bluetooth/BroadcastValues/BroadcastValues.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33414.496
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "BroadcastValues", "BroadcastValues.nfproj", "{D567031F-6747-473F-811D-C778A8F0EE86}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BroadcastValues", "BroadcastValues.csproj", "{D567031F-6747-473F-811D-C778A8F0EE86}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/BroadcastValues/Properties/AssemblyInfo.cs b/samples/Bluetooth/BroadcastValues/Properties/AssemblyInfo.cs
deleted file mode 100644
index eda6c3449..000000000
--- a/samples/Bluetooth/BroadcastValues/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Bluetooth/BroadcastValues/packages.config b/samples/Bluetooth/BroadcastValues/packages.config
deleted file mode 100644
index 98f19ee94..000000000
--- a/samples/Bluetooth/BroadcastValues/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/Central1/Central1.csproj b/samples/Bluetooth/Central1/Central1.csproj
new file mode 100644
index 000000000..4e6b1073b
--- /dev/null
+++ b/samples/Bluetooth/Central1/Central1.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Central1</RootNamespace>
+    <AssemblyName>Central1</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/Central1/Central1.nfproj b/samples/Bluetooth/Central1/Central1.nfproj
deleted file mode 100644
index fe66facd2..000000000
--- a/samples/Bluetooth/Central1/Central1.nfproj
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>0eba5f7c-1e9d-4b97-be5a-6722005481ed</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Central1</RootNamespace>
-    <AssemblyName>Central1</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/Central1/Central1.sln b/samples/Bluetooth/Central1/Central1.sln
index b4ba1782c..aabe58d8d 100644
--- a/samples/Bluetooth/Central1/Central1.sln
+++ b/samples/Bluetooth/Central1/Central1.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32630.194
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Central1", "Central1.nfproj", "{0EBA5F7C-1E9D-4B97-BE5A-6722005481ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Central1", "Central1.csproj", "{0EBA5F7C-1E9D-4B97-BE5A-6722005481ED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/Central1/Properties/AssemblyInfo.cs b/samples/Bluetooth/Central1/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/Bluetooth/Central1/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Bluetooth/Central1/packages.config b/samples/Bluetooth/Central1/packages.config
deleted file mode 100644
index 98f19ee94..000000000
--- a/samples/Bluetooth/Central1/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/Central2/Central2.csproj b/samples/Bluetooth/Central2/Central2.csproj
new file mode 100644
index 000000000..a02e4ae7d
--- /dev/null
+++ b/samples/Bluetooth/Central2/Central2.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Central2</RootNamespace>
+    <AssemblyName>Central2</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/Central2/Central2.nfproj b/samples/Bluetooth/Central2/Central2.nfproj
deleted file mode 100644
index ba6995a74..000000000
--- a/samples/Bluetooth/Central2/Central2.nfproj
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>fef7db96-3fa1-454f-bdd7-63f61d5a7c33</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Central2</RootNamespace>
-    <AssemblyName>Central2</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/Central2/Central2.sln b/samples/Bluetooth/Central2/Central2.sln
index 330a1c3eb..e885b4c35 100644
--- a/samples/Bluetooth/Central2/Central2.sln
+++ b/samples/Bluetooth/Central2/Central2.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32630.194
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Central2", "Central2.nfproj", "{FEF7DB96-3FA1-454F-BDD7-63F61D5A7C33}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Central2", "Central2.csproj", "{FEF7DB96-3FA1-454F-BDD7-63F61D5A7C33}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/Central2/Properties/AssemblyInfo.cs b/samples/Bluetooth/Central2/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/Bluetooth/Central2/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Bluetooth/Central2/packages.config b/samples/Bluetooth/Central2/packages.config
deleted file mode 100644
index 98f19ee94..000000000
--- a/samples/Bluetooth/Central2/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/Central3/Central3.csproj b/samples/Bluetooth/Central3/Central3.csproj
new file mode 100644
index 000000000..fae8e1307
--- /dev/null
+++ b/samples/Bluetooth/Central3/Central3.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Central3</RootNamespace>
+    <AssemblyName>Central3</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/Central3/Central3.nfproj b/samples/Bluetooth/Central3/Central3.nfproj
deleted file mode 100644
index 68ecc8274..000000000
--- a/samples/Bluetooth/Central3/Central3.nfproj
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>e63352c3-77f5-4a49-a501-a0ecf6cb6412</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Central3</RootNamespace>
-    <AssemblyName>Central3</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/Central3/Central3.sln b/samples/Bluetooth/Central3/Central3.sln
index e6ce7521c..4032d0ea6 100644
--- a/samples/Bluetooth/Central3/Central3.sln
+++ b/samples/Bluetooth/Central3/Central3.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Central3", "Central3.nfproj", "{E63352C3-77F5-4A49-A501-A0ECF6CB6412}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Central3", "Central3.csproj", "{E63352C3-77F5-4A49-A501-A0ECF6CB6412}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/Central3/Properties/AssemblyInfo.cs b/samples/Bluetooth/Central3/Properties/AssemblyInfo.cs
deleted file mode 100644
index eda6c3449..000000000
--- a/samples/Bluetooth/Central3/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Bluetooth/Central3/packages.config b/samples/Bluetooth/Central3/packages.config
deleted file mode 100644
index ecb5b2d11..000000000
--- a/samples/Bluetooth/Central3/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/ImprovWifi/ImprovWifi.csproj b/samples/Bluetooth/ImprovWifi/ImprovWifi.csproj
new file mode 100644
index 000000000..19a3c7a81
--- /dev/null
+++ b/samples/Bluetooth/ImprovWifi/ImprovWifi.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ImprovWifi</RootNamespace>
+    <AssemblyName>ImprovWifi</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/ImprovWifi/ImprovWifi.nfproj b/samples/Bluetooth/ImprovWifi/ImprovWifi.nfproj
deleted file mode 100644
index 9acba6015..000000000
--- a/samples/Bluetooth/ImprovWifi/ImprovWifi.nfproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>05f3cc2c-5074-44f9-9437-40a9f0268a57</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ImprovWifi</RootNamespace>
-    <AssemblyName>ImprovWifi</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Improv.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/ImprovWifi/ImprovWifi.sln b/samples/Bluetooth/ImprovWifi/ImprovWifi.sln
index 633f90fb0..fa8db8c2a 100644
--- a/samples/Bluetooth/ImprovWifi/ImprovWifi.sln
+++ b/samples/Bluetooth/ImprovWifi/ImprovWifi.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "ImprovWifi", "ImprovWifi.nfproj", "{05F3CC2C-5074-44F9-9437-40A9F0268A57}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImprovWifi", "ImprovWifi.csproj", "{05F3CC2C-5074-44F9-9437-40A9F0268A57}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/ImprovWifi/Properties/AssemblyInfo.cs b/samples/Bluetooth/ImprovWifi/Properties/AssemblyInfo.cs
deleted file mode 100644
index c8c8178ed..000000000
--- a/samples/Bluetooth/ImprovWifi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Improv Wifi")]
-[assembly: AssemblyDescription("nanoframework Improv Wifi")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Improv Wifi")]
-[assembly: AssemblyCopyright("Copyright © 2022 nanoFramework")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/samples/Bluetooth/ImprovWifi/packages.config b/samples/Bluetooth/ImprovWifi/packages.config
deleted file mode 100644
index 00b80fa23..000000000
--- a/samples/Bluetooth/ImprovWifi/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Bluetooth/WatcherFilters/Properties/AssemblyInfo.cs b/samples/Bluetooth/WatcherFilters/Properties/AssemblyInfo.cs
deleted file mode 100644
index eda6c3449..000000000
--- a/samples/Bluetooth/WatcherFilters/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Bluetooth/WatcherFilters/WatcherFilters.csproj b/samples/Bluetooth/WatcherFilters/WatcherFilters.csproj
new file mode 100644
index 000000000..24439bcfd
--- /dev/null
+++ b/samples/Bluetooth/WatcherFilters/WatcherFilters.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WatcherFilters</RootNamespace>
+    <AssemblyName>WatcherFilters</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Bluetooth" Version="1.1.115" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Bluetooth/WatcherFilters/WatcherFilters.nfproj b/samples/Bluetooth/WatcherFilters/WatcherFilters.nfproj
deleted file mode 100644
index c4986032d..000000000
--- a/samples/Bluetooth/WatcherFilters/WatcherFilters.nfproj
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>24056100-982c-42eb-b92e-ce10c5dca1b8</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>WatcherFilters</RootNamespace>
-    <AssemblyName>WatcherFilters</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Bluetooth, Version=1.1.115.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Device.Bluetooth.1.1.115\lib\nanoFramework.Device.Bluetooth.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Bluetooth/WatcherFilters/WatcherFilters.sln b/samples/Bluetooth/WatcherFilters/WatcherFilters.sln
index 205231f05..a928fe8f7 100644
--- a/samples/Bluetooth/WatcherFilters/WatcherFilters.sln
+++ b/samples/Bluetooth/WatcherFilters/WatcherFilters.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33414.496
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "WatcherFilters", "WatcherFilters.nfproj", "{24056100-982C-42EB-B92E-CE10C5DCA1B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WatcherFilters", "WatcherFilters.csproj", "{24056100-982C-42EB-B92E-CE10C5DCA1B8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Bluetooth/WatcherFilters/packages.config b/samples/Bluetooth/WatcherFilters/packages.config
deleted file mode 100644
index 98f19ee94..000000000
--- a/samples/Bluetooth/WatcherFilters/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Bluetooth" version="1.1.115" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/CAN/Can.TestApp.sln b/samples/CAN/Can.TestApp.sln
index 9c471f744..9d039d245 100644
--- a/samples/CAN/Can.TestApp.sln
+++ b/samples/CAN/Can.TestApp.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32505.173
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Can.TestApp", "Can.TestApp\Can.TestApp.nfproj", "{123E7C46-FEDA-4EE5-B218-8221F55047C5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Can.TestApp", "Can.TestApp\Can.TestApp.csproj", "{123E7C46-FEDA-4EE5-B218-8221F55047C5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6071BCD2-5DF7-455F-BCAF-5792388A00D8}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/samples/CAN/Can.TestApp/Can.TestApp.csproj b/samples/CAN/Can.TestApp/Can.TestApp.csproj
new file mode 100644
index 000000000..afe4fc2ec
--- /dev/null
+++ b/samples/CAN/Can.TestApp/Can.TestApp.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Can.TestApp</RootNamespace>
+    <AssemblyName>Can.TestApp</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Device.Can" Version="1.3.26" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/CAN/Can.TestApp/Can.TestApp.nfproj b/samples/CAN/Can.TestApp/Can.TestApp.nfproj
deleted file mode 100644
index 268e1246e..000000000
--- a/samples/CAN/Can.TestApp/Can.TestApp.nfproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>123e7c46-feda-4ee5-b218-8221f55047c5</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Can.TestApp</RootNamespace>
-    <AssemblyName>Can.TestApp</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Device.Can, Version=1.3.26.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Device.Can.1.3.26\lib\nanoFramework.Device.Can.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Devices.Can, Version=1.2.4.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Devices.Can.1.2.4\lib\nanoFramework.Devices.Can.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/CAN/Can.TestApp/Properties/AssemblyInfo.cs b/samples/CAN/Can.TestApp/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/CAN/Can.TestApp/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/CAN/Can.TestApp/packages.config b/samples/CAN/Can.TestApp/packages.config
deleted file mode 100644
index 400b680ad..000000000
--- a/samples/CAN/Can.TestApp/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Device.Can" version="1.3.26" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Collections/Collections.sln b/samples/Collections/Collections.sln
index 65aee9e49..624b2433b 100644
--- a/samples/Collections/Collections.sln
+++ b/samples/Collections/Collections.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.902
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Collections", "Collections\Collections.nfproj", "{198A927F-471E-4041-B4A3-131EBAE1272A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Collections", "Collections\Collections.csproj", "{198A927F-471E-4041-B4A3-131EBAE1272A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Collections/Collections/Collections.csproj b/samples/Collections/Collections/Collections.csproj
new file mode 100644
index 000000000..7608792a2
--- /dev/null
+++ b/samples/Collections/Collections/Collections.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Collections</RootNamespace>
+    <AssemblyName>Collections</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Collections/Collections/Collections.nfproj b/samples/Collections/Collections/Collections.nfproj
deleted file mode 100644
index 75bd837dc..000000000
--- a/samples/Collections/Collections/Collections.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>198a927f-471e-4041-b4a3-131ebae1272a</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Collections</RootNamespace>
-    <AssemblyName>Collections</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Collections/Collections/Properties/AssemblyInfo.cs b/samples/Collections/Collections/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Collections/Collections/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Collections/Collections/packages.config b/samples/Collections/Collections/packages.config
deleted file mode 100644
index 2b00b91bb..000000000
--- a/samples/Collections/Collections/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Converter.Base64/Base64Test.sln b/samples/Converter.Base64/Base64Test.sln
index 4d2c239fd..a7dcc6971 100644
--- a/samples/Converter.Base64/Base64Test.sln
+++ b/samples/Converter.Base64/Base64Test.sln
@@ -6,7 +6,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopBase64Testing", "Des
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Base64TestingShared", "Base64TestingShared\Base64TestingShared.shproj", "{65E7B59A-0F6A-4EFD-880B-EA585CD3D397}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Base64Test", "Base64Test\Base64Test.nfproj", "{97FAF418-8158-4996-9DFF-63463769FFDD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Base64Test", "Base64Test\Base64Test.csproj", "{97FAF418-8158-4996-9DFF-63463769FFDD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Converter.Base64/Base64Test/Base64Test.csproj b/samples/Converter.Base64/Base64Test/Base64Test.csproj
new file mode 100644
index 000000000..155917696
--- /dev/null
+++ b/samples/Converter.Base64/Base64Test/Base64Test.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Base64Test</RootNamespace>
+    <AssemblyName>Base64Test</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+  <Import Project="..\Base64TestingShared\Base64TestingShared.projitems" Label="Shared" />
+
+</Project>
diff --git a/samples/Converter.Base64/Base64Test/Base64Test.nfproj b/samples/Converter.Base64/Base64Test/Base64Test.nfproj
deleted file mode 100644
index 84a267b13..000000000
--- a/samples/Converter.Base64/Base64Test/Base64Test.nfproj
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{97FAF418-8158-4996-9DFF-63463769FFDD}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Base64Test</RootNamespace>
-    <AssemblyName>Base64Test</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="..\Base64TestingShared\Base64TestingShared.projitems" Label="Shared" />
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Converter.Base64/Base64Test/Properties/AssemblyInfo.cs b/samples/Converter.Base64/Base64Test/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Converter.Base64/Base64Test/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Converter.Base64/Base64Test/packages.config b/samples/Converter.Base64/Base64Test/packages.config
deleted file mode 100644
index b5efbbb63..000000000
--- a/samples/Converter.Base64/Base64Test/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/DAC/DacSample.sln b/samples/DAC/DacSample.sln
index 298502b57..28a93bb84 100644
--- a/samples/DAC/DacSample.sln
+++ b/samples/DAC/DacSample.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.705
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "DacSample", "DacSample\DacSample.nfproj", "{ACD083DD-5FCF-4E14-A1D0-AEDE3E63EE4C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DacSample", "DacSample\DacSample.csproj", "{ACD083DD-5FCF-4E14-A1D0-AEDE3E63EE4C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/DAC/DacSample/DacSample.csproj b/samples/DAC/DacSample/DacSample.csproj
new file mode 100644
index 000000000..0cd9bd815
--- /dev/null
+++ b/samples/DAC/DacSample/DacSample.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>DacSample</RootNamespace>
+    <AssemblyName>DacSample</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.System.Device.Dac" Version="1.5.26" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/DAC/DacSample/DacSample.nfproj b/samples/DAC/DacSample/DacSample.nfproj
deleted file mode 100644
index e3742afa4..000000000
--- a/samples/DAC/DacSample/DacSample.nfproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>acd083dd-5fcf-4e14-a1d0-aede3e63ee4c</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>DacSample</RootNamespace>
-    <AssemblyName>DacSample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Scenario1ConfigureDac.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Scenario4SineWave.cs" />
-    <Compile Include="Scenario3SquareWave.cs" />
-    <Compile Include="Scenario2TriangleWave.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Dac, Version=1.5.26.53147, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Dac.1.5.26\lib\System.Device.Dac.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/DAC/DacSample/Properties/AssemblyInfo.cs b/samples/DAC/DacSample/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/DAC/DacSample/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/DAC/DacSample/packages.config b/samples/DAC/DacSample/packages.config
deleted file mode 100644
index 3b5e9fae3..000000000
--- a/samples/DAC/DacSample/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Dac" version="1.5.26" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/DebugGC.Test/DebugGC.Test.csproj b/samples/DebugGC.Test/DebugGC.Test.csproj
new file mode 100644
index 000000000..505d1e2e9
--- /dev/null
+++ b/samples/DebugGC.Test/DebugGC.Test.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>DebugGC.Test</RootNamespace>
+    <AssemblyName>DebugGC.Test</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/DebugGC.Test/DebugGC.Test.nfproj b/samples/DebugGC.Test/DebugGC.Test.nfproj
deleted file mode 100644
index 87fa84a23..000000000
--- a/samples/DebugGC.Test/DebugGC.Test.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>aac17f43-c085-4a4f-b546-14f777549e1b</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>DebugGC.Test</RootNamespace>
-    <AssemblyName>DebugGC.Test</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/DebugGC.Test/DebugGC.Test.sln b/samples/DebugGC.Test/DebugGC.Test.sln
index 33ade1dd3..b0b3c6bf3 100644
--- a/samples/DebugGC.Test/DebugGC.Test.sln
+++ b/samples/DebugGC.Test/DebugGC.Test.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "DebugGC.Test", "DebugGC.Test.nfproj", "{AAC17F43-C085-4A4F-B546-14F777549E1B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DebugGC.Test", "DebugGC.Test.csproj", "{AAC17F43-C085-4A4F-B546-14F777549E1B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/DebugGC.Test/Properties/AssemblyInfo.cs b/samples/DebugGC.Test/Properties/AssemblyInfo.cs
deleted file mode 100644
index f6b8aa3ba..000000000
--- a/samples/DebugGC.Test/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.0.99.0")]
diff --git a/samples/DebugGC.Test/packages.config b/samples/DebugGC.Test/packages.config
deleted file mode 100644
index 22ac587ea..000000000
--- a/samples/DebugGC.Test/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/DependencyInjection/Simple/Properties/AssemblyInfo.cs b/samples/DependencyInjection/Simple/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1aabb5ab1..000000000
--- a/samples/DependencyInjection/Simple/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Simple")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Simple")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
diff --git a/samples/DependencyInjection/Simple/Simple.csproj b/samples/DependencyInjection/Simple/Simple.csproj
new file mode 100644
index 000000000..c8a4f83f1
--- /dev/null
+++ b/samples/DependencyInjection/Simple/Simple.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>nanoFramework.Simple</RootNamespace>
+    <AssemblyName>nanoFramework.Simple</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.DependencyInjection" Version="1.1.32" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/DependencyInjection/Simple/Simple.nfproj b/samples/DependencyInjection/Simple/Simple.nfproj
deleted file mode 100644
index 8d2427fc3..000000000
--- a/samples/DependencyInjection/Simple/Simple.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>333cb8a6-a3a8-4a3d-8f84-bfb7e4de103f</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>nanoFramework.Simple</RootNamespace>
-    <AssemblyName>nanoFramework.Simple</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.DependencyInjection, Version=1.1.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.DependencyInjection.1.1.32\lib\nanoFramework.DependencyInjection.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/DependencyInjection/Simple/Simple.sln b/samples/DependencyInjection/Simple/Simple.sln
index 352f07586..e82657eac 100644
--- a/samples/DependencyInjection/Simple/Simple.sln
+++ b/samples/DependencyInjection/Simple/Simple.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32519.379
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Simple", "Simple.nfproj", "{333CB8D6-A3A8-4A3D-8F84-BFB7E4DE103F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Simple", "Simple.csproj", "{333CB8D6-A3A8-4A3D-8F84-BFB7E4DE103F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/DependencyInjection/Simple/packages.config b/samples/DependencyInjection/Simple/packages.config
deleted file mode 100644
index eff2a132e..000000000
--- a/samples/DependencyInjection/Simple/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.DependencyInjection" version="1.1.32" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/DependencyInjection/SlowBlink/SlowBlink.csproj b/samples/DependencyInjection/SlowBlink/SlowBlink.csproj
new file mode 100644
index 000000000..c57d21b6a
--- /dev/null
+++ b/samples/DependencyInjection/SlowBlink/SlowBlink.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>nanoFramework.SlowBlink</RootNamespace>
+    <AssemblyName>nanoFramework.SlowBlink</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.DependencyInjection" Version="1.1.32" />
+    <PackageReference Include="nanoFramework.Logging" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/DependencyInjection/SlowBlink/SlowBlink.nfproj b/samples/DependencyInjection/SlowBlink/SlowBlink.nfproj
deleted file mode 100644
index 75e9e946d..000000000
--- a/samples/DependencyInjection/SlowBlink/SlowBlink.nfproj
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{E10613D2-3AEA-4D67-84D8-8560178C14B8}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>nanoFramework.SlowBlink</RootNamespace>
-    <AssemblyName>nanoFramework.SlowBlink</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Application.cs" />
-    <Compile Include="Services\HardwareService.cs" />
-    <Compile Include="Services\IHardwareService.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.DependencyInjection, Version=1.1.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.DependencyInjection.1.1.32\lib\nanoFramework.DependencyInjection.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Logging.1.1.161\lib\nanoFramework.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/DependencyInjection/SlowBlink/SlowBlink.sln b/samples/DependencyInjection/SlowBlink/SlowBlink.sln
index 75b1bd4a3..40e3bb23c 100644
--- a/samples/DependencyInjection/SlowBlink/SlowBlink.sln
+++ b/samples/DependencyInjection/SlowBlink/SlowBlink.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32519.379
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SlowBlink", "SlowBlink.nfproj", "{E10613D2-3AEA-4D67-84D8-8560178C14B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlowBlink", "SlowBlink.csproj", "{E10613D2-3AEA-4D67-84D8-8560178C14B8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/DependencyInjection/SlowBlink/packages.config b/samples/DependencyInjection/SlowBlink/packages.config
deleted file mode 100644
index 75ae1a05d..000000000
--- a/samples/DependencyInjection/SlowBlink/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.DependencyInjection" version="1.1.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/ExecutionConstraint/ExecutionConstraint.sln b/samples/ExecutionConstraint/ExecutionConstraint.sln
index b5522c636..571a51d1d 100644
--- a/samples/ExecutionConstraint/ExecutionConstraint.sln
+++ b/samples/ExecutionConstraint/ExecutionConstraint.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2050
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "ExecutionConstraint", "ExecutionConstraint\ExecutionConstraint.nfproj", "{C23CEE25-53B7-4AB2-8277-EDEBF9B861CA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExecutionConstraint", "ExecutionConstraint\ExecutionConstraint.csproj", "{C23CEE25-53B7-4AB2-8277-EDEBF9B861CA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/ExecutionConstraint/ExecutionConstraint/ExecutionConstraint.csproj b/samples/ExecutionConstraint/ExecutionConstraint/ExecutionConstraint.csproj
new file mode 100644
index 000000000..2bc638089
--- /dev/null
+++ b/samples/ExecutionConstraint/ExecutionConstraint/ExecutionConstraint.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ExecutionConstraintDemo</RootNamespace>
+    <AssemblyName>ExecutionConstraintDemo</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/ExecutionConstraint/ExecutionConstraint/ExecutionConstraint.nfproj b/samples/ExecutionConstraint/ExecutionConstraint/ExecutionConstraint.nfproj
deleted file mode 100644
index 8406a20ed..000000000
--- a/samples/ExecutionConstraint/ExecutionConstraint/ExecutionConstraint.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>c23cee25-53b7-4ab2-8277-edebf9b861ca</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ExecutionConstraintDemo</RootNamespace>
-    <AssemblyName>ExecutionConstraintDemo</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/ExecutionConstraint/ExecutionConstraint/Properties/AssemblyInfo.cs b/samples/ExecutionConstraint/ExecutionConstraint/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/ExecutionConstraint/ExecutionConstraint/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/ExecutionConstraint/ExecutionConstraint/packages.config b/samples/ExecutionConstraint/ExecutionConstraint/packages.config
deleted file mode 100644
index 469065cbe..000000000
--- a/samples/ExecutionConstraint/ExecutionConstraint/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/GCStressTest/GCStressTest.csproj b/samples/GCStressTest/GCStressTest.csproj
new file mode 100644
index 000000000..dda940f0d
--- /dev/null
+++ b/samples/GCStressTest/GCStressTest.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>GCStressTest</RootNamespace>
+    <AssemblyName>GCStressTest</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/GCStressTest/GCStressTest.nfproj b/samples/GCStressTest/GCStressTest.nfproj
deleted file mode 100644
index ef85b2e05..000000000
--- a/samples/GCStressTest/GCStressTest.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>1072f384-864d-4e51-b478-153e1e3e9cae</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>GCStressTest</RootNamespace>
-    <AssemblyName>GCStressTest</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/GCStressTest/GCStressTest.sln b/samples/GCStressTest/GCStressTest.sln
index 94b9641ee..0a47f82be 100644
--- a/samples/GCStressTest/GCStressTest.sln
+++ b/samples/GCStressTest/GCStressTest.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "GCStressTest", "GCStressTest.nfproj", "{1072F384-864D-4E51-B478-153E1E3E9CAE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GCStressTest", "GCStressTest.csproj", "{1072F384-864D-4E51-B478-153E1E3E9CAE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/GCStressTest/Properties/AssemblyInfo.cs b/samples/GCStressTest/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7dd9d1fe6..000000000
--- a/samples/GCStressTest/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
\ No newline at end of file
diff --git a/samples/GCStressTest/packages.config b/samples/GCStressTest/packages.config
deleted file mode 100644
index f49f5b084..000000000
--- a/samples/GCStressTest/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/GiantGecko.Adc/ContinuousSampling/ContinuousSampling.csproj b/samples/GiantGecko.Adc/ContinuousSampling/ContinuousSampling.csproj
new file mode 100644
index 000000000..76ea2a11b
--- /dev/null
+++ b/samples/GiantGecko.Adc/ContinuousSampling/ContinuousSampling.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ContinuousSampling</RootNamespace>
+    <AssemblyName>ContinuousSampling</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.GiantGecko.Adc" Version="1.0.49" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/GiantGecko.Adc/ContinuousSampling/ContinuousSampling.nfproj b/samples/GiantGecko.Adc/ContinuousSampling/ContinuousSampling.nfproj
deleted file mode 100644
index 74ce7f255..000000000
--- a/samples/GiantGecko.Adc/ContinuousSampling/ContinuousSampling.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>3a18ba7c-584a-4159-a55e-1af259b0285b</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ContinuousSampling</RootNamespace>
-    <AssemblyName>ContinuousSampling</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.GiantGecko.Adc, Version=1.0.49.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.GiantGecko.Adc.1.0.49\lib\nanoFramework.GiantGecko.Adc.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/GiantGecko.Adc/ContinuousSampling/Properties/AssemblyInfo.cs b/samples/GiantGecko.Adc/ContinuousSampling/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/GiantGecko.Adc/ContinuousSampling/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/GiantGecko.Adc/ContinuousSampling/packages.config b/samples/GiantGecko.Adc/ContinuousSampling/packages.config
deleted file mode 100644
index d0e39418d..000000000
--- a/samples/GiantGecko.Adc/ContinuousSampling/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.GiantGecko.Adc" version="1.0.49" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/GiantGecko.Adc/Gecko ADC samples.sln b/samples/GiantGecko.Adc/Gecko ADC samples.sln
index 3ba33c47c..b6f690eb5 100644
--- a/samples/GiantGecko.Adc/Gecko ADC samples.sln	
+++ b/samples/GiantGecko.Adc/Gecko ADC samples.sln	
@@ -1,11 +1,10 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Read.Channel", "Read.Channel\Read.Channel.nfproj", "{686C1A63-B6DB-48A9-9FF8-6B6A3334D56D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Read.Channel", "Read.Channel\Read.Channel.csproj", "{686C1A63-B6DB-48A9-9FF8-6B6A3334D56D}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "ContinuousSampling", "ContinuousSampling\ContinuousSampling.nfproj", "{3A18BA7C-584A-4159-A55E-1AF259B0285B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ContinuousSampling", "ContinuousSampling\ContinuousSampling.csproj", "{3A18BA7C-584A-4159-A55E-1AF259B0285B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E20BEE0-FB1B-4F1D-96A0-DEC4BAB451E5}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/samples/GiantGecko.Adc/Read.Channel/Properties/AssemblyInfo.cs b/samples/GiantGecko.Adc/Read.Channel/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/GiantGecko.Adc/Read.Channel/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/GiantGecko.Adc/Read.Channel/Read.Channel.csproj b/samples/GiantGecko.Adc/Read.Channel/Read.Channel.csproj
new file mode 100644
index 000000000..43931656e
--- /dev/null
+++ b/samples/GiantGecko.Adc/Read.Channel/Read.Channel.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>GiantGecko.AdcSamples</RootNamespace>
+    <AssemblyName>Read.Channel</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.GiantGecko.Adc" Version="1.0.49" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/GiantGecko.Adc/Read.Channel/Read.Channel.nfproj b/samples/GiantGecko.Adc/Read.Channel/Read.Channel.nfproj
deleted file mode 100644
index ae06ce0d5..000000000
--- a/samples/GiantGecko.Adc/Read.Channel/Read.Channel.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>686c1a63-b6db-48a9-9ff8-6b6a3334d56d</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>GiantGecko.AdcSamples</RootNamespace>
-    <AssemblyName>Read.Channel</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.GiantGecko.Adc, Version=1.0.49.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.GiantGecko.Adc.1.0.49\lib\nanoFramework.GiantGecko.Adc.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/GiantGecko.Adc/Read.Channel/packages.config b/samples/GiantGecko.Adc/Read.Channel/packages.config
deleted file mode 100644
index d0e39418d..000000000
--- a/samples/GiantGecko.Adc/Read.Channel/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.GiantGecko.Adc" version="1.0.49" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.csproj b/samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.csproj
new file mode 100644
index 000000000..0a04678ea
--- /dev/null
+++ b/samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>TestEsp32Counter</RootNamespace>
+    <AssemblyName>TestEsp32Counter</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Pwm" Version="1.1.23" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.nfproj b/samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.nfproj
deleted file mode 100644
index 1e90a870b..000000000
--- a/samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>77c7ee1c-c3f9-44a6-8b78-d6f3fe575e2d</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>TestEsp32Counter</RootNamespace>
-    <AssemblyName>TestEsp32Counter</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Pwm, Version=1.1.23.36628, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Pwm.1.1.23\lib\System.Device.Pwm.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.sln b/samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.sln
index 44048d317..21cb15192 100644
--- a/samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.sln
+++ b/samples/Gpio/Esp32PulseCounter/Esp32PulseCounter.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33502.453
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Esp32PulseCounter", "Esp32PulseCounter.nfproj", "{77C7EE1C-C3F9-44A6-8B78-D6F3FE575E2D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esp32PulseCounter", "Esp32PulseCounter.csproj", "{77C7EE1C-C3F9-44A6-8B78-D6F3FE575E2D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Gpio/Esp32PulseCounter/Properties/AssemblyInfo.cs b/samples/Gpio/Esp32PulseCounter/Properties/AssemblyInfo.cs
deleted file mode 100644
index 00118aded..000000000
--- a/samples/Gpio/Esp32PulseCounter/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Esp32PulseCounter.Example")]
-[assembly: AssemblyProduct("Esp32PulseCounter.Example")]
-[assembly: AssemblyCopyright("Copyright .NET nanoFramework and contributors ©  2023")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/samples/Gpio/Esp32PulseCounter/packages.config b/samples/Gpio/Esp32PulseCounter/packages.config
deleted file mode 100644
index 11a1a06d2..000000000
--- a/samples/Gpio/Esp32PulseCounter/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Pwm" version="1.1.23" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Gpio/Gpio+Events/Gpio+Events.csproj b/samples/Gpio/Gpio+Events/Gpio+Events.csproj
new file mode 100644
index 000000000..52533eef9
--- /dev/null
+++ b/samples/Gpio/Gpio+Events/Gpio+Events.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Gpio.Test</RootNamespace>
+    <AssemblyName>Gpio.Test</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.14.2" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.6" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.28" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Gpio/Gpio+Events/Gpio+Events.nfproj b/samples/Gpio/Gpio+Events/Gpio+Events.nfproj
deleted file mode 100644
index 899efd39f..000000000
--- a/samples/Gpio/Gpio+Events/Gpio+Events.nfproj
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>dc6154fa-5e71-4b7d-acb8-f5b657287fc0</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Gpio.Test</RootNamespace>
-    <AssemblyName>Gpio.Test</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Device.Gpio">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.28\lib\System.Device.Gpio.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Gpio/Gpio+Events/Gpio+Events.sln b/samples/Gpio/Gpio+Events/Gpio+Events.sln
index b0f082d20..daeb42d84 100644
--- a/samples/Gpio/Gpio+Events/Gpio+Events.sln
+++ b/samples/Gpio/Gpio+Events/Gpio+Events.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Gpio+Events", "Gpio+Events.nfproj", "{DC6154FA-5E71-4B7D-ACB8-F5B657287FC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gpio+Events", "Gpio+Events.csproj", "{DC6154FA-5E71-4B7D-ACB8-F5B657287FC0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Gpio/Gpio+Events/Properties/AssemblyInfo.cs b/samples/Gpio/Gpio+Events/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3bea5f08b..000000000
--- a/samples/Gpio/Gpio+Events/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/samples/Gpio/Gpio+Events/packages.config b/samples/Gpio/Gpio+Events/packages.config
deleted file mode 100644
index aefb79474..000000000
--- a/samples/Gpio/Gpio+Events/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.6" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.28" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).csproj b/samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).csproj
new file mode 100644
index 000000000..52533eef9
--- /dev/null
+++ b/samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Gpio.Test</RootNamespace>
+    <AssemblyName>Gpio.Test</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.14.2" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.6" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.28" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).nfproj b/samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).nfproj
deleted file mode 100644
index c15bb8210..000000000
--- a/samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).nfproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>15e179cf-fe10-41e6-a507-b4c26150b275</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Gpio.Test</RootNamespace>
-    <AssemblyName>Gpio.Test</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.9.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.9.1-preview.6\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Device.Gpio">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.28\lib\System.Device.Gpio.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).sln b/samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).sln
index 2c8a71b3f..82e5e4cff 100644
--- a/samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).sln
+++ b/samples/Gpio/Gpio+EventsIoTStyle/Gpio+Events(IoT).sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Gpio+Events(IoT)", "Gpio+Events(IoT).nfproj", "{15E179CF-FE10-41E6-A507-B4C26150B275}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gpio+Events(IoT)", "Gpio+Events(IoT).csproj", "{15E179CF-FE10-41E6-A507-B4C26150B275}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Gpio/Gpio+EventsIoTStyle/Properties/AssemblyInfo.cs b/samples/Gpio/Gpio+EventsIoTStyle/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3bea5f08b..000000000
--- a/samples/Gpio/Gpio+EventsIoTStyle/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/samples/Gpio/Gpio+EventsIoTStyle/packages.config b/samples/Gpio/Gpio+EventsIoTStyle/packages.config
deleted file mode 100644
index aefb79474..000000000
--- a/samples/Gpio/Gpio+EventsIoTStyle/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.6" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.28" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Graphics/GenericDriver/GenericDriver.csproj b/samples/Graphics/GenericDriver/GenericDriver.csproj
new file mode 100644
index 000000000..f692330de
--- /dev/null
+++ b/samples/Graphics/GenericDriver/GenericDriver.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>GenericDriver</RootNamespace>
+    <AssemblyName>GenericDriver</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Graphics" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.Graphics.Core" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Graphics/GenericDriver/GenericDriver.nfproj b/samples/Graphics/GenericDriver/GenericDriver.nfproj
deleted file mode 100644
index 581d64a44..000000000
--- a/samples/Graphics/GenericDriver/GenericDriver.nfproj
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>2d5f8128-a01a-4edb-8d08-298d9e56c564</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>GenericDriver</RootNamespace>
-    <AssemblyName>GenericDriver</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Graphics/GenericDriver/GenericDriver.sln b/samples/Graphics/GenericDriver/GenericDriver.sln
index b7cc4b190..864e19012 100644
--- a/samples/Graphics/GenericDriver/GenericDriver.sln
+++ b/samples/Graphics/GenericDriver/GenericDriver.sln
@@ -1,11 +1,10 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33502.453
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "GenericDriver", "GenericDriver.nfproj", "{2D5F8128-A01A-4EDB-8D08-298D9E56C564}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenericDriver", "GenericDriver.csproj", "{2D5F8128-A01A-4EDB-8D08-298D9E56C564}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "UsingGenericDriver", "..\UsingGenericDriver\UsingGenericDriver.nfproj", "{E296B89E-2C30-49A8-8C9C-88D2C353AC26}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UsingGenericDriver", "..\UsingGenericDriver\UsingGenericDriver.csproj", "{E296B89E-2C30-49A8-8C9C-88D2C353AC26}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Graphics/GenericDriver/Properties/AssemblyInfo.cs b/samples/Graphics/GenericDriver/Properties/AssemblyInfo.cs
deleted file mode 100644
index c913f5661..000000000
--- a/samples/Graphics/GenericDriver/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("GenericGraphic.Example")]
-[assembly: AssemblyProduct("GenericGraphic.Example")]
-[assembly: AssemblyCopyright("Copyright .NET nanoFramework and contributors ©  2023")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
diff --git a/samples/Graphics/GenericDriver/packages.config b/samples/Graphics/GenericDriver/packages.config
deleted file mode 100644
index a76304896..000000000
--- a/samples/Graphics/GenericDriver/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics.Core" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Graphics/Primitives/Primitives.csproj b/samples/Graphics/Primitives/Primitives.csproj
new file mode 100644
index 000000000..d6ebf3b79
--- /dev/null
+++ b/samples/Graphics/Primitives/Primitives.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Primitives</RootNamespace>
+    <AssemblyName>Primitives</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Graphics" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Untitled.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Graphics/Primitives/Primitives.nfproj b/samples/Graphics/Primitives/Primitives.nfproj
deleted file mode 100644
index 589eb8ea5..000000000
--- a/samples/Graphics/Primitives/Primitives.nfproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>3cb7ecf3-f8c0-4b5c-acff-9950f330277c</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Primitives</RootNamespace>
-    <AssemblyName>Primitives</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="SimplePrimitives\BouncingBalls.cs" />
-    <Compile Include="SimplePrimitives\ColourGradient.cs" />
-    <Compile Include="SimplePrimitives\Colours.cs" />
-    <Compile Include="SimplePrimitives\Extensions.cs" />
-    <Compile Include="SimplePrimitives\InformationBar.cs" />
-    <Compile Include="SimplePrimitives\PagedText.cs" />
-    <Compile Include="SimplePrimitives\MatrixRain.cs" />
-    <Compile Include="PandaGif.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-    <Compile Include="SimplePrimitives\FontExamples.cs" />
-    <Compile Include="SimplePrimitives\RandomDrawLine.cs" />
-    <Compile Include="SimplePrimitives\RandomRectangles.cs" />
-    <Compile Include="SimplePrimitives\RandomEllipsesAndClipping.cs" />
-    <Compile Include="SimplePrimitives\RotateImage.cs" />
-    <Compile Include="SimplePrimitives\SetPixels.cs" />
-    <Compile Include="SimplePrimitives\SliceScaling9.cs" />
-    <Compile Include="SimplePrimitives\StretchImage.cs" />
-    <Compile Include="SimplePrimitives\TileImage.cs" />
-    <Compile Include="SimplePrimitives\WritePoint.cs" />
-    <Compile Include="WaterFallJpg.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\comicsansms16.tinyfnt" />
-    <None Include="Resources\courierregular10.tinyfnt" />
-    <None Include="Resources\MatrixFont.tinyfnt" />
-    <None Include="Resources\ninab.tinyfnt" />
-    <None Include="Resources\segoeuiregular12.tinyfnt" />
-    <None Include="Resources\small.tinyfnt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\SoccerBall.gif" />
-    <Content Include="Resources\waterfall_costa_rica.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Graphics/Primitives/Primitives.sln b/samples/Graphics/Primitives/Primitives.sln
index 150edfe71..07c5a7819 100644
--- a/samples/Graphics/Primitives/Primitives.sln
+++ b/samples/Graphics/Primitives/Primitives.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Primitives", "Primitives.nfproj", "{3CB7ECF3-F8C0-4B5C-ACFF-9950F330277C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Primitives", "Primitives.csproj", "{3CB7ECF3-F8C0-4B5C-ACFF-9950F330277C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Graphics/Primitives/Properties/AssemblyInfo.cs b/samples/Graphics/Primitives/Properties/AssemblyInfo.cs
deleted file mode 100644
index 24e3fb977..000000000
--- a/samples/Graphics/Primitives/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Primitives.Sample")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Primitives.Sample")]
-[assembly: AssemblyCopyright("Copyright © 2021 nanoFramework ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Graphics/Primitives/packages.config b/samples/Graphics/Primitives/packages.config
deleted file mode 100644
index 45d659d6c..000000000
--- a/samples/Graphics/Primitives/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Graphics/Screens/m5stack-screen/Properties/AssemblyInfo.cs b/samples/Graphics/Screens/m5stack-screen/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Graphics/Screens/m5stack-screen/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Graphics/Screens/m5stack-screen/m5stack.screen.csproj b/samples/Graphics/Screens/m5stack-screen/m5stack.screen.csproj
new file mode 100644
index 000000000..82da3fd7f
--- /dev/null
+++ b/samples/Graphics/Screens/m5stack-screen/m5stack.screen.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>m5stack.screen</RootNamespace>
+    <AssemblyName>m5stack.screen</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Graphics" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.Pwm" Version="1.1.23" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Graphics/Screens/m5stack-screen/m5stack.screen.nfproj b/samples/Graphics/Screens/m5stack-screen/m5stack.screen.nfproj
deleted file mode 100644
index 88b106404..000000000
--- a/samples/Graphics/Screens/m5stack-screen/m5stack.screen.nfproj
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>c2a421d1-d5ef-4d75-adb9-a895270f75c8</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>m5stack.screen</RootNamespace>
-    <AssemblyName>m5stack.screen</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\segoeuiregular12.tinyfnt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Pwm, Version=1.1.23.36628, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Pwm.1.1.23\lib\System.Device.Pwm.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Graphics/Screens/m5stack-screen/m5stack.screen.sln b/samples/Graphics/Screens/m5stack-screen/m5stack.screen.sln
index 0a6894507..aba3e1804 100644
--- a/samples/Graphics/Screens/m5stack-screen/m5stack.screen.sln
+++ b/samples/Graphics/Screens/m5stack-screen/m5stack.screen.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "m5stack.screen", "m5stack.screen.nfproj", "{C2A421D1-D5EF-4D75-ADB9-A895270F75C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "m5stack.screen", "m5stack.screen.csproj", "{C2A421D1-D5EF-4D75-ADB9-A895270F75C8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Graphics/Screens/m5stack-screen/packages.config b/samples/Graphics/Screens/m5stack-screen/packages.config
deleted file mode 100644
index 7874eb7ed..000000000
--- a/samples/Graphics/Screens/m5stack-screen/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Pwm" version="1.1.23" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Graphics/Screens/m5stick-screen/Properties/AssemblyInfo.cs b/samples/Graphics/Screens/m5stick-screen/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Graphics/Screens/m5stick-screen/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Graphics/Screens/m5stick-screen/m5stick.screen.csproj b/samples/Graphics/Screens/m5stick-screen/m5stick.screen.csproj
new file mode 100644
index 000000000..893f33789
--- /dev/null
+++ b/samples/Graphics/Screens/m5stick-screen/m5stick.screen.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>m5stick.screen</RootNamespace>
+    <AssemblyName>m5stick.screen</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Graphics" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Iot.Device.Axp192" Version="1.2.952" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+    <PackageReference Include="nanoFramework.UnitsNet.ElectricCurrent" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.ElectricPotential" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Power" Version="5.76.15" />
+    <PackageReference Include="nanoFramework.UnitsNet.Temperature" Version="5.76.15" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Graphics/Screens/m5stick-screen/m5stick.screen.nfproj b/samples/Graphics/Screens/m5stick-screen/m5stick.screen.nfproj
deleted file mode 100644
index ecbac3fbc..000000000
--- a/samples/Graphics/Screens/m5stick-screen/m5stick.screen.nfproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>229d7b26-9426-4385-8c38-e8977d498ab6</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>m5stick.screen</RootNamespace>
-    <AssemblyName>m5stick.screen</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.Axp192, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Iot.Device.Axp192.1.2.952\lib\Iot.Device.Axp192.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.ElectricCurrent, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.ElectricCurrent.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.ElectricCurrent.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.ElectricPotential, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.ElectricPotential.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.ElectricPotential.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Power, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Power.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Power.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitsNet.Temperature, Version=5.76.15.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.UnitsNet.Temperature.5.76.15\lib\netnano1.0\nanoFramework.UnitsNet.Temperature.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Graphics/Screens/m5stick-screen/m5stick.screen.sln b/samples/Graphics/Screens/m5stick-screen/m5stick.screen.sln
index 0887b737e..c2a79ca11 100644
--- a/samples/Graphics/Screens/m5stick-screen/m5stick.screen.sln
+++ b/samples/Graphics/Screens/m5stick-screen/m5stick.screen.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31702.278
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "m5stick.screen", "m5stick.screen.nfproj", "{229D7B26-9426-4385-8C38-E8977D498AB6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "m5stick.screen", "m5stick.screen.csproj", "{229D7B26-9426-4385-8C38-E8977D498AB6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Graphics/Screens/m5stick-screen/packages.config b/samples/Graphics/Screens/m5stick-screen/packages.config
deleted file mode 100644
index 299185446..000000000
--- a/samples/Graphics/Screens/m5stick-screen/packages.config
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Axp192" version="1.2.952" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.ElectricCurrent" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.ElectricPotential" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Power" version="5.76.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.UnitsNet.Temperature" version="5.76.15" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/Properties/AssemblyInfo.cs b/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/Properties/AssemblyInfo.cs
deleted file mode 100644
index eda6c3449..000000000
--- a/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/SimpleWpf.Esp32.csproj b/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/SimpleWpf.Esp32.csproj
new file mode 100644
index 000000000..26121cdab
--- /dev/null
+++ b/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/SimpleWpf.Esp32.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>SimpleWpf</RootNamespace>
+    <AssemblyName>SimpleWpf</AssemblyName>
+    <DefineConstants>$(DefineConstants);ESP32;</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Graphics" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\SimpleWpf\GpioButtonInputProvider.cs">
+      <Link>GpioButtonInputProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\SimpleWpf\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <Compile Include="..\SimpleWpf\SimpleWPFApplication.cs">
+      <Link>SimpleWPFApplication.cs</Link>
+    </Compile>
+    <Compile Include="..\SimpleWpf\Resource.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resource.resx</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="..\SimpleWpf\Resource.resx" Link="Resource.resx" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/SimpleWpf.Esp32.nfproj b/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/SimpleWpf.Esp32.nfproj
deleted file mode 100644
index 5917134b4..000000000
--- a/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/SimpleWpf.Esp32.nfproj
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>a0798abe-45fe-4797-9565-8bb08962bc0c</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>SimpleWpf</RootNamespace>
-    <AssemblyName>SimpleWpf</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);ESP32;</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\SimpleWpf\GpioButtonInputProvider.cs">
-      <Link>GpioButtonInputProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\SimpleWpf\Program.cs">
-      <Link>Program.cs</Link>
-    </Compile>
-    <Compile Include="..\SimpleWpf\SimpleWPFApplication.cs">
-      <Link>SimpleWPFApplication.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SimpleWpf\Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\SimpleWpf\Resource.resx" Link="Resource.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/packages.config b/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/packages.config
deleted file mode 100644
index d0eebb9c2..000000000
--- a/samples/Graphics/SimpleWpf/SimpleWpf.Esp32/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Graphics/SimpleWpf/SimpleWpf.sln b/samples/Graphics/SimpleWpf/SimpleWpf.sln
index cc5f421bf..4742ca26a 100644
--- a/samples/Graphics/SimpleWpf/SimpleWpf.sln
+++ b/samples/Graphics/SimpleWpf/SimpleWpf.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34221.43
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SimpleWpf", "SimpleWpf\SimpleWpf.nfproj", "{FFE43682-F092-423A-AA8C-5D0C143CB9CC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleWpf", "SimpleWpf\SimpleWpf.csproj", "{FFE43682-F092-423A-AA8C-5D0C143CB9CC}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SimpleWpf.Esp32", "SimpleWpf.Esp32\SimpleWpf.Esp32.nfproj", "{A0798ABE-45FE-4797-9565-8BB08962BC0C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleWpf.Esp32", "SimpleWpf.Esp32\SimpleWpf.Esp32.csproj", "{A0798ABE-45FE-4797-9565-8BB08962BC0C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Graphics/SimpleWpf/SimpleWpf/Properties/AssemblyInfo.cs b/samples/Graphics/SimpleWpf/SimpleWpf/Properties/AssemblyInfo.cs
deleted file mode 100644
index de6db5204..000000000
--- a/samples/Graphics/SimpleWpf/SimpleWpf/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SimpleWpf.Sample")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SimpleWpf.Sample")]
-[assembly: AssemblyCopyright("Copyright © 2021 nanoFramework ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Graphics/SimpleWpf/SimpleWpf/SimpleWpf.csproj b/samples/Graphics/SimpleWpf/SimpleWpf/SimpleWpf.csproj
new file mode 100644
index 000000000..6b15489b5
--- /dev/null
+++ b/samples/Graphics/SimpleWpf/SimpleWpf/SimpleWpf.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>SimpleWpf</RootNamespace>
+    <AssemblyName>SimpleWpf</AssemblyName>
+    <DefineConstants>$(DefineConstants);STM32F769I_DISCO;</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Graphics" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Graphics/SimpleWpf/SimpleWpf/SimpleWpf.nfproj b/samples/Graphics/SimpleWpf/SimpleWpf/SimpleWpf.nfproj
deleted file mode 100644
index f9311694c..000000000
--- a/samples/Graphics/SimpleWpf/SimpleWpf/SimpleWpf.nfproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>ffe43682-f092-423a-aa8c-5d0c143cb9cc</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>SimpleWpf</RootNamespace>
-    <AssemblyName>SimpleWpf</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);STM32F769I_DISCO;</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="GpioButtonInputProvider.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-    <Compile Include="SimpleWPFApplication.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\courierregular10.tinyfnt" />
-    <None Include="Resources\NinaB.tinyfnt" />
-    <None Include="Resources\small.tinyfnt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\Canvas Panel Icon Small.JPG" />
-    <Content Include="Resources\Canvas Panel Icon.JPG" />
-    <Content Include="Resources\Diagonal Panel Icon Small.JPG" />
-    <Content Include="Resources\Diagonal Panel Icon.JPG" />
-    <Content Include="Resources\Free Drawing Panel Icon Small.JPG" />
-    <Content Include="Resources\Free Drawing Panel Icon.JPG" />
-    <Content Include="Resources\Horizontal Stack Panel Icon Small.JPG" />
-    <Content Include="Resources\Horizontal Stack Panel Icon.JPG" />
-    <Content Include="Resources\Scrollable Panel Icon Small.JPG" />
-    <Content Include="Resources\Scrollable Panel Icon.JPG" />
-    <Content Include="Resources\Vertical Stack Panel Icon Small.JPG" />
-    <Content Include="Resources\Vertical Stack Panel Icon.JPG" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Graphics/SimpleWpf/SimpleWpf/packages.config b/samples/Graphics/SimpleWpf/SimpleWpf/packages.config
deleted file mode 100644
index d4946578d..000000000
--- a/samples/Graphics/SimpleWpf/SimpleWpf/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Graphics/Tetris/Properties/AssemblyInfo.cs b/samples/Graphics/Tetris/Properties/AssemblyInfo.cs
deleted file mode 100644
index cf2d22fce..000000000
--- a/samples/Graphics/Tetris/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Tetris")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tetris")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Graphics/Tetris/Tetris.csproj b/samples/Graphics/Tetris/Tetris.csproj
new file mode 100644
index 000000000..7aab7f16d
--- /dev/null
+++ b/samples/Graphics/Tetris/Tetris.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>NanoTetris</RootNamespace>
+    <AssemblyName>NanoTetris</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Graphics" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="nfResource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>nfResource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Graphics/Tetris/Tetris.nfproj b/samples/Graphics/Tetris/Tetris.nfproj
deleted file mode 100644
index 028d60197..000000000
--- a/samples/Graphics/Tetris/Tetris.nfproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>0ad3e53e-8408-4252-add2-70daafa1d1e2</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NanoTetris</RootNamespace>
-    <AssemblyName>NanoTetris</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="ExtendedWeakReference.cs" />
-    <Compile Include="GameLogic\ByteMatrix.cs" />
-    <Compile Include="GameLogic\GameBlocks.cs" />
-    <Compile Include="GameLogic\GameStatistics.cs" />
-    <Compile Include="GameLogic\GameUniverse.cs" />
-    <Compile Include="GameLogic\HighScoreTable.cs" />
-    <Compile Include="GameLogic\ScoreRecord.cs" />
-    <Compile Include="GpioButtonInputProvider.cs" />
-    <Compile Include="nfResource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>nfResource.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Presentation\BlockBrushes.cs" />
-    <Compile Include="Presentation\GameWindow.cs" />
-    <Compile Include="Presentation\GradientStackPanel.cs" />
-    <Compile Include="Presentation\HighScoreWindow.cs" />
-    <Compile Include="Presentation\MainMenuWindow.cs" />
-    <Compile Include="Presentation\NextBlockView.cs" />
-    <Compile Include="Presentation\ScoreItem.cs" />
-    <Compile Include="Presentation\StatisticsPanel.cs" />
-    <Compile Include="Presentation\UniverseView.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TetrisApp.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-    <None Include="Resources\Consolas23.tinyfnt" />
-    <None Include="Resources\NinaB.tinyfnt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\Logo.gif" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="nfResource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>nfResource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.1.2.45\lib\nanoFramework.Graphics.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Graphics/Tetris/Tetris.sln b/samples/Graphics/Tetris/Tetris.sln
index 8e4a8793d..1c5d507a4 100644
--- a/samples/Graphics/Tetris/Tetris.sln
+++ b/samples/Graphics/Tetris/Tetris.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Tetris", "Tetris.nfproj", "{0AD3E53E-8408-4252-ADD2-70DAAFA1D1E2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tetris", "Tetris.csproj", "{0AD3E53E-8408-4252-ADD2-70DAAFA1D1E2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Graphics/Tetris/packages.config b/samples/Graphics/Tetris/packages.config
deleted file mode 100644
index 94134ab6f..000000000
--- a/samples/Graphics/Tetris/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Graphics/UsingGenericDriver/Properties/AssemblyInfo.cs b/samples/Graphics/UsingGenericDriver/Properties/AssemblyInfo.cs
deleted file mode 100644
index c913f5661..000000000
--- a/samples/Graphics/UsingGenericDriver/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("GenericGraphic.Example")]
-[assembly: AssemblyProduct("GenericGraphic.Example")]
-[assembly: AssemblyCopyright("Copyright .NET nanoFramework and contributors ©  2023")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
diff --git a/samples/Graphics/UsingGenericDriver/UsingGenericDriver.csproj b/samples/Graphics/UsingGenericDriver/UsingGenericDriver.csproj
new file mode 100644
index 000000000..3e4ad67c9
--- /dev/null
+++ b/samples/Graphics/UsingGenericDriver/UsingGenericDriver.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>UsingGenericDriver</RootNamespace>
+    <AssemblyName>UsingGenericDriver</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.14.2" />
+    <PackageReference Include="nanoFramework.Graphics.St7735" Version="1.1.37" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.8" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.13" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.6" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.6.6" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.18" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Graphics/UsingGenericDriver/UsingGenericDriver.nfproj b/samples/Graphics/UsingGenericDriver/UsingGenericDriver.nfproj
deleted file mode 100644
index 48805b82b..000000000
--- a/samples/Graphics/UsingGenericDriver/UsingGenericDriver.nfproj
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>e296b89e-2c30-49a8-8c9c-88d2c353ac26</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>UsingGenericDriver</RootNamespace>
-    <AssemblyName>UsingGenericDriver</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>..\GenericDriver\packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics">
-      <HintPath>..\GenericDriver\packages\nanoFramework.Graphics.St7735.1.1.37\lib\nanoFramework.Graphics.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core">
-      <HintPath>..\GenericDriver\packages\nanoFramework.Graphics.St7735.1.1.37\lib\nanoFramework.Graphics.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.St7735">
-      <HintPath>..\GenericDriver\packages\nanoFramework.Graphics.St7735.1.1.37\lib\nanoFramework.Graphics.St7735.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32">
-      <HintPath>..\GenericDriver\packages\nanoFramework.Hardware.Esp32.1.6.8\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager">
-      <HintPath>..\GenericDriver\packages\nanoFramework.ResourceManager.1.2.13\lib\nanoFramework.ResourceManager.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events">
-      <HintPath>..\GenericDriver\packages\nanoFramework.Runtime.Events.1.11.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native">
-      <HintPath>..\GenericDriver\packages\nanoFramework.Runtime.Native.1.6.6\lib\nanoFramework.Runtime.Native.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections">
-      <HintPath>..\GenericDriver\packages\nanoFramework.System.Collections.1.5.18\lib\nanoFramework.System.Collections.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Graphics/UsingGenericDriver/packages.config b/samples/Graphics/UsingGenericDriver/packages.config
deleted file mode 100644
index 8e4c6dcf4..000000000
--- a/samples/Graphics/UsingGenericDriver/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics.St7735" version="1.1.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.8" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.13" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.6" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.6.6" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.18" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/HTTP/HTTP.Samples.sln b/samples/HTTP/HTTP.Samples.sln
index 1545be5ac..802267622 100644
--- a/samples/HTTP/HTTP.Samples.sln
+++ b/samples/HTTP/HTTP.Samples.sln
@@ -2,21 +2,21 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "HttpWebRequest", "HttpWebRequest\HttpWebRequest.nfproj", "{1A9300F7-EC7D-4149-A7DE-3DAEBF1CE006}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpWebRequest", "HttpWebRequest\HttpWebRequest.csproj", "{1A9300F7-EC7D-4149-A7DE-3DAEBF1CE006}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "HttpListener", "HttpListener\HttpListener.nfproj", "{4C9AC2C4-E98C-4C1A-AFC7-CFB5C4F2292B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpListener", "HttpListener\HttpListener.csproj", "{4C9AC2C4-E98C-4C1A-AFC7-CFB5C4F2292B}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "HttpAzureGET", "HttpAzureGET\HttpAzureGET.nfproj", "{EEDE64A9-092B-4C95-B890-454D18FB7DF0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpAzureGET", "HttpAzureGET\HttpAzureGET.csproj", "{EEDE64A9-092B-4C95-B890-454D18FB7DF0}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "HttpAzurePOST", "HttpAzurePOST\HttpAzurePOST.nfproj", "{CB1EE621-6285-4AE7-837E-CDC27DDE0113}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpAzurePOST", "HttpAzurePOST\HttpAzurePOST.csproj", "{CB1EE621-6285-4AE7-837E-CDC27DDE0113}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "HttpWebRequest_Wifi", "HttpWebRequest_Wifi\HttpWebRequest_Wifi.nfproj", "{C0416744-A7E2-42E3-8F4D-1182420F9746}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpWebRequest_Wifi", "HttpWebRequest_Wifi\HttpWebRequest_Wifi.csproj", "{C0416744-A7E2-42E3-8F4D-1182420F9746}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "HttpListener_Wifi", "HttpListener_Wifi\HttpListener_Wifi.nfproj", "{3D3561FF-CE21-4181-8F22-B1B1D02F6967}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpListener_Wifi", "HttpListener_Wifi\HttpListener_Wifi.csproj", "{3D3561FF-CE21-4181-8F22-B1B1D02F6967}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "HttpAzurePOST_Wifi", "HttpAzurePOST_Wifi\HttpAzurePOST_Wifi.nfproj", "{2A06646D-E30F-45D1-BD30-442FD709A6A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpAzurePOST_Wifi", "HttpAzurePOST_Wifi\HttpAzurePOST_Wifi.csproj", "{2A06646D-E30F-45D1-BD30-442FD709A6A6}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "HttpAzureGET_Wifi", "HttpAzureGET_Wifi\HttpAzureGET_Wifi.nfproj", "{86282DD7-9EA1-413B-9F7E-5A72E6372B52}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpAzureGET_Wifi", "HttpAzureGET_Wifi\HttpAzureGET_Wifi.csproj", "{86282DD7-9EA1-413B-9F7E-5A72E6372B52}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/HTTP/HttpAzureGET/HttpAzureGET.csproj b/samples/HTTP/HttpAzureGET/HttpAzureGET.csproj
new file mode 100644
index 000000000..4cff275bd
--- /dev/null
+++ b/samples/HTTP/HttpAzureGET/HttpAzureGET.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>HttpAzureGET</RootNamespace>
+    <AssemblyName>HttpAzureGET</AssemblyName>
+    <DefineConstants>$(DefineConstants);BUILD_FOR_ESP32</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Client" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/HTTP/HttpAzureGET/HttpAzureGET.nfproj b/samples/HTTP/HttpAzureGET/HttpAzureGET.nfproj
deleted file mode 100644
index 8cd45e378..000000000
--- a/samples/HTTP/HttpAzureGET/HttpAzureGET.nfproj
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>eede64a9-092b-4c95-b890-454d18fb7df0</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>HttpAzureGET</RootNamespace>
-    <AssemblyName>HttpAzureGET</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);BUILD_FOR_ESP32</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SetPoint.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Client.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/HTTP/HttpAzureGET/Properties/AssemblyInfo.cs b/samples/HTTP/HttpAzureGET/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/HTTP/HttpAzureGET/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/HTTP/HttpAzureGET/packages.config b/samples/HTTP/HttpAzureGET/packages.config
deleted file mode 100644
index 87d3b9024..000000000
--- a/samples/HTTP/HttpAzureGET/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Client" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/HTTP/HttpAzureGET_Wifi/HttpAzureGET_Wifi.csproj b/samples/HTTP/HttpAzureGET_Wifi/HttpAzureGET_Wifi.csproj
new file mode 100644
index 000000000..a69a02605
--- /dev/null
+++ b/samples/HTTP/HttpAzureGET_Wifi/HttpAzureGET_Wifi.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>HttpAzureGET</RootNamespace>
+    <AssemblyName>HttpAzureGET</AssemblyName>
+    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
+    <Name>HttpAzureGET</Name>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Client" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\HttpAzureGET\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <Compile Include="..\HttpAzureGET\SetPoint.cs">
+      <Link>SetPoint.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/HTTP/HttpAzureGET_Wifi/HttpAzureGET_Wifi.nfproj b/samples/HTTP/HttpAzureGET_Wifi/HttpAzureGET_Wifi.nfproj
deleted file mode 100644
index d781ee4b0..000000000
--- a/samples/HTTP/HttpAzureGET_Wifi/HttpAzureGET_Wifi.nfproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>86282dd7-9ea1-413b-9f7e-5a72e6372b52</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>HttpAzureGET</RootNamespace>
-    <AssemblyName>HttpAzureGET</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
-    <Name>HttpAzureGET</Name>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\HttpAzureGET\Program.cs">
-      <Link>Program.cs</Link>
-    </Compile>
-    <Compile Include="..\HttpAzureGET\SetPoint.cs">
-      <Link>SetPoint.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Client.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/HTTP/HttpAzureGET_Wifi/Properties/AssemblyInfo.cs b/samples/HTTP/HttpAzureGET_Wifi/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/HTTP/HttpAzureGET_Wifi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/HTTP/HttpAzureGET_Wifi/packages.config b/samples/HTTP/HttpAzureGET_Wifi/packages.config
deleted file mode 100644
index 8fcfd776a..000000000
--- a/samples/HTTP/HttpAzureGET_Wifi/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Client" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/HTTP/HttpAzurePOST/HttpAzurePOST.csproj b/samples/HTTP/HttpAzurePOST/HttpAzurePOST.csproj
new file mode 100644
index 000000000..9adcd109b
--- /dev/null
+++ b/samples/HTTP/HttpAzurePOST/HttpAzurePOST.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>HttpAzurePOST</RootNamespace>
+    <AssemblyName>HttpAzurePOST</AssemblyName>
+    <DefineConstants>$(DefineConstants);BUILD_FOR_ESP32</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Client" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/HTTP/HttpAzurePOST/HttpAzurePOST.nfproj b/samples/HTTP/HttpAzurePOST/HttpAzurePOST.nfproj
deleted file mode 100644
index c59477397..000000000
--- a/samples/HTTP/HttpAzurePOST/HttpAzurePOST.nfproj
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>cb1ee621-6285-4ae7-837e-cdc27dde0113</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>HttpAzurePOST</RootNamespace>
-    <AssemblyName>HttpAzurePOST</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);BUILD_FOR_ESP32</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Temp.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="README.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Client.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/HTTP/HttpAzurePOST/Properties/AssemblyInfo.cs b/samples/HTTP/HttpAzurePOST/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/HTTP/HttpAzurePOST/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/HTTP/HttpAzurePOST/packages.config b/samples/HTTP/HttpAzurePOST/packages.config
deleted file mode 100644
index 87d3b9024..000000000
--- a/samples/HTTP/HttpAzurePOST/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Client" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/HTTP/HttpAzurePOST_Wifi/HttpAzurePOST_Wifi.csproj b/samples/HTTP/HttpAzurePOST_Wifi/HttpAzurePOST_Wifi.csproj
new file mode 100644
index 000000000..4d68368bd
--- /dev/null
+++ b/samples/HTTP/HttpAzurePOST_Wifi/HttpAzurePOST_Wifi.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>HttpAzurePOST</RootNamespace>
+    <AssemblyName>HttpAzurePOST</AssemblyName>
+    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
+    <Name>HttpAzurePOST</Name>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Client" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\HttpAzurePOST\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <Compile Include="..\HttpAzurePOST\Temp.cs">
+      <Link>Temp.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/HTTP/HttpAzurePOST_Wifi/HttpAzurePOST_Wifi.nfproj b/samples/HTTP/HttpAzurePOST_Wifi/HttpAzurePOST_Wifi.nfproj
deleted file mode 100644
index e916c93ab..000000000
--- a/samples/HTTP/HttpAzurePOST_Wifi/HttpAzurePOST_Wifi.nfproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>2a06646d-e30f-45d1-bd30-442fd709a6a6</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>HttpAzurePOST</RootNamespace>
-    <AssemblyName>HttpAzurePOST</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
-    <Name>HttpAzurePOST</Name>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\HttpAzurePOST\Program.cs">
-      <Link>Program.cs</Link>
-    </Compile>
-    <Compile Include="..\HttpAzurePOST\Temp.cs">
-      <Link>Temp.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Client.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/HTTP/HttpAzurePOST_Wifi/Properties/AssemblyInfo.cs b/samples/HTTP/HttpAzurePOST_Wifi/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/HTTP/HttpAzurePOST_Wifi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/HTTP/HttpAzurePOST_Wifi/packages.config b/samples/HTTP/HttpAzurePOST_Wifi/packages.config
deleted file mode 100644
index 8fcfd776a..000000000
--- a/samples/HTTP/HttpAzurePOST_Wifi/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Client" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/HTTP/HttpListener/HttpListener.csproj b/samples/HTTP/HttpListener/HttpListener.csproj
new file mode 100644
index 000000000..3b80e9141
--- /dev/null
+++ b/samples/HTTP/HttpListener/HttpListener.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>HttpSamples.HttpListenerSample</RootNamespace>
+    <AssemblyName>HttpListenerSample</AssemblyName>
+    <DefineConstants>$(DefineConstants);BUILD_FOR_ESP32</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Server" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/HTTP/HttpListener/HttpListener.nfproj b/samples/HTTP/HttpListener/HttpListener.nfproj
deleted file mode 100644
index 5e71e0591..000000000
--- a/samples/HTTP/HttpListener/HttpListener.nfproj
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>4c9ac2c4-e98c-4c1a-afc7-cfb5c4f2292b</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>HttpSamples.HttpListenerSample</RootNamespace>
-    <AssemblyName>HttpListenerSample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);BUILD_FOR_ESP32</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Server.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/HTTP/HttpListener/Properties/AssemblyInfo.cs b/samples/HTTP/HttpListener/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/HTTP/HttpListener/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/HTTP/HttpListener/packages.config b/samples/HTTP/HttpListener/packages.config
deleted file mode 100644
index 4dd66ff1f..000000000
--- a/samples/HTTP/HttpListener/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Server" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/HTTP/HttpListener_Wifi/HttpListener_Wifi.csproj b/samples/HTTP/HttpListener_Wifi/HttpListener_Wifi.csproj
new file mode 100644
index 000000000..2f51d28c9
--- /dev/null
+++ b/samples/HTTP/HttpListener_Wifi/HttpListener_Wifi.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>HttpListener</RootNamespace>
+    <AssemblyName>HttpListener</AssemblyName>
+    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
+    <Name>HttpListener</Name>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Server" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\HttpListener\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/HTTP/HttpListener_Wifi/HttpListener_Wifi.nfproj b/samples/HTTP/HttpListener_Wifi/HttpListener_Wifi.nfproj
deleted file mode 100644
index c212c56ca..000000000
--- a/samples/HTTP/HttpListener_Wifi/HttpListener_Wifi.nfproj
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>3d3561ff-ce21-4181-8f22-b1b1d02f6967</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>HttpListener</RootNamespace>
-    <AssemblyName>HttpListener</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
-    <Name>HttpListener</Name>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\HttpListener\Program.cs">
-      <Link>Program.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Server.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/HTTP/HttpListener_Wifi/Properties/AssemblyInfo.cs b/samples/HTTP/HttpListener_Wifi/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/HTTP/HttpListener_Wifi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/HTTP/HttpListener_Wifi/packages.config b/samples/HTTP/HttpListener_Wifi/packages.config
deleted file mode 100644
index baeae1486..000000000
--- a/samples/HTTP/HttpListener_Wifi/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Server" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/HTTP/HttpWebRequest/HttpWebRequest.csproj b/samples/HTTP/HttpWebRequest/HttpWebRequest.csproj
new file mode 100644
index 000000000..22da1c978
--- /dev/null
+++ b/samples/HTTP/HttpWebRequest/HttpWebRequest.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>HttpSamples.HttpWebRequestSample</RootNamespace>
+    <AssemblyName>HttpWebRequestSample</AssemblyName>
+    <Name>HttpWebRequestSample</Name>
+    <DefineConstants>$(DefineConstants);BUILD_FOR_ESP32</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Client" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <CustomToolNamespace>HttpWebRequestSample</CustomToolNamespace>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/HTTP/HttpWebRequest/HttpWebRequest.nfproj b/samples/HTTP/HttpWebRequest/HttpWebRequest.nfproj
deleted file mode 100644
index 6b8496f80..000000000
--- a/samples/HTTP/HttpWebRequest/HttpWebRequest.nfproj
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>1a9300f7-ec7d-4149-a7de-3daebf1ce006</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>HttpSamples.HttpWebRequestSample</RootNamespace>
-    <AssemblyName>HttpWebRequestSample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <Name>HttpWebRequestSample</Name>
-    <DefineConstants>$(DefineConstants);BUILD_FOR_ESP32</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\DigiCertGlobalRootCA.crt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <CustomToolNamespace>HttpWebRequestSample</CustomToolNamespace>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Client.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/HTTP/HttpWebRequest/Properties/AssemblyInfo.cs b/samples/HTTP/HttpWebRequest/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/HTTP/HttpWebRequest/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/HTTP/HttpWebRequest/packages.config b/samples/HTTP/HttpWebRequest/packages.config
deleted file mode 100644
index cdcf2b0d7..000000000
--- a/samples/HTTP/HttpWebRequest/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Client" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/HTTP/HttpWebRequest_Wifi/HttpWebRequest_Wifi.csproj b/samples/HTTP/HttpWebRequest_Wifi/HttpWebRequest_Wifi.csproj
new file mode 100644
index 000000000..9a2b36e4d
--- /dev/null
+++ b/samples/HTTP/HttpWebRequest_Wifi/HttpWebRequest_Wifi.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>HttpWebRequestSample</RootNamespace>
+    <AssemblyName>HttpWebRequestSample</AssemblyName>
+    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
+    <Name>HttpWebRequestSample</Name>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Client" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\HttpWebRequest\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <CustomToolNamespace>HttpWebRequestSample</CustomToolNamespace>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/HTTP/HttpWebRequest_Wifi/HttpWebRequest_Wifi.nfproj b/samples/HTTP/HttpWebRequest_Wifi/HttpWebRequest_Wifi.nfproj
deleted file mode 100644
index 2d5fd9142..000000000
--- a/samples/HTTP/HttpWebRequest_Wifi/HttpWebRequest_Wifi.nfproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>c0416744-a7e2-42e3-8f4d-1182420f9746</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>HttpWebRequestSample</RootNamespace>
-    <AssemblyName>HttpWebRequestSample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
-    <Name>HttpWebRequestSample</Name>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\HttpWebRequest\Program.cs">
-      <Link>Program.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\digicertglobalrootca.crt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <CustomToolNamespace>HttpWebRequestSample</CustomToolNamespace>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Client.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/HTTP/HttpWebRequest_Wifi/Properties/AssemblyInfo.cs b/samples/HTTP/HttpWebRequest_Wifi/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/HTTP/HttpWebRequest_Wifi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/HTTP/HttpWebRequest_Wifi/packages.config b/samples/HTTP/HttpWebRequest_Wifi/packages.config
deleted file mode 100644
index 7957ccbca..000000000
--- a/samples/HTTP/HttpWebRequest_Wifi/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Client" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiver.sln b/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiver.sln
index a3a988fba..99ce722d0 100644
--- a/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiver.sln
+++ b/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiver.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "InfraredRemoteReceiverSample", "InfraredRemoteReceiverSample\InfraredRemoteReceiverSample.nfproj", "{F4CA8E73-E9A5-42A1-99BE-045ACCB5BA31}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InfraredRemoteReceiverSample", "InfraredRemoteReceiverSample\InfraredRemoteReceiverSample.csproj", "{F4CA8E73-E9A5-42A1-99BE-045ACCB5BA31}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/InfraredRemoteReceiverSample.csproj b/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/InfraredRemoteReceiverSample.csproj
new file mode 100644
index 000000000..5e1f9a8b5
--- /dev/null
+++ b/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/InfraredRemoteReceiverSample.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>IRController</RootNamespace>
+    <AssemblyName>IRController</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32.Rmt" Version="2.0.35" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/InfraredRemoteReceiverSample.nfproj b/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/InfraredRemoteReceiverSample.nfproj
deleted file mode 100644
index 757484bde..000000000
--- a/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/InfraredRemoteReceiverSample.nfproj
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>f4ca8e73-e9a5-42a1-99be-045accb5ba31</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>IRController</RootNamespace>
-    <AssemblyName>IRController</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Decoder.cs" />
-    <Compile Include="InfraredListener.cs" />
-    <Compile Include="NecSignalDecoder.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Protocol.cs" />
-    <Compile Include="SignalData.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32.Rmt, Version=2.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.Rmt.2.0.35\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/Properties/AssemblyInfo.cs b/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/Properties/AssemblyInfo.cs
deleted file mode 100644
index a3ee6a5a8..000000000
--- a/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("InfraredRemoteReceiver")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("InfraredRemoteReceiver")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/packages.config b/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/packages.config
deleted file mode 100644
index d55434a07..000000000
--- a/samples/Hardware.Esp32.Rmt/InfraredRemoteReceiver/InfraredRemoteReceiverSample/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32.Rmt" version="2.0.35" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel.sln b/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel.sln
index 8dc1b71d8..d4e0c6311 100644
--- a/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel.sln
+++ b/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NeoPixel", "NeoPixel\NeoPixel.nfproj", "{CB836559-3264-44AA-8A48-38C6EB5F74E4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoPixel", "NeoPixel\NeoPixel.csproj", "{CB836559-3264-44AA-8A48-38C6EB5F74E4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/NeoPixel.csproj b/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/NeoPixel.csproj
new file mode 100644
index 000000000..a20a55c22
--- /dev/null
+++ b/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/NeoPixel.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>NeoPixel</RootNamespace>
+    <AssemblyName>NeoPixel</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32.Rmt" Version="2.0.35" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/NeoPixel.nfproj b/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/NeoPixel.nfproj
deleted file mode 100644
index a4a43244b..000000000
--- a/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/NeoPixel.nfproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>cb836559-3264-44aa-8a48-38c6eb5f74e4</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NeoPixel</RootNamespace>
-    <AssemblyName>NeoPixel</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Color.cs" />
-    <Compile Include="NeopixelChain.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32.Rmt, Version=2.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.Rmt.2.0.35\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/Properties/AssemblyInfo.cs b/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/packages.config b/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/packages.config
deleted file mode 100644
index 49003ba79..000000000
--- a/samples/Hardware.Esp32.Rmt/NeoPixelStrip/NeoPixel/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32.Rmt" version="2.0.35" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel.sln b/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel.sln
index 8dc1b71d8..d4e0c6311 100644
--- a/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel.sln
+++ b/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NeoPixel", "NeoPixel\NeoPixel.nfproj", "{CB836559-3264-44AA-8A48-38C6EB5F74E4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoPixel", "NeoPixel\NeoPixel.csproj", "{CB836559-3264-44AA-8A48-38C6EB5F74E4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/NeoPixel.csproj b/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/NeoPixel.csproj
new file mode 100644
index 000000000..a20a55c22
--- /dev/null
+++ b/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/NeoPixel.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>NeoPixel</RootNamespace>
+    <AssemblyName>NeoPixel</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32.Rmt" Version="2.0.35" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/NeoPixel.nfproj b/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/NeoPixel.nfproj
deleted file mode 100644
index e1304abce..000000000
--- a/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/NeoPixel.nfproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>cb836559-3264-44aa-8a48-38c6eb5f74e4</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NeoPixel</RootNamespace>
-    <AssemblyName>NeoPixel</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="NeopixelChain.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32.Rmt, Version=2.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.Rmt.2.0.35\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/Properties/AssemblyInfo.cs b/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/packages.config b/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/packages.config
deleted file mode 100644
index 49003ba79..000000000
--- a/samples/Hardware.Esp32.Rmt/NeoPixelStripLowMemory/NeoPixel/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32.Rmt" version="2.0.35" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.Esp32.Rmt/Ultrasonic/Properties/AssemblyInfo.cs b/samples/Hardware.Esp32.Rmt/Ultrasonic/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.Esp32.Rmt/Ultrasonic/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.csproj b/samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.csproj
new file mode 100644
index 000000000..b51de0b08
--- /dev/null
+++ b/samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Ultrasonic</RootNamespace>
+    <AssemblyName>Ultrasonic</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32.Rmt" Version="2.0.35" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.nfproj b/samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.nfproj
deleted file mode 100644
index 56e09ed63..000000000
--- a/samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.nfproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>1604b2ff-fdcb-4262-a31f-d57a087b81e9</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Ultrasonic</RootNamespace>
-    <AssemblyName>Ultrasonic</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Sr04.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32.Rmt, Version=2.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.Rmt.2.0.35\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.sln b/samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.sln
index 65d21463a..f35c5c0ce 100644
--- a/samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.sln
+++ b/samples/Hardware.Esp32.Rmt/Ultrasonic/Ultrasonic.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.1209
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ultrasonic", "Ultrasonic.nfproj", "{1604B2FF-FDCB-4262-A31F-D57A087B81E9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ultrasonic", "Ultrasonic.csproj", "{1604B2FF-FDCB-4262-A31F-D57A087B81E9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hardware.Esp32.Rmt/Ultrasonic/packages.config b/samples/Hardware.Esp32.Rmt/Ultrasonic/packages.config
deleted file mode 100644
index 5fd6c6eec..000000000
--- a/samples/Hardware.Esp32.Rmt/Ultrasonic/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32.Rmt" version="2.0.35" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.Esp32/HardwareEsp32.csproj b/samples/Hardware.Esp32/HardwareEsp32.csproj
new file mode 100644
index 000000000..39d5e22f2
--- /dev/null
+++ b/samples/Hardware.Esp32/HardwareEsp32.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>HardwareEsp32</RootNamespace>
+    <AssemblyName>HardwareEsp32</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.Esp32/HardwareEsp32.nfproj b/samples/Hardware.Esp32/HardwareEsp32.nfproj
deleted file mode 100644
index eda98b412..000000000
--- a/samples/Hardware.Esp32/HardwareEsp32.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>1a43408e-f96f-4ae8-89fe-60bbb942fb17</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>HardwareEsp32</RootNamespace>
-    <AssemblyName>HardwareEsp32</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.Esp32/HardwareEsp32.sln b/samples/Hardware.Esp32/HardwareEsp32.sln
index 0a53cd6b3..3cec03755 100644
--- a/samples/Hardware.Esp32/HardwareEsp32.sln
+++ b/samples/Hardware.Esp32/HardwareEsp32.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27428.2037
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "HardwareEsp32", "HardwareEsp32.nfproj", "{1A43408E-F96F-4AE8-89FE-60BBB942FB17}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HardwareEsp32", "HardwareEsp32.csproj", "{1A43408E-F96F-4AE8-89FE-60BBB942FB17}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hardware.Esp32/Properties/AssemblyInfo.cs b/samples/Hardware.Esp32/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.Esp32/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.Esp32/packages.config b/samples/Hardware.Esp32/packages.config
deleted file mode 100644
index 9e1c7e468..000000000
--- a/samples/Hardware.Esp32/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.GiantGecko/GiantGecko.PowerMode/GiantGecko.PowerMode.csproj b/samples/Hardware.GiantGecko/GiantGecko.PowerMode/GiantGecko.PowerMode.csproj
new file mode 100644
index 000000000..601a71c70
--- /dev/null
+++ b/samples/Hardware.GiantGecko/GiantGecko.PowerMode/GiantGecko.PowerMode.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>GiantGecko.PowerMode</RootNamespace>
+    <AssemblyName>GiantGecko.PowerMode</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.GiantGecko" Version="1.1.16" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.GiantGecko/GiantGecko.PowerMode/GiantGecko.PowerMode.nfproj b/samples/Hardware.GiantGecko/GiantGecko.PowerMode/GiantGecko.PowerMode.nfproj
deleted file mode 100644
index e40c3577a..000000000
--- a/samples/Hardware.GiantGecko/GiantGecko.PowerMode/GiantGecko.PowerMode.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>5eee640b-5049-4bb9-a223-96b96b04f514</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>GiantGecko.PowerMode</RootNamespace>
-    <AssemblyName>GiantGecko.PowerMode</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.GiantGecko, Version=1.1.16.52510, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.GiantGecko.1.1.16\lib\nanoFramework.Hardware.GiantGecko.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.GiantGecko/GiantGecko.PowerMode/Properties/AssemblyInfo.cs b/samples/Hardware.GiantGecko/GiantGecko.PowerMode/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/Hardware.GiantGecko/GiantGecko.PowerMode/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.GiantGecko/GiantGecko.PowerMode/packages.config b/samples/Hardware.GiantGecko/GiantGecko.PowerMode/packages.config
deleted file mode 100644
index 3bdb4f823..000000000
--- a/samples/Hardware.GiantGecko/GiantGecko.PowerMode/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.GiantGecko" version="1.1.16" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/GiantGecko.ReadDeviceIDs.csproj b/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/GiantGecko.ReadDeviceIDs.csproj
new file mode 100644
index 000000000..621d46ae0
--- /dev/null
+++ b/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/GiantGecko.ReadDeviceIDs.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>GiantGecko.ReadDeviceIDs</RootNamespace>
+    <AssemblyName>GiantGecko.ReadDeviceIDs</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.GiantGecko" Version="1.1.16" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/GiantGecko.ReadDeviceIDs.nfproj b/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/GiantGecko.ReadDeviceIDs.nfproj
deleted file mode 100644
index 12086cc14..000000000
--- a/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/GiantGecko.ReadDeviceIDs.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>8f29f025-77c7-48f5-a66d-9f46e26470f6</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>GiantGecko.ReadDeviceIDs</RootNamespace>
-    <AssemblyName>GiantGecko.ReadDeviceIDs</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.GiantGecko, Version=1.1.16.52510, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.GiantGecko.1.1.16\lib\nanoFramework.Hardware.GiantGecko.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/Properties/AssemblyInfo.cs b/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/packages.config b/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/packages.config
deleted file mode 100644
index 404887810..000000000
--- a/samples/Hardware.GiantGecko/GiantGecko.ReadDeviceIDs/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.GiantGecko" version="1.1.16" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.GiantGecko/Hardware.GiantGecko.sln b/samples/Hardware.GiantGecko/Hardware.GiantGecko.sln
index b19db013b..3df7fa6d4 100644
--- a/samples/Hardware.GiantGecko/Hardware.GiantGecko.sln
+++ b/samples/Hardware.GiantGecko/Hardware.GiantGecko.sln
@@ -1,11 +1,10 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "GiantGecko.ReadDeviceIDs", "GiantGecko.ReadDeviceIDs\GiantGecko.ReadDeviceIDs.nfproj", "{8F29F025-77C7-48F5-A66D-9F46E26470F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GiantGecko.ReadDeviceIDs", "GiantGecko.ReadDeviceIDs\GiantGecko.ReadDeviceIDs.csproj", "{8F29F025-77C7-48F5-A66D-9F46E26470F6}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "GiantGecko.PowerMode", "GiantGecko.PowerMode\GiantGecko.PowerMode.nfproj", "{5EEE640B-5049-4BB9-A223-96B96B04F514}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GiantGecko.PowerMode", "GiantGecko.PowerMode\GiantGecko.PowerMode.csproj", "{5EEE640B-5049-4BB9-A223-96B96B04F514}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{22B536D0-9F84-46DA-856B-694BB107CD88}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/samples/Hardware.Stm32/Hardware.Stm32.sln b/samples/Hardware.Stm32/Hardware.Stm32.sln
index bee51cbc3..cc509da1d 100644
--- a/samples/Hardware.Stm32/Hardware.Stm32.sln
+++ b/samples/Hardware.Stm32/Hardware.Stm32.sln
@@ -2,13 +2,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33530.505
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Stm32BackupMemory", "Stm32.BackupMemory\Stm32BackupMemory.nfproj", "{3F0E07F9-2E2F-45AC-8C9D-04CA963D46F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stm32BackupMemory", "Stm32.BackupMemory\Stm32BackupMemory.csproj", "{3F0E07F9-2E2F-45AC-8C9D-04CA963D46F6}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Stm32.ReadDeviceIDs", "Stm32.ReadDeviceIDs\Stm32.ReadDeviceIDs.nfproj", "{DBD4D1FC-3363-4F6A-B27F-B5DFF336A51A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stm32.ReadDeviceIDs", "Stm32.ReadDeviceIDs\Stm32.ReadDeviceIDs.csproj", "{DBD4D1FC-3363-4F6A-B27F-B5DFF336A51A}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Stm32.TestAlarms", "Stm32.TestAlarms\Stm32.TestAlarms.nfproj", "{E636394B-4E2D-4B66-9AA7-FE2299B45F7A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stm32.TestAlarms", "Stm32.TestAlarms\Stm32.TestAlarms.csproj", "{E636394B-4E2D-4B66-9AA7-FE2299B45F7A}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Stm32.PowerMode", "Stm32.PowerMode\Stm32.PowerMode.nfproj", "{35BE18F3-ACF1-4A59-A929-6F86F05B2748}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stm32.PowerMode", "Stm32.PowerMode\Stm32.PowerMode.csproj", "{35BE18F3-ACF1-4A59-A929-6F86F05B2748}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hardware.Stm32/Stm32.BackupMemory/Properties/AssemblyInfo.cs b/samples/Hardware.Stm32/Stm32.BackupMemory/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.Stm32/Stm32.BackupMemory/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.Stm32/Stm32.BackupMemory/Stm32BackupMemory.csproj b/samples/Hardware.Stm32/Stm32.BackupMemory/Stm32BackupMemory.csproj
new file mode 100644
index 000000000..c1109be84
--- /dev/null
+++ b/samples/Hardware.Stm32/Stm32.BackupMemory/Stm32BackupMemory.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Stm32BackupMemory.TestApp</RootNamespace>
+    <AssemblyName>Stm32BackupMemory.TestApp</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Stm32" Version="1.10.37" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.Stm32/Stm32.BackupMemory/Stm32BackupMemory.nfproj b/samples/Hardware.Stm32/Stm32.BackupMemory/Stm32BackupMemory.nfproj
deleted file mode 100644
index 6bca9db1b..000000000
--- a/samples/Hardware.Stm32/Stm32.BackupMemory/Stm32BackupMemory.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>3f0e07f9-2e2f-45ac-8c9d-04ca963d46f6</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Stm32BackupMemory.TestApp</RootNamespace>
-    <AssemblyName>Stm32BackupMemory.TestApp</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Stm32, Version=1.10.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Stm32.1.10.37\lib\nanoFramework.Hardware.Stm32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.Stm32/Stm32.BackupMemory/packages.config b/samples/Hardware.Stm32/Stm32.BackupMemory/packages.config
deleted file mode 100644
index fe3482480..000000000
--- a/samples/Hardware.Stm32/Stm32.BackupMemory/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Stm32" version="1.10.37" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.Stm32/Stm32.PowerMode/Properties/AssemblyInfo.cs b/samples/Hardware.Stm32/Stm32.PowerMode/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.Stm32/Stm32.PowerMode/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.Stm32/Stm32.PowerMode/Stm32.PowerMode.csproj b/samples/Hardware.Stm32/Stm32.PowerMode/Stm32.PowerMode.csproj
new file mode 100644
index 000000000..e3efecddd
--- /dev/null
+++ b/samples/Hardware.Stm32/Stm32.PowerMode/Stm32.PowerMode.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Stm32.PowerMode</RootNamespace>
+    <AssemblyName>Stm32.PowerMode</AssemblyName>
+    <Name>Stm32.PowerMode</Name>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Extensions.Stm32.GpioController" Version="1.13.0" />
+    <PackageReference Include="nanoFramework.Hardware.Stm32" Version="1.10.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.Windows.Devices.Gpio" Version="1.5.5" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.Stm32/Stm32.PowerMode/Stm32.PowerMode.nfproj b/samples/Hardware.Stm32/Stm32.PowerMode/Stm32.PowerMode.nfproj
deleted file mode 100644
index 757cf0635..000000000
--- a/samples/Hardware.Stm32/Stm32.PowerMode/Stm32.PowerMode.nfproj
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>35be18f3-acf1-4a59-a929-6f86f05b2748</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Stm32.PowerMode</RootNamespace>
-    <AssemblyName>Stm32.PowerMode</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <Name>Stm32.PowerMode</Name>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Stm32.GpioController.Extensions.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Stm32, Version=1.10.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Stm32.1.10.37\lib\nanoFramework.Hardware.Stm32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Windows.Devices.Gpio, Version=1.5.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Devices.Gpio.1.5.5\lib\Windows.Devices.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.Stm32/Stm32.PowerMode/packages.config b/samples/Hardware.Stm32/Stm32.PowerMode/packages.config
deleted file mode 100644
index e248a27f2..000000000
--- a/samples/Hardware.Stm32/Stm32.PowerMode/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Extensions.Stm32.GpioController" version="1.13.0" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Hardware.Stm32" version="1.10.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Windows.Devices.Gpio" version="1.5.5" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/Properties/AssemblyInfo.cs b/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/Stm32.ReadDeviceIDs.csproj b/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/Stm32.ReadDeviceIDs.csproj
new file mode 100644
index 000000000..2640c0eb1
--- /dev/null
+++ b/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/Stm32.ReadDeviceIDs.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Stm32.ReadDeviceIDs</RootNamespace>
+    <AssemblyName>Stm32.ReadDeviceIDs</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Stm32" Version="1.10.37" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/Stm32.ReadDeviceIDs.nfproj b/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/Stm32.ReadDeviceIDs.nfproj
deleted file mode 100644
index 4145964c3..000000000
--- a/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/Stm32.ReadDeviceIDs.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>dbd4d1fc-3363-4f6a-b27f-b5dff336a51a</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Stm32.ReadDeviceIDs</RootNamespace>
-    <AssemblyName>Stm32.ReadDeviceIDs</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Stm32, Version=1.10.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Stm32.1.10.37\lib\nanoFramework.Hardware.Stm32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/packages.config b/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/packages.config
deleted file mode 100644
index fe3482480..000000000
--- a/samples/Hardware.Stm32/Stm32.ReadDeviceIDs/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Stm32" version="1.10.37" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.Stm32/Stm32.TestAlarms/Properties/AssemblyInfo.cs b/samples/Hardware.Stm32/Stm32.TestAlarms/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.Stm32/Stm32.TestAlarms/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.Stm32/Stm32.TestAlarms/Stm32.TestAlarms.csproj b/samples/Hardware.Stm32/Stm32.TestAlarms/Stm32.TestAlarms.csproj
new file mode 100644
index 000000000..faa20e0d3
--- /dev/null
+++ b/samples/Hardware.Stm32/Stm32.TestAlarms/Stm32.TestAlarms.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Stm32.TestAlarms</RootNamespace>
+    <AssemblyName>Stm32.TestAlarms</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Stm32" Version="1.10.37" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.Stm32/Stm32.TestAlarms/Stm32.TestAlarms.nfproj b/samples/Hardware.Stm32/Stm32.TestAlarms/Stm32.TestAlarms.nfproj
deleted file mode 100644
index bd25b985a..000000000
--- a/samples/Hardware.Stm32/Stm32.TestAlarms/Stm32.TestAlarms.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>e636394b-4e2d-4b66-9aa7-fe2299b45f7a</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Stm32.TestAlarms</RootNamespace>
-    <AssemblyName>Stm32.TestAlarms</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Stm32, Version=1.10.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Stm32.1.10.37\lib\nanoFramework.Hardware.Stm32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.Stm32/Stm32.TestAlarms/packages.config b/samples/Hardware.Stm32/Stm32.TestAlarms/packages.config
deleted file mode 100644
index fe3482480..000000000
--- a/samples/Hardware.Stm32/Stm32.TestAlarms/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Stm32" version="1.10.37" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.TI/Hardware.TI.sln b/samples/Hardware.TI/Hardware.TI.sln
index 773351c83..38f101f0f 100644
--- a/samples/Hardware.TI/Hardware.TI.sln
+++ b/samples/Hardware.TI/Hardware.TI.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "TI.PowerMode", "TI.PowerMode\TI.PowerMode.nfproj", "{DDC74490-0B98-4209-B0DD-8093026A4FF7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TI.PowerMode", "TI.PowerMode\TI.PowerMode.csproj", "{DDC74490-0B98-4209-B0DD-8093026A4FF7}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "TI.Utilities", "TI.Utilities\TI.Utilities.nfproj", "{760CEBA5-A4A8-4909-A67C-8AED53E9B1CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TI.Utilities", "TI.Utilities\TI.Utilities.csproj", "{760CEBA5-A4A8-4909-A67C-8AED53E9B1CE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hardware.TI/TI.PowerMode/Properties/AssemblyInfo.cs b/samples/Hardware.TI/TI.PowerMode/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.TI/TI.PowerMode/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.TI/TI.PowerMode/TI.PowerMode.csproj b/samples/Hardware.TI/TI.PowerMode/TI.PowerMode.csproj
new file mode 100644
index 000000000..9e3b87e22
--- /dev/null
+++ b/samples/Hardware.TI/TI.PowerMode/TI.PowerMode.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>TI.PowerMode</RootNamespace>
+    <AssemblyName>TI.PowerMode</AssemblyName>
+    <Name>TI.PowerMode</Name>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.TI" Version="1.1.27" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.TI/TI.PowerMode/TI.PowerMode.nfproj b/samples/Hardware.TI/TI.PowerMode/TI.PowerMode.nfproj
deleted file mode 100644
index e49802ab8..000000000
--- a/samples/Hardware.TI/TI.PowerMode/TI.PowerMode.nfproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>ddc74490-0b98-4209-b0dd-8093026a4ff7</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>TI.PowerMode</RootNamespace>
-    <AssemblyName>TI.PowerMode</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <Name>TI.PowerMode</Name>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.TI, Version=1.1.27.15011, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.TI.1.1.27\lib\nanoFramework.Hardware.TI.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.TI/TI.PowerMode/packages.config b/samples/Hardware.TI/TI.PowerMode/packages.config
deleted file mode 100644
index 5abf49edd..000000000
--- a/samples/Hardware.TI/TI.PowerMode/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.TI" version="1.1.27" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hardware.TI/TI.Utilities/Properties/AssemblyInfo.cs b/samples/Hardware.TI/TI.Utilities/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Hardware.TI/TI.Utilities/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hardware.TI/TI.Utilities/TI.Utilities.csproj b/samples/Hardware.TI/TI.Utilities/TI.Utilities.csproj
new file mode 100644
index 000000000..f0aab184b
--- /dev/null
+++ b/samples/Hardware.TI/TI.Utilities/TI.Utilities.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>TI.Utilities</RootNamespace>
+    <AssemblyName>TI.Utilities</AssemblyName>
+    <Name>TI.Utilities</Name>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.TI" Version="1.1.27" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hardware.TI/TI.Utilities/TI.Utilities.nfproj b/samples/Hardware.TI/TI.Utilities/TI.Utilities.nfproj
deleted file mode 100644
index 48656ad87..000000000
--- a/samples/Hardware.TI/TI.Utilities/TI.Utilities.nfproj
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>760ceba5-a4a8-4909-a67c-8aed53e9b1ce</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>TI.Utilities</RootNamespace>
-    <AssemblyName>TI.Utilities</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <Name>TI.Utilities</Name>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.TI, Version=1.1.27.15011, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.TI.1.1.27\lib\nanoFramework.Hardware.TI.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hardware.TI/TI.Utilities/packages.config b/samples/Hardware.TI/TI.Utilities/packages.config
deleted file mode 100644
index 589287579..000000000
--- a/samples/Hardware.TI/TI.Utilities/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.TI" version="1.1.27" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hosting/Logging/Logging.csproj b/samples/Hosting/Logging/Logging.csproj
new file mode 100644
index 000000000..2e996ee0d
--- /dev/null
+++ b/samples/Hosting/Logging/Logging.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Logging</RootNamespace>
+    <AssemblyName>Logging</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.DependencyInjection" Version="1.1.32" />
+    <PackageReference Include="nanoFramework.Hosting" Version="2.0.11" />
+    <PackageReference Include="nanoFramework.Logging" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hosting/Logging/Logging.nfproj b/samples/Hosting/Logging/Logging.nfproj
deleted file mode 100644
index 4b89d73f6..000000000
--- a/samples/Hosting/Logging/Logging.nfproj
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>1c098094-2765-489d-8870-c88d729874c1</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Logging</RootNamespace>
-    <AssemblyName>Logging</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Extensions\ServiceCollectionExtensions.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\LoggingServices.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.DependencyInjection, Version=1.1.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.DependencyInjection.1.1.32\lib\nanoFramework.DependencyInjection.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hosting, Version=2.0.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hosting.2.0.11\lib\nanoFramework.Hosting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Logging.1.1.161\lib\nanoFramework.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hosting/Logging/Logging.sln b/samples/Hosting/Logging/Logging.sln
index b6323fe7f..ea85f7cb4 100644
--- a/samples/Hosting/Logging/Logging.sln
+++ b/samples/Hosting/Logging/Logging.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32616.157
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Logging", "Logging.nfproj", "{1C098094-2765-489D-8870-C88D729874C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logging", "Logging.csproj", "{1C098094-2765-489D-8870-C88D729874C1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hosting/Logging/Properties/AssemblyInfo.cs b/samples/Hosting/Logging/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3db732b8c..000000000
--- a/samples/Hosting/Logging/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("nanoFramework.Hosting")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NanoFramework.Hosting")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hosting/Logging/packages.config b/samples/Hosting/Logging/packages.config
deleted file mode 100644
index 71f6c28ce..000000000
--- a/samples/Hosting/Logging/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.DependencyInjection" version="1.1.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hosting" version="2.0.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hosting/SensorQueue/Properties/AssemblyInfo.cs b/samples/Hosting/SensorQueue/Properties/AssemblyInfo.cs
deleted file mode 100644
index d3f854669..000000000
--- a/samples/Hosting/SensorQueue/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Hosting")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Hosting")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hosting/SensorQueue/SensorQueue.csproj b/samples/Hosting/SensorQueue/SensorQueue.csproj
new file mode 100644
index 000000000..cc260b4f9
--- /dev/null
+++ b/samples/Hosting/SensorQueue/SensorQueue.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>DependencyInjection</RootNamespace>
+    <AssemblyName>DependencyInjection</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.DependencyInjection" Version="1.1.32" />
+    <PackageReference Include="nanoFramework.Hosting" Version="2.0.11" />
+    <PackageReference Include="nanoFramework.Logging" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hosting/SensorQueue/SensorQueue.nfproj b/samples/Hosting/SensorQueue/SensorQueue.nfproj
deleted file mode 100644
index b346b44aa..000000000
--- a/samples/Hosting/SensorQueue/SensorQueue.nfproj
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{9E9DC577-4DA0-4D2D-B504-3054A7F19054}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>DependencyInjection</RootNamespace>
-    <AssemblyName>DependencyInjection</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Services\SensorService.cs" />
-    <Compile Include="Services\BackgroundQueue.cs" />
-    <Compile Include="Services\DisplayService.cs" />
-    <Compile Include="Services\MonitorService.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.DependencyInjection, Version=1.1.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.DependencyInjection.1.1.32\lib\nanoFramework.DependencyInjection.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hosting, Version=2.0.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hosting.2.0.11\lib\nanoFramework.Hosting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Logging.1.1.161\lib\nanoFramework.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hosting/SensorQueue/SensorQueue.sln b/samples/Hosting/SensorQueue/SensorQueue.sln
index dbb127b71..e361eb00f 100644
--- a/samples/Hosting/SensorQueue/SensorQueue.sln
+++ b/samples/Hosting/SensorQueue/SensorQueue.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32519.379
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SensorQueue", "SensorQueue.nfproj", "{9E9DC577-4DA0-4D2D-B504-3054A7F19054}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SensorQueue", "SensorQueue.csproj", "{9E9DC577-4DA0-4D2D-B504-3054A7F19054}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hosting/SensorQueue/packages.config b/samples/Hosting/SensorQueue/packages.config
deleted file mode 100644
index 71f6c28ce..000000000
--- a/samples/Hosting/SensorQueue/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.DependencyInjection" version="1.1.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hosting" version="2.0.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hosting/Simple/Properties/AssemblyInfo.cs b/samples/Hosting/Simple/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/Hosting/Simple/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hosting/Simple/Simple.csproj b/samples/Hosting/Simple/Simple.csproj
new file mode 100644
index 000000000..b9447b6ab
--- /dev/null
+++ b/samples/Hosting/Simple/Simple.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Sample2</RootNamespace>
+    <AssemblyName>Sample2</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.DependencyInjection" Version="1.1.32" />
+    <PackageReference Include="nanoFramework.Hosting" Version="2.0.11" />
+    <PackageReference Include="nanoFramework.Logging" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hosting/Simple/Simple.nfproj b/samples/Hosting/Simple/Simple.nfproj
deleted file mode 100644
index e20cdaf69..000000000
--- a/samples/Hosting/Simple/Simple.nfproj
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>d8bca7f1-0fea-4c41-98c0-29502752831e</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Sample2</RootNamespace>
-    <AssemblyName>Sample2</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.DependencyInjection, Version=1.1.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.DependencyInjection.1.1.32\lib\nanoFramework.DependencyInjection.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hosting, Version=2.0.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hosting.2.0.11\lib\nanoFramework.Hosting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Logging.1.1.161\lib\nanoFramework.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hosting/Simple/Simple.sln b/samples/Hosting/Simple/Simple.sln
index 80f7530c0..482b9f8fa 100644
--- a/samples/Hosting/Simple/Simple.sln
+++ b/samples/Hosting/Simple/Simple.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32519.379
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Simple", "Simple.nfproj", "{D8BCA7F1-0FEA-4C41-98C0-29502752831E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Simple", "Simple.csproj", "{D8BCA7F1-0FEA-4C41-98C0-29502752831E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hosting/Simple/packages.config b/samples/Hosting/Simple/packages.config
deleted file mode 100644
index ae480d548..000000000
--- a/samples/Hosting/Simple/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.DependencyInjection" version="1.1.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hosting" version="2.0.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Hosting/SlowBlink/Properties/AssemblyInfo.cs b/samples/Hosting/SlowBlink/Properties/AssemblyInfo.cs
deleted file mode 100644
index d3f854669..000000000
--- a/samples/Hosting/SlowBlink/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Hosting")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Hosting")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Hosting/SlowBlink/SlowBlink.csproj b/samples/Hosting/SlowBlink/SlowBlink.csproj
new file mode 100644
index 000000000..d8d82cb0e
--- /dev/null
+++ b/samples/Hosting/SlowBlink/SlowBlink.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>DependencyInjection</RootNamespace>
+    <AssemblyName>DependencyInjection</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.DependencyInjection" Version="1.1.32" />
+    <PackageReference Include="nanoFramework.Hosting" Version="2.0.11" />
+    <PackageReference Include="nanoFramework.Logging" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Hosting/SlowBlink/SlowBlink.nfproj b/samples/Hosting/SlowBlink/SlowBlink.nfproj
deleted file mode 100644
index 58207e81b..000000000
--- a/samples/Hosting/SlowBlink/SlowBlink.nfproj
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{9E9DC577-4DA0-4D2D-B504-3054A7F19054}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>DependencyInjection</RootNamespace>
-    <AssemblyName>DependencyInjection</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Services\HardwareService.cs" />
-    <Compile Include="Services\IHardwareService.cs" />
-    <Compile Include="Services\LedService.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.DependencyInjection, Version=1.1.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.DependencyInjection.1.1.32\lib\nanoFramework.DependencyInjection.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hosting, Version=2.0.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hosting.2.0.11\lib\nanoFramework.Hosting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Logging.1.1.161\lib\nanoFramework.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Hosting/SlowBlink/SlowBlink.sln b/samples/Hosting/SlowBlink/SlowBlink.sln
index 7cfd52455..d2ce40c68 100644
--- a/samples/Hosting/SlowBlink/SlowBlink.sln
+++ b/samples/Hosting/SlowBlink/SlowBlink.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32519.379
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SlowBlink", "SlowBlink.nfproj", "{9E9DC577-4DA0-4D2D-B504-3054A7F19054}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlowBlink", "SlowBlink.csproj", "{9E9DC577-4DA0-4D2D-B504-3054A7F19054}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Hosting/SlowBlink/packages.config b/samples/Hosting/SlowBlink/packages.config
deleted file mode 100644
index ae480d548..000000000
--- a/samples/Hosting/SlowBlink/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.DependencyInjection" version="1.1.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hosting" version="2.0.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/I2C/I2cMasterSlave/I2cMasterDevice/I2cMasterDevice.csproj b/samples/I2C/I2cMasterSlave/I2cMasterDevice/I2cMasterDevice.csproj
new file mode 100644
index 000000000..64e7b6601
--- /dev/null
+++ b/samples/I2C/I2cMasterSlave/I2cMasterDevice/I2cMasterDevice.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Samples.I2c.MasterDevice</RootNamespace>
+    <AssemblyName>I2cMasterDevice</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/I2C/I2cMasterSlave/I2cMasterDevice/I2cMasterDevice.nfproj b/samples/I2C/I2cMasterSlave/I2cMasterDevice/I2cMasterDevice.nfproj
deleted file mode 100644
index 2ab9ded6e..000000000
--- a/samples/I2C/I2cMasterSlave/I2cMasterDevice/I2cMasterDevice.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>ae6817bf-dd2a-4883-aba7-0a90751304b7</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Samples.I2c.MasterDevice</RootNamespace>
-    <AssemblyName>I2cMasterDevice</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/I2C/I2cMasterSlave/I2cMasterDevice/Properties/AssemblyInfo.cs b/samples/I2C/I2cMasterSlave/I2cMasterDevice/Properties/AssemblyInfo.cs
deleted file mode 100644
index 9797ee51c..000000000
--- a/samples/I2C/I2cMasterSlave/I2cMasterDevice/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.I2cMasterDevice")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
diff --git a/samples/I2C/I2cMasterSlave/I2cMasterDevice/packages.config b/samples/I2C/I2cMasterSlave/I2cMasterDevice/packages.config
deleted file mode 100644
index 94aa85aba..000000000
--- a/samples/I2C/I2cMasterSlave/I2cMasterDevice/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/I2C/I2cMasterSlave/I2cMasterSlave.sln b/samples/I2C/I2cMasterSlave/I2cMasterSlave.sln
index ef2b4af09..7603a7279 100644
--- a/samples/I2C/I2cMasterSlave/I2cMasterSlave.sln
+++ b/samples/I2C/I2cMasterSlave/I2cMasterSlave.sln
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.10.34928.147
@@ -8,9 +7,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "I2cMasterDevice", "I2cMasterDevice\I2cMasterDevice.nfproj", "{AE6817BF-DD2A-4883-ABA7-0A90751304B7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "I2cMasterDevice", "I2cMasterDevice\I2cMasterDevice.csproj", "{AE6817BF-DD2A-4883-ABA7-0A90751304B7}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "I2cSlaveDevice", "I2cSlaveDevice\I2cSlaveDevice.nfproj", "{EDFF1C28-7988-4360-A0EF-2008E57945C6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "I2cSlaveDevice", "I2cSlaveDevice\I2cSlaveDevice.csproj", "{EDFF1C28-7988-4360-A0EF-2008E57945C6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/I2C/I2cMasterSlave/I2cSlaveDevice/I2cSlaveDevice.csproj b/samples/I2C/I2cMasterSlave/I2cSlaveDevice/I2cSlaveDevice.csproj
new file mode 100644
index 000000000..a8ac0cdd0
--- /dev/null
+++ b/samples/I2C/I2cMasterSlave/I2cSlaveDevice/I2cSlaveDevice.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Samples.I2c.SlaveDevice</RootNamespace>
+    <AssemblyName>I2cSlaveDevice</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.I2c.Slave" Version="1.0.23" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/I2C/I2cMasterSlave/I2cSlaveDevice/I2cSlaveDevice.nfproj b/samples/I2C/I2cMasterSlave/I2cSlaveDevice/I2cSlaveDevice.nfproj
deleted file mode 100644
index 37362f4cd..000000000
--- a/samples/I2C/I2cMasterSlave/I2cSlaveDevice/I2cSlaveDevice.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>edff1c28-7988-4360-a0ef-2008e57945c6</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Samples.I2c.SlaveDevice</RootNamespace>
-    <AssemblyName>I2cSlaveDevice</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c.Slave, Version=1.0.23.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.I2c.Slave.1.0.23\lib\System.Device.I2c.Slave.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/I2C/I2cMasterSlave/I2cSlaveDevice/Properties/AssemblyInfo.cs b/samples/I2C/I2cMasterSlave/I2cSlaveDevice/Properties/AssemblyInfo.cs
deleted file mode 100644
index 576ab4eb8..000000000
--- a/samples/I2C/I2cMasterSlave/I2cSlaveDevice/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.I2cSlaveDevice")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
diff --git a/samples/I2C/I2cMasterSlave/I2cSlaveDevice/packages.config b/samples/I2C/I2cMasterSlave/I2cSlaveDevice/packages.config
deleted file mode 100644
index 1ddff627d..000000000
--- a/samples/I2C/I2cMasterSlave/I2cSlaveDevice/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c.Slave" version="1.0.23" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/I2C/NanoI2cScanner/NanoI2cScanner.csproj b/samples/I2C/NanoI2cScanner/NanoI2cScanner.csproj
new file mode 100644
index 000000000..2ee4a94bd
--- /dev/null
+++ b/samples/I2C/NanoI2cScanner/NanoI2cScanner.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>NanoI2cScanner</RootNamespace>
+    <AssemblyName>NanoI2cScanner</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/I2C/NanoI2cScanner/NanoI2cScanner.nfproj b/samples/I2C/NanoI2cScanner/NanoI2cScanner.nfproj
deleted file mode 100644
index 82f4d0b3a..000000000
--- a/samples/I2C/NanoI2cScanner/NanoI2cScanner.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>1c07dcf1-cc8d-44cc-af44-269814f1c140</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NanoI2cScanner</RootNamespace>
-    <AssemblyName>NanoI2cScanner</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/I2C/NanoI2cScanner/NanoI2cScanner.sln b/samples/I2C/NanoI2cScanner/NanoI2cScanner.sln
index 0f278ebd1..85ddcef24 100644
--- a/samples/I2C/NanoI2cScanner/NanoI2cScanner.sln
+++ b/samples/I2C/NanoI2cScanner/NanoI2cScanner.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32126.317
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NanoI2cScanner", "NanoI2cScanner.nfproj", "{1C07DCF1-CC8D-44CC-AF44-269814F1C140}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NanoI2cScanner", "NanoI2cScanner.csproj", "{1C07DCF1-CC8D-44CC-AF44-269814F1C140}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/I2C/NanoI2cScanner/Properties/AssemblyInfo.cs b/samples/I2C/NanoI2cScanner/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/I2C/NanoI2cScanner/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/I2C/NanoI2cScanner/packages.config b/samples/I2C/NanoI2cScanner/packages.config
deleted file mode 100644
index 94aa85aba..000000000
--- a/samples/I2C/NanoI2cScanner/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS.sln b/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS.sln
index 263aa9cd3..90b8270e4 100644
--- a/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS.sln
+++ b/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28922.388
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "nfGPSTest", "nanoframework.Samples.GPS\nanoframework.Samples.GPS.nfproj", "{0C999724-B003-4ED6-B5AA-AC857759380B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nanoframework.Samples.GPS", "nanoframework.Samples.GPS\nanoframework.Samples.GPS.csproj", "{0C999724-B003-4ED6-B5AA-AC857759380B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/Properties/AssemblyInfo.cs b/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.csproj b/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.csproj
new file mode 100644
index 000000000..ae5d5a14a
--- /dev/null
+++ b/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>nfGPSTest</RootNamespace>
+    <AssemblyName>nfGPSTest</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.nfproj b/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.nfproj
deleted file mode 100644
index 656c4641c..000000000
--- a/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/nanoframework.Samples.GPS.nfproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>0c999724-b003-4ed6-b5aa-ac857759380b</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>nfGPSTest</RootNamespace>
-    <AssemblyName>nfGPSTest</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Drivers\GPS\IesShieldGps.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/packages.config b/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/packages.config
deleted file mode 100644
index f31c168fa..000000000
--- a/samples/I2C/System.Device.I2c/GPS/nanoframework.Samples.GPS/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/I2S/Input/MicrophoneIn.csproj b/samples/I2S/Input/MicrophoneIn.csproj
new file mode 100644
index 000000000..0b724273d
--- /dev/null
+++ b/samples/I2S/Input/MicrophoneIn.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>MicrophoneIn</RootNamespace>
+    <AssemblyName>MicrophoneIn</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.I2s" Version="1.0.28" />
+    <PackageReference Include="nanoFramework.System.IO.FileSystem" Version="1.1.87" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/I2S/Input/MicrophoneIn.nfproj b/samples/I2S/Input/MicrophoneIn.nfproj
deleted file mode 100644
index d25854513..000000000
--- a/samples/I2S/Input/MicrophoneIn.nfproj
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>a2d510ad-1108-4beb-be32-49b8d9b93f6d</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>MicrophoneIn</RootNamespace>
-    <AssemblyName>MicrophoneIn</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WavFileHeader.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2s, Version=1.0.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.I2s.1.0.28\lib\System.Device.I2s.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=1.1.87.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.FileSystem.1.1.87\lib\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/I2S/Input/MicrophoneIn.sln b/samples/I2S/Input/MicrophoneIn.sln
index 412f642cd..252b1f65d 100644
--- a/samples/I2S/Input/MicrophoneIn.sln
+++ b/samples/I2S/Input/MicrophoneIn.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "MicrophoneIn", "MicrophoneIn.nfproj", "{A2D510AD-1108-4BEB-BE32-49B8D9B93F6D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicrophoneIn", "MicrophoneIn.csproj", "{A2D510AD-1108-4BEB-BE32-49B8D9B93F6D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/I2S/Input/Properties/AssemblyInfo.cs b/samples/I2S/Input/Properties/AssemblyInfo.cs
deleted file mode 100644
index c408fef4b..000000000
--- a/samples/I2S/Input/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/I2S/Input/packages.config b/samples/I2S/Input/packages.config
deleted file mode 100644
index ac68615dd..000000000
--- a/samples/I2S/Input/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2s" version="1.0.28" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.FileSystem" version="1.1.87" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/I2S/Output/AudioPlayer.csproj b/samples/I2S/Output/AudioPlayer.csproj
new file mode 100644
index 000000000..29f21c6d5
--- /dev/null
+++ b/samples/I2S/Output/AudioPlayer.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AudioPlayer</RootNamespace>
+    <AssemblyName>AudioPlayer</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.I2s" Version="1.0.28" />
+    <PackageReference Include="nanoFramework.System.IO.FileSystem" Version="1.1.87" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/I2S/Output/AudioPlayer.nfproj b/samples/I2S/Output/AudioPlayer.nfproj
deleted file mode 100644
index cf3a07d32..000000000
--- a/samples/I2S/Output/AudioPlayer.nfproj
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>41877ec4-4fe6-42fc-a899-a08a4b52ccdc</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AudioPlayer</RootNamespace>
-    <AssemblyName>AudioPlayer</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="I2sWavPlayer.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WavFileHeader.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2s, Version=1.0.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.I2s.1.0.28\lib\System.Device.I2s.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=1.1.87.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.FileSystem.1.1.87\lib\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/I2S/Output/AudioPlayer.sln b/samples/I2S/Output/AudioPlayer.sln
index 86ee1bb14..ee9f14110 100644
--- a/samples/I2S/Output/AudioPlayer.sln
+++ b/samples/I2S/Output/AudioPlayer.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AudioPlayer", "AudioPlayer.nfproj", "{41877EC4-4FE6-42FC-A899-A08A4B52CCDC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudioPlayer", "AudioPlayer.csproj", "{41877EC4-4FE6-42FC-A899-A08A4B52CCDC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/I2S/Output/Properties/AssemblyInfo.cs b/samples/I2S/Output/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5abe6a4ff..000000000
--- a/samples/I2S/Output/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/I2S/Output/packages.config b/samples/I2S/Output/packages.config
deleted file mode 100644
index c5e6fdc19..000000000
--- a/samples/I2S/Output/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2s" version="1.0.28" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.FileSystem" version="1.1.87" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Interop/awesome-library/NF.AwesomeLib.csproj b/samples/Interop/awesome-library/NF.AwesomeLib.csproj
new file mode 100644
index 000000000..7504ec1d2
--- /dev/null
+++ b/samples/Interop/awesome-library/NF.AwesomeLib.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <RootNamespace>NF.AwesomeLib</RootNamespace>
+    <AssemblyName>NF.AwesomeLib</AssemblyName>
+    <NFMDP_GENERATE_STUBS>true</NFMDP_GENERATE_STUBS>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Interop/awesome-library/NF.AwesomeLib.nfproj b/samples/Interop/awesome-library/NF.AwesomeLib.nfproj
deleted file mode 100644
index 4edc43c44..000000000
--- a/samples/Interop/awesome-library/NF.AwesomeLib.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>46A35C17-C90C-4A89-8459-89F095ACD48F</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NF.AwesomeLib</RootNamespace>
-    <AssemblyName>NF.AwesomeLib</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Label="nanoFramework">
-    <NFMDP_GENERATE_STUBS>true</NFMDP_GENERATE_STUBS>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Math.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Interop/awesome-library/NF.AwesomeLib.sln b/samples/Interop/awesome-library/NF.AwesomeLib.sln
index 60c2ccdf4..bc74fb636 100644
--- a/samples/Interop/awesome-library/NF.AwesomeLib.sln
+++ b/samples/Interop/awesome-library/NF.AwesomeLib.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NF.AwesomeLib", "NF.AwesomeLib.nfproj", "{46A35C17-C90C-4A89-8459-89F095ACD48F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NF.AwesomeLib", "NF.AwesomeLib.csproj", "{46A35C17-C90C-4A89-8459-89F095ACD48F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/FindINTEROP-NF.AwesomeLib.cmake b/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/FindINTEROP-NF.AwesomeLib.cmake
index 72406b251..bfc4b030d 100644
--- a/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/FindINTEROP-NF.AwesomeLib.cmake
+++ b/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/FindINTEROP-NF.AwesomeLib.cmake
@@ -35,7 +35,9 @@ set(NF.AwesomeLib_SRCS
 )
 
 foreach(SRC_FILE ${NF.AwesomeLib_SRCS})
+
     set(NF.AwesomeLib_SRC_FILE SRC_FILE-NOTFOUND)
+
     find_file(NF.AwesomeLib_SRC_FILE ${SRC_FILE}
         PATHS
 	        ${BASE_PATH_FOR_THIS_MODULE}
@@ -44,8 +46,13 @@ foreach(SRC_FILE ${NF.AwesomeLib_SRCS})
 
 	    CMAKE_FIND_ROOT_PATH_BOTH
     )
-    # message("${SRC_FILE} >> ${NF.AwesomeLib_SRC_FILE}") # debug helper
+
+    if (BUILD_VERBOSE)
+        message("${SRC_FILE} >> ${NF.AwesomeLib_SRC_FILE}")
+    endif()
+
     list(APPEND NF.AwesomeLib_SOURCES ${NF.AwesomeLib_SRC_FILE})
+
 endforeach()
 
 include(FindPackageHandleStandardArgs)
diff --git a/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib.cpp b/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib.cpp
index 1bfe1251b..d495a9566 100644
--- a/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib.cpp
+++ b/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib.cpp
@@ -12,18 +12,18 @@
 
 static const CLR_RT_MethodHandler method_lookup[] =
 {
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     Library_NF_AwesomeLib_NF_AwesomeLib_Math::NativeSuperComplicatedCalculation___STATIC__R8__R8,
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     Library_NF_AwesomeLib_NF_AwesomeLib_Utilities::NativeGetHardwareSerial___STATIC__VOID__SZARRAY_U1,
 };
 
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_NF_AwesomeLib =
 {
     "NF.AwesomeLib",
-    0xEE794AFB,
+    0x94FA78F3,
     method_lookup,
     { 1, 0, 0, 0 }
 };
diff --git a/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib.h b/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib.h
index edc95278c..75612baa6 100644
--- a/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib.h
+++ b/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib.h
@@ -6,8 +6,8 @@
 //
 //-----------------------------------------------------------------------------
 
-#ifndef _NF_AWESOMELIB_H_
-#define _NF_AWESOMELIB_H_
+#ifndef NF_AWESOMELIB_H
+#define NF_AWESOMELIB_H
 
 #include <nanoCLR_Interop.h>
 #include <nanoCLR_Runtime.h>
@@ -18,7 +18,6 @@ struct Library_NF_AwesomeLib_NF_AwesomeLib_Math
     NANOCLR_NATIVE_DECLARE(NativeSuperComplicatedCalculation___STATIC__R8__R8);
 
     //--//
-
 };
 
 struct Library_NF_AwesomeLib_NF_AwesomeLib_Utilities
@@ -28,9 +27,8 @@ struct Library_NF_AwesomeLib_NF_AwesomeLib_Utilities
     NANOCLR_NATIVE_DECLARE(NativeGetHardwareSerial___STATIC__VOID__SZARRAY_U1);
 
     //--//
-
 };
 
 extern const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_NF_AwesomeLib;
 
-#endif  //_NF_AWESOMELIB_H_
+#endif // NF_AWESOMELIB_H
diff --git a/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib_NF_AwesomeLib_Math.h b/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib_NF_AwesomeLib_Math.h
index 9f6bbe731..df181374c 100644
--- a/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib_NF_AwesomeLib_Math.h
+++ b/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib_NF_AwesomeLib_Math.h
@@ -10,8 +10,8 @@
 //
 //-----------------------------------------------------------------------------
 
-#ifndef _NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_MATH_H_
-#define _NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_MATH_H_
+#ifndef NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_MATH_H
+#define NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_MATH_H
 
 namespace NF_AwesomeLib
 {
@@ -28,4 +28,4 @@ namespace NF_AwesomeLib
     }
 }
 
-#endif //_NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_MATH_H_
+#endif // NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_MATH_H
diff --git a/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib_NF_AwesomeLib_Utilities.h b/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib_NF_AwesomeLib_Utilities.h
index c9a8bb958..676eabe57 100644
--- a/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib_NF_AwesomeLib_Utilities.h
+++ b/samples/Interop/awesome-library/Stubs/NF.AwesomeLib/NF_AwesomeLib_NF_AwesomeLib_Utilities.h
@@ -10,8 +10,8 @@
 //
 //-----------------------------------------------------------------------------
 
-#ifndef _NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_UTILITIES_H_
-#define _NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_UTILITIES_H_
+#ifndef NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_UTILITIES_H
+#define NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_UTILITIES_H
 
 namespace NF_AwesomeLib
 {
@@ -28,4 +28,4 @@ namespace NF_AwesomeLib
     }
 }
 
-#endif //_NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_UTILITIES_H_
+#endif // NF_AWESOMELIB_NF_AWESOMELIB_NF_AWESOMELIB_UTILITIES_H
diff --git a/samples/Interop/awesome-library/packages.config b/samples/Interop/awesome-library/packages.config
deleted file mode 100644
index ddcc0baa5..000000000
--- a/samples/Interop/awesome-library/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Interop/test-application/Properties/AssemblyInfo.cs b/samples/Interop/test-application/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Interop/test-application/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Interop/test-application/Test.Interop.csproj b/samples/Interop/test-application/Test.Interop.csproj
new file mode 100644
index 000000000..67b735f26
--- /dev/null
+++ b/samples/Interop/test-application/Test.Interop.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Test.Interop</RootNamespace>
+    <AssemblyName>Test.Interop</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- The interop stub library, referenced as a project (the legacy .nfproj used a bin\ HintPath). -->
+    <ProjectReference Include="../awesome-library/NF.AwesomeLib.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Interop/test-application/Test.Interop.nfproj b/samples/Interop/test-application/Test.Interop.nfproj
deleted file mode 100644
index 1977abce6..000000000
--- a/samples/Interop/test-application/Test.Interop.nfproj
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>F819A538-5E5F-41A1-BC1F-EB0BEBA71A86</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Test.Interop</RootNamespace>
-    <AssemblyName>Test.Interop</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NF.AwesomeLib">
-      <HintPath>..\awesome-library\bin\$(Configuration)\NF.AwesomeLib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Interop/test-application/Test.Interop.sln b/samples/Interop/test-application/Test.Interop.sln
index d4ee190e3..13110963f 100644
--- a/samples/Interop/test-application/Test.Interop.sln
+++ b/samples/Interop/test-application/Test.Interop.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Test.Interop", "Test.Interop.nfproj", "{F819A538-5E5F-41A1-BC1F-EB0BEBA71A86}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Interop", "Test.Interop.csproj", "{F819A538-5E5F-41A1-BC1F-EB0BEBA71A86}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Interop/test-application/packages.config b/samples/Interop/test-application/packages.config
deleted file mode 100644
index ddcc0baa5..000000000
--- a/samples/Interop/test-application/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Json/JsonConfigurationStore.sln b/samples/Json/JsonConfigurationStore.sln
index bdd668bac..cbf495e2f 100644
--- a/samples/Json/JsonConfigurationStore.sln
+++ b/samples/Json/JsonConfigurationStore.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "JsonConfigurationStore", "JsonConfigurationStore\JsonConfigurationStore.nfproj", "{9230339D-6A6C-46EE-BFD3-4514FFD3985D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonConfigurationStore", "JsonConfigurationStore\JsonConfigurationStore.csproj", "{9230339D-6A6C-46EE-BFD3-4514FFD3985D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Json/JsonConfigurationStore/JsonConfigurationStore.csproj b/samples/Json/JsonConfigurationStore/JsonConfigurationStore.csproj
new file mode 100644
index 000000000..8b69a30ff
--- /dev/null
+++ b/samples/Json/JsonConfigurationStore/JsonConfigurationStore.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>JsonConfigurationStore</RootNamespace>
+    <AssemblyName>JsonConfigurationStore</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.IO.FileSystem" Version="1.1.87" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Json/JsonConfigurationStore/JsonConfigurationStore.nfproj b/samples/Json/JsonConfigurationStore/JsonConfigurationStore.nfproj
deleted file mode 100644
index 117edfe8b..000000000
--- a/samples/Json/JsonConfigurationStore/JsonConfigurationStore.nfproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>9230339d-6a6c-46ee-bfd3-4514ffd3985d</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>JsonConfigurationStore</RootNamespace>
-    <AssemblyName>JsonConfigurationStore</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Configuration.cs" />
-    <Compile Include="ConfigurationStore.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=1.1.87.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.FileSystem.1.1.87\lib\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Json/JsonConfigurationStore/Properties/AssemblyInfo.cs b/samples/Json/JsonConfigurationStore/Properties/AssemblyInfo.cs
deleted file mode 100644
index efa5449e4..000000000
--- a/samples/Json/JsonConfigurationStore/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Json/JsonConfigurationStore/packages.config b/samples/Json/JsonConfigurationStore/packages.config
deleted file mode 100644
index 85fe21216..000000000
--- a/samples/Json/JsonConfigurationStore/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.FileSystem" version="1.1.87" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Logging/Logging.csproj b/samples/Logging/Logging.csproj
new file mode 100644
index 000000000..5446edc49
--- /dev/null
+++ b/samples/Logging/Logging.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Logging</RootNamespace>
+    <AssemblyName>Logging</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Logging" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.Logging.Serial" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.Logging.Stream" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.IO.FileSystem" Version="1.1.87" />
+    <PackageReference Include="nanoFramework.System.IO.Ports" Version="1.1.132" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Logging/Logging.nfproj b/samples/Logging/Logging.nfproj
deleted file mode 100644
index 13d575710..000000000
--- a/samples/Logging/Logging.nfproj
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>3dfeb045-aec1-4c16-b6ed-6cc585c98c40</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Logging</RootNamespace>
-    <AssemblyName>Logging</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="MyTestComponent.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Logging.1.1.161\lib\nanoFramework.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging.Serial, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Logging.Serial.1.1.161\lib\nanoFramework.Logging.Serial.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging.Stream, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Logging.Stream.1.1.161\lib\nanoFramework.Logging.Stream.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=1.1.87.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.FileSystem.1.1.87\lib\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Ports, Version=1.1.132.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Ports.1.1.132\lib\System.IO.Ports.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Logging/Logging.sln b/samples/Logging/Logging.sln
index 9e493cfeb..b66feaf62 100644
--- a/samples/Logging/Logging.sln
+++ b/samples/Logging/Logging.sln
@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.12.35707.178 d17.12
+VisualStudioVersion = 17.12.35707.178
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Logging", "Logging.nfproj", "{3DFEB045-AEC1-4C16-B6ED-6CC585C98C40}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logging", "Logging.csproj", "{3DFEB045-AEC1-4C16-B6ED-6CC585C98C40}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Logging/Properties/AssemblyInfo.cs b/samples/Logging/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Logging/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Logging/packages.config b/samples/Logging/packages.config
deleted file mode 100644
index 5efb382f6..000000000
--- a/samples/Logging/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging.Serial" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging.Stream" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.FileSystem" version="1.1.87" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Ports" version="1.1.132" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.csproj b/samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.csproj
new file mode 100644
index 000000000..322adfadf
--- /dev/null
+++ b/samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AwsMQTT</RootNamespace>
+    <AssemblyName>AwsMQTT</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.Networking.Sntp" Version="1.6.42" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.nfproj b/samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.nfproj
deleted file mode 100644
index 5ca71d0fb..000000000
--- a/samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.nfproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>2f835d0b-3393-4274-8433-b4bcbda10dc4</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AwsMQTT</RootNamespace>
-    <AssemblyName>AwsMQTT</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\AwsCAroot.der" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Networking.Sntp, Version=1.6.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Networking.Sntp.1.6.42\lib\nanoFramework.Networking.Sntp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.sln b/samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.sln
index 7fc20c698..c33afd60f 100644
--- a/samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.sln
+++ b/samples/MQTT/AdvancedExample.Aws/AdvancedExample.Aws.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31613.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AdvancedExample.Aws", "AdvancedExample.Aws.nfproj", "{2F835D0B-3393-4274-8433-B4BCBDA10DC4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvancedExample.Aws", "AdvancedExample.Aws.csproj", "{2F835D0B-3393-4274-8433-B4BCBDA10DC4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/MQTT/AdvancedExample.Aws/Properties/AssemblyInfo.cs b/samples/MQTT/AdvancedExample.Aws/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/MQTT/AdvancedExample.Aws/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/MQTT/AdvancedExample.Aws/packages.config b/samples/MQTT/AdvancedExample.Aws/packages.config
deleted file mode 100644
index cb94b06c8..000000000
--- a/samples/MQTT/AdvancedExample.Aws/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Networking.Sntp" version="1.6.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.csproj b/samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.csproj
new file mode 100644
index 000000000..27ed129d6
--- /dev/null
+++ b/samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AdvancedExample.Azure</RootNamespace>
+    <AssemblyName>AdvancedExample.Azure</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.Networking.Sntp" Version="1.6.42" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.nfproj b/samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.nfproj
deleted file mode 100644
index e5645675d..000000000
--- a/samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.nfproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>134d1ff7-73cc-4b27-aa43-58fe42996dd1</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AdvancedExample.Azure</RootNamespace>
-    <AssemblyName>AdvancedExample.Azure</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Resource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-    <Compile Include="StringExtensions.cs" />
-    <Compile Include="WebUtility.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SHA.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resource\AzureRootCerts.pem" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Networking.Sntp, Version=1.6.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Networking.Sntp.1.6.42\lib\nanoFramework.Networking.Sntp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.sln b/samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.sln
index f92249ff7..c048d95b4 100644
--- a/samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.sln
+++ b/samples/MQTT/AdvancedExample.Azure/AdvancedExample.Azure.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31613.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AdvancedExample.Azure", "AdvancedExample.Azure.nfproj", "{134D1FF7-73CC-4B27-AA43-58FE42996DD1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvancedExample.Azure", "AdvancedExample.Azure.csproj", "{134D1FF7-73CC-4B27-AA43-58FE42996DD1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/MQTT/AdvancedExample.Azure/Properties/AssemblyInfo.cs b/samples/MQTT/AdvancedExample.Azure/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/MQTT/AdvancedExample.Azure/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/MQTT/AdvancedExample.Azure/packages.config b/samples/MQTT/AdvancedExample.Azure/packages.config
deleted file mode 100644
index 6ade544da..000000000
--- a/samples/MQTT/AdvancedExample.Azure/packages.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Networking.Sntp" version="1.6.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.csproj b/samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.csproj
new file mode 100644
index 000000000..ebf8629d7
--- /dev/null
+++ b/samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>AdvancedExample.Certificates</RootNamespace>
+    <AssemblyName>AdvancedExample.Certificates</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.nfproj b/samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.nfproj
deleted file mode 100644
index 4d8bf56e2..000000000
--- a/samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.nfproj
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>edeae321-728c-433b-a15d-c1a63b6a56ea</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>AdvancedExample.Certificates</RootNamespace>
-    <AssemblyName>AdvancedExample.Certificates</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.sln b/samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.sln
index 8578fabad..c6788a3fb 100644
--- a/samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.sln
+++ b/samples/MQTT/AdvancedExample.Certificates/AdvancedExample.Certificates.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31613.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AdvancedExample.Certificates", "AdvancedExample.Certificates.nfproj", "{EDEAE321-728C-433B-A15D-C1A63B6A56EA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvancedExample.Certificates", "AdvancedExample.Certificates.csproj", "{EDEAE321-728C-433B-A15D-C1A63B6A56EA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/MQTT/AdvancedExample.Certificates/Properties/AssemblyInfo.cs b/samples/MQTT/AdvancedExample.Certificates/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/MQTT/AdvancedExample.Certificates/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/MQTT/AdvancedExample.Certificates/packages.config b/samples/MQTT/AdvancedExample.Certificates/packages.config
deleted file mode 100644
index ea25d5445..000000000
--- a/samples/MQTT/AdvancedExample.Certificates/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.csproj b/samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.csproj
new file mode 100644
index 000000000..8e5089346
--- /dev/null
+++ b/samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BasicExample.Ethernet</RootNamespace>
+    <AssemblyName>BasicExample.Ethernet</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.nfproj b/samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.nfproj
deleted file mode 100644
index 0db800026..000000000
--- a/samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.nfproj
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>e8dbd642-35a6-43b5-9edd-9199f6926751</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BasicExample.Ethernet</RootNamespace>
-    <AssemblyName>BasicExample.Ethernet</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.sln b/samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.sln
index 9d5aa4069..ea30259b2 100644
--- a/samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.sln
+++ b/samples/MQTT/BasicExample.Ethernet/BasicExample.Ethernet.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31613.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "BasicExample.Ethernet", "BasicExample.Ethernet.nfproj", "{E8DBD642-35A6-43B5-9EDD-9199F6926751}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicExample.Ethernet", "BasicExample.Ethernet.csproj", "{E8DBD642-35A6-43B5-9EDD-9199F6926751}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/MQTT/BasicExample.Ethernet/Properties/AssemblyInfo.cs b/samples/MQTT/BasicExample.Ethernet/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/MQTT/BasicExample.Ethernet/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/MQTT/BasicExample.Ethernet/packages.config b/samples/MQTT/BasicExample.Ethernet/packages.config
deleted file mode 100644
index ea25d5445..000000000
--- a/samples/MQTT/BasicExample.Ethernet/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/MQTT/BasicExample.WiFi/BasicExample.WiFi.nfproj b/samples/MQTT/BasicExample.WiFi/BasicExample.WiFi.nfproj
deleted file mode 100644
index 32d62b42f..000000000
--- a/samples/MQTT/BasicExample.WiFi/BasicExample.WiFi.nfproj
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>6c48f35c-fe80-408d-bc09-ea38debf40a8</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BasicExample.Wifi</RootNamespace>
-    <AssemblyName>BasicExample.Wifi</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.M2Mqtt.Core, Version=5.1.215.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.M2Mqtt.5.1.215\lib\nanoFramework.M2Mqtt.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/MQTT/BasicExample.WiFi/BasicExample.WiFi.sln b/samples/MQTT/BasicExample.WiFi/BasicExample.WiFi.sln
index 96d3709f6..ed66448f5 100644
--- a/samples/MQTT/BasicExample.WiFi/BasicExample.WiFi.sln
+++ b/samples/MQTT/BasicExample.WiFi/BasicExample.WiFi.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31613.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "BasicExample.Wifi", "BasicExample.Wifi.nfproj", "{6C48F35C-FE80-408D-BC09-EA38DEBF40A8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicExample.Wifi", "BasicExample.Wifi.csproj", "{6C48F35C-FE80-408D-BC09-EA38DEBF40A8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/MQTT/BasicExample.WiFi/BasicExample.Wifi.csproj b/samples/MQTT/BasicExample.WiFi/BasicExample.Wifi.csproj
new file mode 100644
index 000000000..406e725f0
--- /dev/null
+++ b/samples/MQTT/BasicExample.WiFi/BasicExample.Wifi.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BasicExample.Wifi</RootNamespace>
+    <AssemblyName>BasicExample.Wifi</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.M2Mqtt" Version="5.1.215" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/MQTT/BasicExample.WiFi/Properties/AssemblyInfo.cs b/samples/MQTT/BasicExample.WiFi/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/MQTT/BasicExample.WiFi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/MQTT/BasicExample.WiFi/packages.config b/samples/MQTT/BasicExample.WiFi/packages.config
deleted file mode 100644
index 11e74ea24..000000000
--- a/samples/MQTT/BasicExample.WiFi/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.M2Mqtt" version="5.1.215" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/ManagedResources/ManagedResources.csproj b/samples/ManagedResources/ManagedResources.csproj
new file mode 100644
index 000000000..1f8a17551
--- /dev/null
+++ b/samples/ManagedResources/ManagedResources.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ManagedResources</RootNamespace>
+    <AssemblyName>ManagedResources</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/ManagedResources/ManagedResources.nfproj b/samples/ManagedResources/ManagedResources.nfproj
deleted file mode 100644
index 928a3730b..000000000
--- a/samples/ManagedResources/ManagedResources.nfproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>6825b0bb-e341-458a-ae82-6fef28a572fa</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ManagedResources</RootNamespace>
-    <AssemblyName>ManagedResources</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\nano-Framework-logo-32-border-trans.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/ManagedResources/ManagedResources.sln b/samples/ManagedResources/ManagedResources.sln
index 94b58da7d..7a3646a3f 100644
--- a/samples/ManagedResources/ManagedResources.sln
+++ b/samples/ManagedResources/ManagedResources.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2026
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "ManagedResources", "ManagedResources.nfproj", "{6825B0BB-E341-458A-AE82-6FEF28A572FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedResources", "ManagedResources.csproj", "{6825B0BB-E341-458A-AE82-6FEF28A572FA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/ManagedResources/Properties/AssemblyInfo.cs b/samples/ManagedResources/Properties/AssemblyInfo.cs
deleted file mode 100644
index 64034c9f1..000000000
--- a/samples/ManagedResources/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Resource Manager sample application")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Resource Manager sample application")]
-[assembly: AssemblyCopyright("Copyright © 2018 nanoFramework contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/samples/ManagedResources/packages.config b/samples/ManagedResources/packages.config
deleted file mode 100644
index 161d35882..000000000
--- a/samples/ManagedResources/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/McpAi/McpAi.csproj b/samples/McpAi/McpAi.csproj
new file mode 100644
index 000000000..c00617c41
--- /dev/null
+++ b/samples/McpAi/McpAi.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>McpAi</RootNamespace>
+    <AssemblyName>McpAi</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Json" Version="2.2.210" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Server" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.WebServer.Mcp" Version="1.2.147" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/McpAi/McpAi.nfproj b/samples/McpAi/McpAi.nfproj
deleted file mode 100644
index b880ce014..000000000
--- a/samples/McpAi/McpAi.nfproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>75022ce1-3597-477c-a4a0-cdcd06ec5e54</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>McpAi</RootNamespace>
-    <AssemblyName>McpAi</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Light.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WiFi.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.2.210.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Json.2.2.210\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="nanoFramework.WebServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.WebServer.Mcp.1.2.147\lib\nanoFramework.WebServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.WebServer.Mcp, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.WebServer.Mcp.1.2.147\lib\nanoFramework.WebServer.Mcp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.Server.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/McpAi/McpAi.sln b/samples/McpAi/McpAi.sln
index 8eb271572..b608deb39 100644
--- a/samples/McpAi/McpAi.sln
+++ b/samples/McpAi/McpAi.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.14.36212.18 d17.14
+VisualStudioVersion = 17.14.36212.18
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "McpAi", "McpAi.nfproj", "{75022CE1-3597-477C-A4A0-CDCD06EC5E54}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "McpAi", "McpAi.csproj", "{75022CE1-3597-477C-A4A0-CDCD06EC5E54}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/McpAi/Properties/AssemblyInfo.cs b/samples/McpAi/Properties/AssemblyInfo.cs
deleted file mode 100644
index 9cca2921c..000000000
--- a/samples/McpAi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MCP AI Sample Application")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("McpAiSample")]
-[assembly: AssemblyCopyright("Copyright ©  2025")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
diff --git a/samples/McpAi/packages.config b/samples/McpAi/packages.config
deleted file mode 100644
index 4148ee2af..000000000
--- a/samples/McpAi/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Json" version="2.2.210" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Server" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.WebServer.Mcp" version="1.2.147" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/NativeEvents/NativeEvents.csproj b/samples/NativeEvents/NativeEvents.csproj
new file mode 100644
index 000000000..00875ab90
--- /dev/null
+++ b/samples/NativeEvents/NativeEvents.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>NativeEvents</RootNamespace>
+    <AssemblyName>NativeEvents</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/NativeEvents/NativeEvents.nfproj b/samples/NativeEvents/NativeEvents.nfproj
deleted file mode 100644
index 48fe10a90..000000000
--- a/samples/NativeEvents/NativeEvents.nfproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>3995bf44-8087-454a-a885-666e707704c5</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NativeEvents</RootNamespace>
-    <AssemblyName>NativeEvents</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/NativeEvents/NativeEvents.sln b/samples/NativeEvents/NativeEvents.sln
index 21420f0bf..cf312834a 100644
--- a/samples/NativeEvents/NativeEvents.sln
+++ b/samples/NativeEvents/NativeEvents.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.779
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NativeEvents", "NativeEvents.nfproj", "{3995BF44-8087-454A-A885-666E707704C5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeEvents", "NativeEvents.csproj", "{3995BF44-8087-454A-A885-666E707704C5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/NativeEvents/Properties/AssemblyInfo.cs b/samples/NativeEvents/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/NativeEvents/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/NativeEvents/packages.config b/samples/NativeEvents/packages.config
deleted file mode 100644
index e890aede5..000000000
--- a/samples/NativeEvents/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Networking/Networking.sln b/samples/Networking/Networking.sln
index 4404267bb..24ba86c9c 100644
--- a/samples/Networking/Networking.sln
+++ b/samples/Networking/Networking.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Socket.Client", "Socket.Client\Socket.Client.nfproj", "{88AA2FAA-0570-47E2-8866-B36BC8B36A6A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Socket.Client", "Socket.Client\Socket.Client.csproj", "{88AA2FAA-0570-47E2-8866-B36BC8B36A6A}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Socket.Client_Wifi", "Socket.Client_Wifi\Socket.Client_Wifi.nfproj", "{50F4D87E-CAEE-4D03-A0E8-2109C10EEB6F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Socket.Client_Wifi", "Socket.Client_Wifi\Socket.Client_Wifi.csproj", "{50F4D87E-CAEE-4D03-A0E8-2109C10EEB6F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Networking/Socket.Client/Properties/AssemblyInfo.cs b/samples/Networking/Socket.Client/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Networking/Socket.Client/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Networking/Socket.Client/Socket.Client.csproj b/samples/Networking/Socket.Client/Socket.Client.csproj
new file mode 100644
index 000000000..5e5dd014f
--- /dev/null
+++ b/samples/Networking/Socket.Client/Socket.Client.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Networking</RootNamespace>
+    <AssemblyName>Networking</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Networking/Socket.Client/Socket.Client.nfproj b/samples/Networking/Socket.Client/Socket.Client.nfproj
deleted file mode 100644
index 2f2148f97..000000000
--- a/samples/Networking/Socket.Client/Socket.Client.nfproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{88AA2FAA-0570-47E2-8866-B36BC8B36A6A}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Networking</RootNamespace>
-    <AssemblyName>Networking</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Networking/Socket.Client/packages.config b/samples/Networking/Socket.Client/packages.config
deleted file mode 100644
index 4e83c4a45..000000000
--- a/samples/Networking/Socket.Client/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Networking/Socket.Client_WiFi/Properties/AssemblyInfo.cs b/samples/Networking/Socket.Client_WiFi/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Networking/Socket.Client_WiFi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Networking/Socket.Client_WiFi/Socket.Client_WiFi.nfproj b/samples/Networking/Socket.Client_WiFi/Socket.Client_WiFi.nfproj
deleted file mode 100644
index eec1edee0..000000000
--- a/samples/Networking/Socket.Client_WiFi/Socket.Client_WiFi.nfproj
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>50f4d87e-caee-4d03-a0e8-2109c10eeb6f</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Networking</RootNamespace>
-    <AssemblyName>Networking_Wifi</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\Socket.Client\Program.cs">
-      <Link>Program.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Networking/Socket.Client_WiFi/Socket.Client_Wifi.csproj b/samples/Networking/Socket.Client_WiFi/Socket.Client_Wifi.csproj
new file mode 100644
index 000000000..7480872c7
--- /dev/null
+++ b/samples/Networking/Socket.Client_WiFi/Socket.Client_Wifi.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Networking</RootNamespace>
+    <AssemblyName>Networking_Wifi</AssemblyName>
+    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Socket.Client\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Networking/Socket.Client_WiFi/packages.config b/samples/Networking/Socket.Client_WiFi/packages.config
deleted file mode 100644
index 925d727e6..000000000
--- a/samples/Networking/Socket.Client_WiFi/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/NumberParser/NumberParser.sln b/samples/NumberParser/NumberParser.sln
index c252f7b3e..7defa23f5 100644
--- a/samples/NumberParser/NumberParser.sln
+++ b/samples/NumberParser/NumberParser.sln
@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.12.35728.132 d17.12
+VisualStudioVersion = 17.12.35728.132
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NumberParserTest", "NumberParserTest\NumberParserTest.nfproj", "{2A5794EF-77E7-41A9-8BC6-1077DB0499FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumberParserTest", "NumberParserTest\NumberParserTest.csproj", "{2A5794EF-77E7-41A9-8BC6-1077DB0499FE}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NumberParserTestShared", "NumberParserTestShared\NumberParserTestShared.shproj", "{E98BCE69-4C45-4D98-B38E-C3ED8C04EFFF}"
 EndProject
diff --git a/samples/NumberParser/NumberParserTest/NumberParserTest.csproj b/samples/NumberParser/NumberParserTest/NumberParserTest.csproj
new file mode 100644
index 000000000..5d03ab32d
--- /dev/null
+++ b/samples/NumberParser/NumberParserTest/NumberParserTest.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>NumberParserTest</RootNamespace>
+    <AssemblyName>NumberParserTest</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+  <Import Project="..\NumberParserTestShared\NumberParserTestShared.projitems" Label="Shared" />
+
+</Project>
diff --git a/samples/NumberParser/NumberParserTest/NumberParserTest.nfproj b/samples/NumberParser/NumberParserTest/NumberParserTest.nfproj
deleted file mode 100644
index c3cef974f..000000000
--- a/samples/NumberParser/NumberParserTest/NumberParserTest.nfproj
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{1248DD76-328B-46DF-9F39-F5599140360};{FAE04EC0-3014143-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{2A5794EF-77E7-41A9-8BC6-1077DB0499FE}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NumberParserTest</RootNamespace>
-    <AssemblyName>NumberParserTest</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="..\NumberParserTestShared\NumberParserTestShared.projitems" Label="Shared" />
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/NumberParser/NumberParserTest/Properties/AssemblyInfo.cs b/samples/NumberParser/NumberParserTest/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/NumberParser/NumberParserTest/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/NumberParser/NumberParserTest/packages.config b/samples/NumberParser/NumberParserTest/packages.config
deleted file mode 100644
index b5efbbb63..000000000
--- a/samples/NumberParser/NumberParserTest/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/OpenThread/UdpThreadClient/Properties/AssemblyInfo.cs b/samples/OpenThread/UdpThreadClient/Properties/AssemblyInfo.cs
deleted file mode 100644
index f268976dd..000000000
--- a/samples/OpenThread/UdpThreadClient/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("UdpThreadClient")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("UdpThreadClient")]
-[assembly: AssemblyCopyright("Copyright © 2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/OpenThread/UdpThreadClient/UdpThreadClient.csproj b/samples/OpenThread/UdpThreadClient/UdpThreadClient.csproj
new file mode 100644
index 000000000..3b9d2f178
--- /dev/null
+++ b/samples/OpenThread/UdpThreadClient/UdpThreadClient.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>UdpThreadSamples</RootNamespace>
+    <AssemblyName>UdpThreadSamples</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CCSWE.nanoFramework.Graphics" Version="1.1.135" />
+    <PackageReference Include="CCSWE.nanoFramework.Math" Version="1.1.135" />
+    <PackageReference Include="CCSWE.nanoFramework.NeoPixel" Version="1.1.135" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Graphics.Core" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32.Rmt" Version="2.0.35" />
+    <PackageReference Include="nanoFramework.Networking.Thread" Version="1.0.51" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Display.cs">
+      <Link>Display.cs</Link>
+    </Compile>
+    <Compile Include="..\Led.cs">
+      <Link>Led.cs</Link>
+    </Compile>
+    <Compile Include="..\SocketUtils.cs">
+      <Link>SocketUtils.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/OpenThread/UdpThreadClient/UdpThreadClient.nfproj b/samples/OpenThread/UdpThreadClient/UdpThreadClient.nfproj
deleted file mode 100644
index dbbea08f1..000000000
--- a/samples/OpenThread/UdpThreadClient/UdpThreadClient.nfproj
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>c679edd8-8104-4188-b1e3-a7b84c5b7e7b</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>UdpThreadSamples</RootNamespace>
-    <AssemblyName>UdpThreadSamples</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\Display.cs">
-      <Link>Display.cs</Link>
-    </Compile>
-    <Compile Include="..\Led.cs">
-      <Link>Led.cs</Link>
-    </Compile>
-    <Compile Include="..\SocketUtils.cs">
-      <Link>SocketUtils.cs</Link>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="CCSWE.nanoFramework.Graphics, Version=1.1.135.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\CCSWE.nanoFramework.Graphics.1.1.135\lib\netnano1.0\CCSWE.nanoFramework.Graphics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="CCSWE.nanoFramework.Math, Version=1.1.135.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\CCSWE.nanoFramework.Math.1.1.135\lib\netnano1.0\CCSWE.nanoFramework.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="CCSWE.nanoFramework.NeoPixel, Version=1.1.135.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\CCSWE.nanoFramework.NeoPixel.1.1.135\lib\netnano1.0\CCSWE.nanoFramework.NeoPixel.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Graphics.Core.1.2.45\lib\nanoFramework.Graphics.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32.Rmt, Version=2.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.Rmt.2.0.35\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Networking.Thread, Version=1.0.51.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Networking.Thread.1.0.51\lib\nanoFramework.Networking.Thread.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/OpenThread/UdpThreadClient/packages.config b/samples/OpenThread/UdpThreadClient/packages.config
deleted file mode 100644
index 170206ae3..000000000
--- a/samples/OpenThread/UdpThreadClient/packages.config
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CCSWE.nanoFramework.Graphics" version="1.1.135" targetFramework="netnano1.0" />
-  <package id="CCSWE.nanoFramework.Math" version="1.1.135" targetFramework="netnano1.0" />
-  <package id="CCSWE.nanoFramework.NeoPixel" version="1.1.135" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics.Core" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32.Rmt" version="2.0.35" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Networking.Thread" version="1.0.51" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/OpenThread/UdpThreadSamples.sln b/samples/OpenThread/UdpThreadSamples.sln
index 0d4220175..2723dbb76 100644
--- a/samples/OpenThread/UdpThreadSamples.sln
+++ b/samples/OpenThread/UdpThreadSamples.sln
@@ -1,11 +1,10 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34221.43
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "UdpThreadClient", "UdpThreadClient\UdpThreadClient.nfproj", "{C679EDD8-8104-4188-B1E3-A7B84C5B7E7B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UdpThreadClient", "UdpThreadClient\UdpThreadClient.csproj", "{C679EDD8-8104-4188-B1E3-A7B84C5B7E7B}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "UdpThreadServer", "UdpThreadServer\UdpThreadServer.nfproj", "{EA37527A-FC52-4269-A9B1-ACC366ECD0C5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UdpThreadServer", "UdpThreadServer\UdpThreadServer.csproj", "{EA37527A-FC52-4269-A9B1-ACC366ECD0C5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2B0FD5A8-FC86-4111-8B70-2B0D7090F468}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/samples/OpenThread/UdpThreadServer/Properties/AssemblyInfo.cs b/samples/OpenThread/UdpThreadServer/Properties/AssemblyInfo.cs
deleted file mode 100644
index c8a757790..000000000
--- a/samples/OpenThread/UdpThreadServer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("UdpThreadServer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("UdpThreadServer")]
-[assembly: AssemblyCopyright("Copyright © 2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/OpenThread/UdpThreadServer/UdpThreadServer.csproj b/samples/OpenThread/UdpThreadServer/UdpThreadServer.csproj
new file mode 100644
index 000000000..af860a4d3
--- /dev/null
+++ b/samples/OpenThread/UdpThreadServer/UdpThreadServer.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>UdpThreadServer</RootNamespace>
+    <AssemblyName>UdpThreadServer</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CCSWE.nanoFramework.Graphics" Version="1.1.135" />
+    <PackageReference Include="CCSWE.nanoFramework.Math" Version="1.1.135" />
+    <PackageReference Include="CCSWE.nanoFramework.NeoPixel" Version="1.1.135" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Graphics.Core" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32.Rmt" Version="2.0.35" />
+    <PackageReference Include="nanoFramework.Networking.Thread" Version="1.0.51" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.5.116" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Display.cs">
+      <Link>Display.cs</Link>
+    </Compile>
+    <Compile Include="..\Led.cs">
+      <Link>Led.cs</Link>
+    </Compile>
+    <Compile Include="..\SocketUtils.cs">
+      <Link>SocketUtils.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/OpenThread/UdpThreadServer/UdpThreadServer.nfproj b/samples/OpenThread/UdpThreadServer/UdpThreadServer.nfproj
deleted file mode 100644
index 03c71d235..000000000
--- a/samples/OpenThread/UdpThreadServer/UdpThreadServer.nfproj
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>ea37527a-fc52-4269-a9b1-acc366ecd0c5</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>UdpThreadServer</RootNamespace>
-    <AssemblyName>UdpThreadServer</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\Display.cs">
-      <Link>Display.cs</Link>
-    </Compile>
-    <Compile Include="..\Led.cs">
-      <Link>Led.cs</Link>
-    </Compile>
-    <Compile Include="..\SocketUtils.cs">
-      <Link>SocketUtils.cs</Link>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="CCSWE.nanoFramework.Graphics, Version=1.1.135.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\CCSWE.nanoFramework.Graphics.1.1.135\lib\netnano1.0\CCSWE.nanoFramework.Graphics.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="CCSWE.nanoFramework.Math, Version=1.1.135.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\CCSWE.nanoFramework.Math.1.1.135\lib\netnano1.0\CCSWE.nanoFramework.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="CCSWE.nanoFramework.NeoPixel, Version=1.1.135.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\CCSWE.nanoFramework.NeoPixel.1.1.135\lib\netnano1.0\CCSWE.nanoFramework.NeoPixel.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Graphics.Core.1.2.45\lib\nanoFramework.Graphics.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32.Rmt, Version=2.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Hardware.Esp32.Rmt.2.0.35\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Networking.Thread, Version=1.0.51.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Networking.Thread.1.0.51\lib\nanoFramework.Networking.Thread.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.5.116.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Math.1.5.116\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/OpenThread/UdpThreadServer/packages.config b/samples/OpenThread/UdpThreadServer/packages.config
deleted file mode 100644
index 170206ae3..000000000
--- a/samples/OpenThread/UdpThreadServer/packages.config
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="CCSWE.nanoFramework.Graphics" version="1.1.135" targetFramework="netnano1.0" />
-  <package id="CCSWE.nanoFramework.Math" version="1.1.135" targetFramework="netnano1.0" />
-  <package id="CCSWE.nanoFramework.NeoPixel" version="1.1.135" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics.Core" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32.Rmt" version="2.0.35" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Networking.Thread" version="1.0.51" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Math" version="1.5.116" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/PWM/System.Device.Pwm/Properties/AssemblyInfo.cs b/samples/PWM/System.Device.Pwm/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/PWM/System.Device.Pwm/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/PWM/System.Device.Pwm/PwmSample.csproj b/samples/PWM/System.Device.Pwm/PwmSample.csproj
new file mode 100644
index 000000000..db71f62a0
--- /dev/null
+++ b/samples/PWM/System.Device.Pwm/PwmSample.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>PwmSample</RootNamespace>
+    <AssemblyName>PwmSample</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Pwm" Version="1.1.23" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/PWM/System.Device.Pwm/PwmSample.nfproj b/samples/PWM/System.Device.Pwm/PwmSample.nfproj
deleted file mode 100644
index fd68655df..000000000
--- a/samples/PWM/System.Device.Pwm/PwmSample.nfproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>b362acd8-dcd0-4ca3-a0b5-7f1583574a3a</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>PwmSample</RootNamespace>
-    <AssemblyName>PwmSample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Pwm, Version=1.1.23.36628, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Pwm.1.1.23\lib\System.Device.Pwm.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/PWM/System.Device.Pwm/System.Device.Pwm.sln b/samples/PWM/System.Device.Pwm/System.Device.Pwm.sln
index 8e071e357..930cf0a85 100644
--- a/samples/PWM/System.Device.Pwm/System.Device.Pwm.sln
+++ b/samples/PWM/System.Device.Pwm/System.Device.Pwm.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31613.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "PwmSample", "PwmSample.nfproj", "{B362ACD8-DCD0-4CA3-A0B5-7F1583574A3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PwmSample", "PwmSample.csproj", "{B362ACD8-DCD0-4CA3-A0B5-7F1583574A3A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/PWM/System.Device.Pwm/packages.config b/samples/PWM/System.Device.Pwm/packages.config
deleted file mode 100644
index febe6a746..000000000
--- a/samples/PWM/System.Device.Pwm/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Pwm" version="1.1.23" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/RTC/Properties/AssemblyInfo.cs b/samples/RTC/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/RTC/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/RTC/RTC.csproj b/samples/RTC/RTC.csproj
new file mode 100644
index 000000000..e9473b38c
--- /dev/null
+++ b/samples/RTC/RTC.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>RTC.Sample</RootNamespace>
+    <AssemblyName>RTC.Sample</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/RTC/RTC.nfproj b/samples/RTC/RTC.nfproj
deleted file mode 100644
index 94b0d586c..000000000
--- a/samples/RTC/RTC.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>40229c01-e252-46a7-8b71-6c9fa6687f9a</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>RTC.Sample</RootNamespace>
-    <AssemblyName>RTC.Sample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/RTC/RTC.sln b/samples/RTC/RTC.sln
index a796fa30e..3fd854a32 100644
--- a/samples/RTC/RTC.sln
+++ b/samples/RTC/RTC.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "RTC", "RTC.nfproj", "{40229C01-E252-46A7-8B71-6C9FA6687F9A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RTC", "RTC.csproj", "{40229C01-E252-46A7-8B71-6C9FA6687F9A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/RTC/packages.config b/samples/RTC/packages.config
deleted file mode 100644
index 469065cbe..000000000
--- a/samples/RTC/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Reflection/CustomAttributes/CustomAttributes.csproj b/samples/Reflection/CustomAttributes/CustomAttributes.csproj
new file mode 100644
index 000000000..0dd1cc0d3
--- /dev/null
+++ b/samples/Reflection/CustomAttributes/CustomAttributes.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Reflection.CustomAttributes</RootNamespace>
+    <AssemblyName>Reflection.CustomAttributes</AssemblyName>
+    <NFMDP_XML_FILES>true</NFMDP_XML_FILES>
+    <NFMDP_DAT_FILES>true</NFMDP_DAT_FILES>
+    <NFMDP_DUMP_FILES>true</NFMDP_DUMP_FILES>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+  </ItemGroup>
+
+  <Import Project="..\CustomAttributes.Shared\CustomAttributes.Shared.projitems" Label="Shared" />
+
+</Project>
diff --git a/samples/Reflection/CustomAttributes/CustomAttributes.nfproj b/samples/Reflection/CustomAttributes/CustomAttributes.nfproj
deleted file mode 100644
index 641e5fa36..000000000
--- a/samples/Reflection/CustomAttributes/CustomAttributes.nfproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>3DE7F97C-6FC9-4312-8D84-0D616AB1605B</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Reflection.CustomAttributes</RootNamespace>
-    <AssemblyName>Reflection.CustomAttributes</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Label="nanoFramework">
-    <NFMDP_XML_FILES>true</NFMDP_XML_FILES>
-    <NFMDP_DAT_FILES>true</NFMDP_DAT_FILES>
-    <NFMDP_DUMP_FILES>true</NFMDP_DUMP_FILES>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="..\CustomAttributes.Shared\CustomAttributes.Shared.projitems" Label="Shared" />
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Reflection/CustomAttributes/Properties/AssemblyInfo.cs b/samples/Reflection/CustomAttributes/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Reflection/CustomAttributes/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Reflection/CustomAttributes/packages.config b/samples/Reflection/CustomAttributes/packages.config
deleted file mode 100644
index ddcc0baa5..000000000
--- a/samples/Reflection/CustomAttributes/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Reflection/Reflection.sln b/samples/Reflection/Reflection.sln
index ae4d2acfc..f6c12a303 100644
--- a/samples/Reflection/Reflection.sln
+++ b/samples/Reflection/Reflection.sln
@@ -9,15 +9,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Desktop", "Desktop", "{561A
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CustomAttributes.Shared", "CustomAttributes.Shared\CustomAttributes.Shared.shproj", "{BD1DA1CA-02CD-490F-B15E-85C7F89581FF}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "CustomAttributes", "CustomAttributes\CustomAttributes.nfproj", "{3DE7F97C-6FC9-4312-8D84-0D616AB1605B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomAttributes", "CustomAttributes\CustomAttributes.csproj", "{3DE7F97C-6FC9-4312-8D84-0D616AB1605B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomAttributes.Desktop", "CustomAttributes.Desktop\CustomAttributes.Desktop.csproj", "{EA795157-247F-4D2E-8E06-DC7F7C69C02E}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		CustomAttributes.Shared\CustomAttributes.Shared.projitems*{bd1da1ca-02cd-490f-b15e-85c7f89581ff}*SharedItemsImports = 13
-		CustomAttributes.Shared\CustomAttributes.Shared.projitems*{ea795157-247f-4d2e-8e06-dc7f7c69c02e}*SharedItemsImports = 4
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -43,4 +39,8 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B54D2DB0-B4B3-407F-BC9E-C49ADAFC52ED}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		CustomAttributes.Shared\CustomAttributes.Shared.projitems*{bd1da1ca-02cd-490f-b15e-85c7f89581ff}*SharedItemsImports = 13
+		CustomAttributes.Shared\CustomAttributes.Shared.projitems*{ea795157-247f-4d2e-8e06-dc7f7c69c02e}*SharedItemsImports = 4
+	EndGlobalSection
 EndGlobal
diff --git a/samples/SPI/Properties/AssemblyInfo.cs b/samples/SPI/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/SPI/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/SPI/SpiExamples.csproj b/samples/SPI/SpiExamples.csproj
new file mode 100644
index 000000000..a715547d2
--- /dev/null
+++ b/samples/SPI/SpiExamples.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>SpiExamples</RootNamespace>
+    <AssemblyName>SpiExamples</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.Spi" Version="1.3.82" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/SPI/SpiExamples.nfproj b/samples/SPI/SpiExamples.nfproj
deleted file mode 100644
index 023a2a915..000000000
--- a/samples/SPI/SpiExamples.nfproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>d038176c-3060-4312-9c10-fc9e7f3b99d7</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>SpiExamples</RootNamespace>
-    <AssemblyName>SpiExamples</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Spi, Version=1.3.82.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Spi.1.3.82\lib\System.Device.Spi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/SPI/SpiExamples.sln b/samples/SPI/SpiExamples.sln
index ae28730f2..9a1c38e69 100644
--- a/samples/SPI/SpiExamples.sln
+++ b/samples/SPI/SpiExamples.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SpiExamples", "SpiExamples.nfproj", "{D038176C-3060-4312-9C10-FC9E7F3B99D7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpiExamples", "SpiExamples.csproj", "{D038176C-3060-4312-9C10-FC9E7F3B99D7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/SPI/packages.config b/samples/SPI/packages.config
deleted file mode 100644
index f6cb428c2..000000000
--- a/samples/SPI/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Spi" version="1.3.82" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/SSL/ParseCertificate/ParseCertificate.csproj b/samples/SSL/ParseCertificate/ParseCertificate.csproj
new file mode 100644
index 000000000..7661157f8
--- /dev/null
+++ b/samples/SSL/ParseCertificate/ParseCertificate.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ParseCertificate</RootNamespace>
+    <AssemblyName>ParseCertificate</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/SSL/ParseCertificate/ParseCertificate.nfproj b/samples/SSL/ParseCertificate/ParseCertificate.nfproj
deleted file mode 100644
index 33970e342..000000000
--- a/samples/SSL/ParseCertificate/ParseCertificate.nfproj
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>638effb7-ed4a-402c-b70a-0406796b8ba9</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ParseCertificate</RootNamespace>
-    <AssemblyName>ParseCertificate</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\DigiCertGlobalRootCA.cer" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/SSL/ParseCertificate/Properties/AssemblyInfo.cs b/samples/SSL/ParseCertificate/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/SSL/ParseCertificate/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/SSL/ParseCertificate/packages.config b/samples/SSL/ParseCertificate/packages.config
deleted file mode 100644
index c20e00a38..000000000
--- a/samples/SSL/ParseCertificate/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/SSL/SecureClient/Properties/AssemblyInfo.cs b/samples/SSL/SecureClient/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/SSL/SecureClient/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/SSL/SecureClient/SecureClient.csproj b/samples/SSL/SecureClient/SecureClient.csproj
new file mode 100644
index 000000000..c79af5d9b
--- /dev/null
+++ b/samples/SSL/SecureClient/SecureClient.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>SecureClient</RootNamespace>
+    <AssemblyName>SecureClient</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\SecureClient_Wifi\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <Compile Include="..\SecureClient_Wifi\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="..\SecureClient_Wifi\Resources.resx" Link="Resources.resx" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/SSL/SecureClient/SecureClient.nfproj b/samples/SSL/SecureClient/SecureClient.nfproj
deleted file mode 100644
index f24190daf..000000000
--- a/samples/SSL/SecureClient/SecureClient.nfproj
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>28b7cb4b-5be1-4e56-850e-851cd026a8a1</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>SecureClient</RootNamespace>
-    <AssemblyName>SecureClient</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\SecureClient_Wifi\Program.cs">
-      <Link>Program.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\SecureClient_Wifi\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\SecureClient_Wifi\Resources.resx" Link="Resources.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/SSL/SecureClient/packages.config b/samples/SSL/SecureClient/packages.config
deleted file mode 100644
index c20e00a38..000000000
--- a/samples/SSL/SecureClient/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/SSL/SecureClient_WiFi/Properties/AssemblyInfo.cs b/samples/SSL/SecureClient_WiFi/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/SSL/SecureClient_WiFi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/SSL/SecureClient_WiFi/SecureClient_WiFi.nfproj b/samples/SSL/SecureClient_WiFi/SecureClient_WiFi.nfproj
deleted file mode 100644
index 978661e84..000000000
--- a/samples/SSL/SecureClient_WiFi/SecureClient_WiFi.nfproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>ae046a9a-faca-4a43-b0a5-b8b808c4f606</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>SecureClient</RootNamespace>
-    <AssemblyName>SecureClient</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\DigiCertGlobalRootCA.cer" />
-    <None Include="Resources\DigiCert_Global_G2_Azure.cer" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/SSL/SecureClient_WiFi/SecureClient_Wifi.csproj b/samples/SSL/SecureClient_WiFi/SecureClient_Wifi.csproj
new file mode 100644
index 000000000..b5ff64e03
--- /dev/null
+++ b/samples/SSL/SecureClient_WiFi/SecureClient_Wifi.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>SecureClient</RootNamespace>
+    <AssemblyName>SecureClient</AssemblyName>
+    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/SSL/SecureClient_WiFi/packages.config b/samples/SSL/SecureClient_WiFi/packages.config
deleted file mode 100644
index 63df19895..000000000
--- a/samples/SSL/SecureClient_WiFi/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/SSL/SecureServer/Properties/AssemblyInfo.cs b/samples/SSL/SecureServer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/SSL/SecureServer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/SSL/SecureServer/SecureServer.csproj b/samples/SSL/SecureServer/SecureServer.csproj
new file mode 100644
index 000000000..a18c4fc44
--- /dev/null
+++ b/samples/SSL/SecureServer/SecureServer.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>SecureServer</RootNamespace>
+    <AssemblyName>SecureServer</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\SecureServer_Wifi\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/SSL/SecureServer/SecureServer.nfproj b/samples/SSL/SecureServer/SecureServer.nfproj
deleted file mode 100644
index 072f367c7..000000000
--- a/samples/SSL/SecureServer/SecureServer.nfproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{4FFF49B0-79C5-458D-8C85-E50369AA71E3}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>SecureServer</RootNamespace>
-    <AssemblyName>SecureServer</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\SecureServer_Wifi\Program.cs">
-      <Link>Program.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/SSL/SecureServer/packages.config b/samples/SSL/SecureServer/packages.config
deleted file mode 100644
index c20e00a38..000000000
--- a/samples/SSL/SecureServer/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/SSL/SecureServer_WiFi/Properties/AssemblyInfo.cs b/samples/SSL/SecureServer_WiFi/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/SSL/SecureServer_WiFi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/SSL/SecureServer_WiFi/SecureServer_WiFi.nfproj b/samples/SSL/SecureServer_WiFi/SecureServer_WiFi.nfproj
deleted file mode 100644
index a08720734..000000000
--- a/samples/SSL/SecureServer_WiFi/SecureServer_WiFi.nfproj
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>b795119d-a3f0-43fa-99aa-ae582de61ac2</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>SecureServer</RootNamespace>
-    <AssemblyName>SecureServer</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/SSL/SecureServer_WiFi/SecureServer_Wifi.csproj b/samples/SSL/SecureServer_WiFi/SecureServer_Wifi.csproj
new file mode 100644
index 000000000..4ef415687
--- /dev/null
+++ b/samples/SSL/SecureServer_WiFi/SecureServer_Wifi.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>SecureServer</RootNamespace>
+    <AssemblyName>SecureServer</AssemblyName>
+    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/SSL/SecureServer_WiFi/packages.config b/samples/SSL/SecureServer_WiFi/packages.config
deleted file mode 100644
index 925d727e6..000000000
--- a/samples/SSL/SecureServer_WiFi/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/SSL/TLS.sln b/samples/SSL/TLS.sln
index 4c7babd5e..6f94974b1 100644
--- a/samples/SSL/TLS.sln
+++ b/samples/SSL/TLS.sln
@@ -2,15 +2,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "ParseCertificate", "ParseCertificate\ParseCertificate.nfproj", "{638EFFB7-ED4A-402C-B70A-0406796B8BA9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ParseCertificate", "ParseCertificate\ParseCertificate.csproj", "{638EFFB7-ED4A-402C-B70A-0406796B8BA9}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SecureClient_Wifi", "SecureClient_Wifi\SecureClient_Wifi.nfproj", "{AE046A9A-FACA-4A43-B0A5-B8B808C4F606}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureClient_Wifi", "SecureClient_Wifi\SecureClient_Wifi.csproj", "{AE046A9A-FACA-4A43-B0A5-B8B808C4F606}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SecureServer_Wifi", "SecureServer_Wifi\SecureServer_Wifi.nfproj", "{B795119D-A3F0-43FA-99AA-AE582DE61AC2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureServer_Wifi", "SecureServer_Wifi\SecureServer_Wifi.csproj", "{B795119D-A3F0-43FA-99AA-AE582DE61AC2}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SecureClient", "SecureClient\SecureClient.nfproj", "{28B7CB4B-5BE1-4E56-850E-851CD026A8A1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureClient", "SecureClient\SecureClient.csproj", "{28B7CB4B-5BE1-4E56-850E-851CD026A8A1}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SecureServer", "SecureServer\SecureServer.nfproj", "{4FFF49B0-79C5-458D-8C85-E50369AA71E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecureServer", "SecureServer\SecureServer.csproj", "{4FFF49B0-79C5-458D-8C85-E50369AA71E3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/SerialCommunication/SerialCommunication/Properties/AssemblyInfo.cs b/samples/SerialCommunication/SerialCommunication/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/SerialCommunication/SerialCommunication/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/SerialCommunication/SerialCommunication/SerialCommunication.csproj b/samples/SerialCommunication/SerialCommunication/SerialCommunication.csproj
new file mode 100644
index 000000000..dfa6c903f
--- /dev/null
+++ b/samples/SerialCommunication/SerialCommunication/SerialCommunication.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>SerialCommunication</RootNamespace>
+    <AssemblyName>SerialCommunication</AssemblyName>
+    <DefineConstants>$(DefineConstants);</DefineConstants>
+    <CodeAnalysisRuleSet>.sonarlint\nanoframework_system.io.portscsharp.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.IO.Ports" Version="1.1.132" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/SerialCommunication/SerialCommunication/SerialCommunication.nfproj b/samples/SerialCommunication/SerialCommunication/SerialCommunication.nfproj
deleted file mode 100644
index c1024d5d3..000000000
--- a/samples/SerialCommunication/SerialCommunication/SerialCommunication.nfproj
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>f7e58e73-882c-4b77-9a2a-23a8b4b35d0e</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>SerialCommunication</RootNamespace>
-    <AssemblyName>SerialCommunication</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);</DefineConstants>
-    <CodeAnalysisRuleSet>.sonarlint\nanoframework_system.io.portscsharp.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Scenario1_ConfigureDevice.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Scenario2_Write.cs" />
-    <Compile Include="Scenario3_Read.cs" />
-    <Compile Include="Scenario4_DataReceivedEvent.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Ports, Version=1.1.132.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Ports.1.1.132\lib\System.IO.Ports.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/SerialCommunication/SerialCommunication/SerialCommunication.sln b/samples/SerialCommunication/SerialCommunication/SerialCommunication.sln
index fd9695a8a..e54ac04de 100644
--- a/samples/SerialCommunication/SerialCommunication/SerialCommunication.sln
+++ b/samples/SerialCommunication/SerialCommunication/SerialCommunication.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "SerialCommunication", "SerialCommunication.nfproj", "{F7E58E73-882C-4B77-9A2A-23A8B4B35D0E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerialCommunication", "SerialCommunication.csproj", "{F7E58E73-882C-4B77-9A2A-23A8B4B35D0E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/SerialCommunication/SerialCommunication/packages.config b/samples/SerialCommunication/SerialCommunication/packages.config
deleted file mode 100644
index fb382fe12..000000000
--- a/samples/SerialCommunication/SerialCommunication/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Ports" version="1.1.132" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.csproj b/samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.csproj
new file mode 100644
index 000000000..316cff793
--- /dev/null
+++ b/samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BasicFileSystemExample</RootNamespace>
+    <AssemblyName>BasicFileSystemExample</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.IO.FileSystem" Version="1.1.87" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.nfproj b/samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.nfproj
deleted file mode 100644
index 85af9fdc7..000000000
--- a/samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.nfproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>2f085f9c-c2fc-4af6-ad84-a6a1cbaf80d9</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>BasicFileSystemExample</RootNamespace>
-    <AssemblyName>BasicFileSystemExample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=1.1.87.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.FileSystem.1.1.87\lib\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.sln b/samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.sln
index 9525b56a6..8df458bd8 100644
--- a/samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.sln
+++ b/samples/System.IO.FileSystem/BasicFileSystemExample/BasicFileSystemExample.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "BasicFileSystemExample", "BasicFileSystemExample.nfproj", "{2F085F9C-C2FC-4AF6-AD84-A6A1CBAF80D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicFileSystemExample", "BasicFileSystemExample.csproj", "{2F085F9C-C2FC-4AF6-AD84-A6A1CBAF80D9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/System.IO.FileSystem/BasicFileSystemExample/packages.config b/samples/System.IO.FileSystem/BasicFileSystemExample/packages.config
deleted file mode 100644
index 894338040..000000000
--- a/samples/System.IO.FileSystem/BasicFileSystemExample/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.FileSystem" version="1.1.87" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/System.IO.FileSystem/MountExample/MountExample.csproj b/samples/System.IO.FileSystem/MountExample/MountExample.csproj
new file mode 100644
index 000000000..dc85fa865
--- /dev/null
+++ b/samples/System.IO.FileSystem/MountExample/MountExample.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>MountExample</RootNamespace>
+    <AssemblyName>MountExample</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.IO.FileSystem" Version="1.1.87" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/System.IO.FileSystem/MountExample/MountExample.nfproj b/samples/System.IO.FileSystem/MountExample/MountExample.nfproj
deleted file mode 100644
index 51f1e013a..000000000
--- a/samples/System.IO.FileSystem/MountExample/MountExample.nfproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>2ff004cd-39d1-4b24-857a-7a5ccdf4b484</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>MountExample</RootNamespace>
-    <AssemblyName>MountExample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=1.1.87.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.FileSystem.1.1.87\lib\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/System.IO.FileSystem/MountExample/MountExample.sln b/samples/System.IO.FileSystem/MountExample/MountExample.sln
index 91c0e4bf2..4884e5cd5 100644
--- a/samples/System.IO.FileSystem/MountExample/MountExample.sln
+++ b/samples/System.IO.FileSystem/MountExample/MountExample.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31624.102
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "MountExample", "MountExample.nfproj", "{2FF004CD-39D1-4B24-857A-7A5CCDF4B484}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MountExample", "MountExample.csproj", "{2FF004CD-39D1-4B24-857A-7A5CCDF4B484}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/System.IO.FileSystem/MountExample/Properties/AssemblyInfo.cs b/samples/System.IO.FileSystem/MountExample/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/System.IO.FileSystem/MountExample/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/System.IO.FileSystem/MountExample/packages.config b/samples/System.IO.FileSystem/MountExample/packages.config
deleted file mode 100644
index 894338040..000000000
--- a/samples/System.IO.FileSystem/MountExample/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.FileSystem" version="1.1.87" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/System.Random/Properties/AssemblyInfo.cs b/samples/System.Random/Properties/AssemblyInfo.cs
deleted file mode 100644
index e310c0f2e..000000000
--- a/samples/System.Random/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("System.Random sample application")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("System.Random sample application")]
-[assembly: AssemblyCopyright("Copyright © 2018 nanoFramework contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/samples/System.Random/System.Random.csproj b/samples/System.Random/System.Random.csproj
new file mode 100644
index 000000000..1a585ac7d
--- /dev/null
+++ b/samples/System.Random/System.Random.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>System.Random</RootNamespace>
+    <AssemblyName>System.Random</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/System.Random/System.Random.nfproj b/samples/System.Random/System.Random.nfproj
deleted file mode 100644
index 8ef5c4914..000000000
--- a/samples/System.Random/System.Random.nfproj
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>bc007905-45a8-40d1-aa65-3c2c3992a412</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>System.Random</RootNamespace>
-    <AssemblyName>System.Random</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/System.Random/System.Random.sln b/samples/System.Random/System.Random.sln
index 8e9d18e5a..4d4509afd 100644
--- a/samples/System.Random/System.Random.sln
+++ b/samples/System.Random/System.Random.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27428.2002
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "System.Random", "System.Random.nfproj", "{BC007905-45A8-40D1-AA65-3C2C3992A412}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Random", "System.Random.csproj", "{BC007905-45A8-40D1-AA65-3C2C3992A412}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/System.Random/packages.config b/samples/System.Random/packages.config
deleted file mode 100644
index ddcc0baa5..000000000
--- a/samples/System.Random/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.csproj b/samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.csproj
new file mode 100644
index 000000000..5cc828a0b
--- /dev/null
+++ b/samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>EasyLink.Concentrator</RootNamespace>
+    <AssemblyName>EasyLink.Concentrator</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.IO.Ports" Version="1.1.132" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.TI.EasyLink" Version="1.4.28" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.nfproj b/samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.nfproj
deleted file mode 100644
index f63d8a9f8..000000000
--- a/samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.nfproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>084f1cef-1afd-467a-881e-6e43bf5d5f32</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>EasyLink.Concentrator</RootNamespace>
-    <AssemblyName>EasyLink.Concentrator</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.TI.EasyLink, Version=1.4.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.TI.EasyLink.1.4.28\lib\nanoFramework.TI.EasyLink.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Ports, Version=1.1.132.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Ports.1.1.132\lib\System.IO.Ports.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.sln b/samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.sln
index 84ebb4f50..4af1bf591 100644
--- a/samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.sln
+++ b/samples/TI.EasyLink/EasyLink.Concentrator/EasyLink.Concentrator.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.852
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "EasyLink.Concentrator", "EasyLink.Concentrator.nfproj", "{084F1CEF-1AFD-467A-881E-6E43BF5D5F32}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyLink.Concentrator", "EasyLink.Concentrator.csproj", "{084F1CEF-1AFD-467A-881E-6E43BF5D5F32}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/TI.EasyLink/EasyLink.Concentrator/Properties/AssemblyInfo.cs b/samples/TI.EasyLink/EasyLink.Concentrator/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/TI.EasyLink/EasyLink.Concentrator/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/TI.EasyLink/EasyLink.Concentrator/packages.config b/samples/TI.EasyLink/EasyLink.Concentrator/packages.config
deleted file mode 100644
index 04d02a063..000000000
--- a/samples/TI.EasyLink/EasyLink.Concentrator/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Ports" version="1.1.132" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.TI.EasyLink" version="1.4.28" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.csproj b/samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.csproj
new file mode 100644
index 000000000..a0361c7f5
--- /dev/null
+++ b/samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>EasyLink.Node</RootNamespace>
+    <AssemblyName>EasyLink.Node</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.TI.EasyLink" Version="1.4.28" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.nfproj b/samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.nfproj
deleted file mode 100644
index de82b3c4f..000000000
--- a/samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.nfproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>27adad49-3c8c-4c42-9f9e-521477e4a893</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>EasyLink.Node</RootNamespace>
-    <AssemblyName>EasyLink.Node</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.TI.EasyLink, Version=1.4.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.TI.EasyLink.1.4.28\lib\nanoFramework.TI.EasyLink.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.sln b/samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.sln
index 96974e36e..71d0d9390 100644
--- a/samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.sln
+++ b/samples/TI.EasyLink/EasyLink.Node/EasyLink.Node.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.852
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "EasyLink.Node", "EasyLink.Node.nfproj", "{27ADAD49-3C8C-4C42-9F9E-521477E4A893}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyLink.Node", "EasyLink.Node.csproj", "{27ADAD49-3C8C-4C42-9F9E-521477E4A893}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,6 +21,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {b8cd8d4d-60a9-4dd9-b2da-c80075b25654}
+		SolutionGuid = {B8CD8D4D-60A9-4DD9-B2DA-C80075B25654}
 	EndGlobalSection
 EndGlobal
diff --git a/samples/TI.EasyLink/EasyLink.Node/Properties/AssemblyInfo.cs b/samples/TI.EasyLink/EasyLink.Node/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/TI.EasyLink/EasyLink.Node/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/TI.EasyLink/EasyLink.Node/packages.config b/samples/TI.EasyLink/EasyLink.Node/packages.config
deleted file mode 100644
index c40288e33..000000000
--- a/samples/TI.EasyLink/EasyLink.Node/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.TI.EasyLink" version="1.4.28" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Threading/01-Basic Threading/01-Basic Threading.csproj b/samples/Threading/01-Basic Threading/01-Basic Threading.csproj
new file mode 100644
index 000000000..a624e92ff
--- /dev/null
+++ b/samples/Threading/01-Basic Threading/01-Basic Threading.csproj	
@@ -0,0 +1,14 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Basic_Threading</RootNamespace>
+    <AssemblyName>Basic_Threading</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.10.5" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Threading/01-Basic Threading/01-Basic Threading.nfproj b/samples/Threading/01-Basic Threading/01-Basic Threading.nfproj
deleted file mode 100644
index 84cf25d56..000000000
--- a/samples/Threading/01-Basic Threading/01-Basic Threading.nfproj	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>3860f240-90fd-4cea-bd97-8e42220689ea</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Basic_Threading</RootNamespace>
-    <AssemblyName>Basic_Threading</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.10.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Threading/01-Basic Threading/Properties/AssemblyInfo.cs b/samples/Threading/01-Basic Threading/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Threading/01-Basic Threading/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Threading/01-Basic Threading/packages.config b/samples/Threading/01-Basic Threading/packages.config
deleted file mode 100644
index f3352a69f..000000000
--- a/samples/Threading/01-Basic Threading/packages.config	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/samples/Threading/02-Passing Parameters/02-Passing Parameters.csproj b/samples/Threading/02-Passing Parameters/02-Passing Parameters.csproj
new file mode 100644
index 000000000..68d9eec37
--- /dev/null
+++ b/samples/Threading/02-Passing Parameters/02-Passing Parameters.csproj	
@@ -0,0 +1,14 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>_02_Passing_Parameters</RootNamespace>
+    <AssemblyName>_02_Passing_Parameters</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.10.5" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Threading/02-Passing Parameters/02-Passing Parameters.nfproj b/samples/Threading/02-Passing Parameters/02-Passing Parameters.nfproj
deleted file mode 100644
index a4d66fbd1..000000000
--- a/samples/Threading/02-Passing Parameters/02-Passing Parameters.nfproj	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>9a145088-e5cd-4b10-91d4-41c149ed5bff</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>_02_Passing_Parameters</RootNamespace>
-    <AssemblyName>_02_Passing_Parameters</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.10.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Threading/02-Passing Parameters/Properties/AssemblyInfo.cs b/samples/Threading/02-Passing Parameters/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Threading/02-Passing Parameters/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Threading/02-Passing Parameters/packages.config b/samples/Threading/02-Passing Parameters/packages.config
deleted file mode 100644
index f3352a69f..000000000
--- a/samples/Threading/02-Passing Parameters/packages.config	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/samples/Threading/03-Retrieving data from threads/03-Retrieving data from threads.csproj b/samples/Threading/03-Retrieving data from threads/03-Retrieving data from threads.csproj
new file mode 100644
index 000000000..4b00e957d
--- /dev/null
+++ b/samples/Threading/03-Retrieving data from threads/03-Retrieving data from threads.csproj	
@@ -0,0 +1,14 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>_03___Retrieving_data_from_threads</RootNamespace>
+    <AssemblyName>_03___Retrieving_data_from_threads</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.10.5" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Threading/03-Retrieving data from threads/03-Retrieving data from threads.nfproj b/samples/Threading/03-Retrieving data from threads/03-Retrieving data from threads.nfproj
deleted file mode 100644
index 4ed992903..000000000
--- a/samples/Threading/03-Retrieving data from threads/03-Retrieving data from threads.nfproj	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>5a38547f-55ba-4eee-8d91-3fece875fe5f</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>_03___Retrieving_data_from_threads</RootNamespace>
-    <AssemblyName>_03___Retrieving_data_from_threads</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.10.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Threading/03-Retrieving data from threads/Properties/AssemblyInfo.cs b/samples/Threading/03-Retrieving data from threads/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Threading/03-Retrieving data from threads/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Threading/03-Retrieving data from threads/packages.config b/samples/Threading/03-Retrieving data from threads/packages.config
deleted file mode 100644
index f3352a69f..000000000
--- a/samples/Threading/03-Retrieving data from threads/packages.config	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/samples/Threading/04-Controlling threads/04-Controlling threads.csproj b/samples/Threading/04-Controlling threads/04-Controlling threads.csproj
new file mode 100644
index 000000000..1fe90a3f9
--- /dev/null
+++ b/samples/Threading/04-Controlling threads/04-Controlling threads.csproj	
@@ -0,0 +1,14 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>_04_Controlling_threads</RootNamespace>
+    <AssemblyName>_04_Controlling_threads</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.10.5" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Threading/04-Controlling threads/04-Controlling threads.nfproj b/samples/Threading/04-Controlling threads/04-Controlling threads.nfproj
deleted file mode 100644
index b4bef38fd..000000000
--- a/samples/Threading/04-Controlling threads/04-Controlling threads.nfproj	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>7175abf6-d604-4e95-9388-424fd4f7e1de</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>_04_Controlling_threads</RootNamespace>
-    <AssemblyName>_04_Controlling_threads</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.10.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Threading/04-Controlling threads/Properties/AssemblyInfo.cs b/samples/Threading/04-Controlling threads/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Threading/04-Controlling threads/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Threading/04-Controlling threads/packages.config b/samples/Threading/04-Controlling threads/packages.config
deleted file mode 100644
index f3352a69f..000000000
--- a/samples/Threading/04-Controlling threads/packages.config	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/samples/Threading/05-ManualResetEvent/05-ManualResetEvent.csproj b/samples/Threading/05-ManualResetEvent/05-ManualResetEvent.csproj
new file mode 100644
index 000000000..1c5a162f7
--- /dev/null
+++ b/samples/Threading/05-ManualResetEvent/05-ManualResetEvent.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>_05_Synchronization_primitives</RootNamespace>
+    <AssemblyName>_05_Synchronization_primitives</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Threading/05-ManualResetEvent/05-ManualResetEvent.nfproj b/samples/Threading/05-ManualResetEvent/05-ManualResetEvent.nfproj
deleted file mode 100644
index 6d6535b27..000000000
--- a/samples/Threading/05-ManualResetEvent/05-ManualResetEvent.nfproj
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>b3f04a58-67a5-40bf-a16c-0edbec4ce3c4</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>_05_Synchronization_primitives</RootNamespace>
-    <AssemblyName>_05_Synchronization_primitives</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Threading/05-ManualResetEvent/Properties/AssemblyInfo.cs b/samples/Threading/05-ManualResetEvent/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Threading/05-ManualResetEvent/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Threading/05-ManualResetEvent/packages.config b/samples/Threading/05-ManualResetEvent/packages.config
deleted file mode 100644
index ddcc0baa5..000000000
--- a/samples/Threading/05-ManualResetEvent/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Threading/06-AutoResetEvent/06-AutoResetEvent.csproj b/samples/Threading/06-AutoResetEvent/06-AutoResetEvent.csproj
new file mode 100644
index 000000000..40462e851
--- /dev/null
+++ b/samples/Threading/06-AutoResetEvent/06-AutoResetEvent.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>_06_AutoResetEvent</RootNamespace>
+    <AssemblyName>_06_AutoResetEvent</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Threading/06-AutoResetEvent/06-AutoResetEvent.nfproj b/samples/Threading/06-AutoResetEvent/06-AutoResetEvent.nfproj
deleted file mode 100644
index 2d07aad9b..000000000
--- a/samples/Threading/06-AutoResetEvent/06-AutoResetEvent.nfproj
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>e7bc01c6-1cd8-41b0-82e1-3218328ceb86</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>_06_AutoResetEvent</RootNamespace>
-    <AssemblyName>_06_AutoResetEvent</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Threading/06-AutoResetEvent/Properties/AssemblyInfo.cs b/samples/Threading/06-AutoResetEvent/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Threading/06-AutoResetEvent/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Threading/06-AutoResetEvent/packages.config b/samples/Threading/06-AutoResetEvent/packages.config
deleted file mode 100644
index ddcc0baa5..000000000
--- a/samples/Threading/06-AutoResetEvent/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Threading/07-Sharing resources/07-Sharing resources.csproj b/samples/Threading/07-Sharing resources/07-Sharing resources.csproj
new file mode 100644
index 000000000..2b1c8bcf2
--- /dev/null
+++ b/samples/Threading/07-Sharing resources/07-Sharing resources.csproj	
@@ -0,0 +1,15 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>_07_Sharing_resources</RootNamespace>
+    <AssemblyName>_07_Sharing_resources</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.10.5" />
+    <PackageReference Include="nanoFramework.System.Math" Version="1.4.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Threading/07-Sharing resources/07-Sharing resources.nfproj b/samples/Threading/07-Sharing resources/07-Sharing resources.nfproj
deleted file mode 100644
index 28535e9b3..000000000
--- a/samples/Threading/07-Sharing resources/07-Sharing resources.nfproj	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>7c031844-450a-449a-b5d4-a6590361d3a6</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>_07_Sharing_resources</RootNamespace>
-    <AssemblyName>_07_Sharing_resources</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.10.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Math, Version=1.4.1.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Math.1.4.1\lib\System.Math.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Threading/07-Sharing resources/Properties/AssemblyInfo.cs b/samples/Threading/07-Sharing resources/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Threading/07-Sharing resources/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Threading/07-Sharing resources/packages.config b/samples/Threading/07-Sharing resources/packages.config
deleted file mode 100644
index 868aeee9a..000000000
--- a/samples/Threading/07-Sharing resources/packages.config	
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Math" version="1.4.1" targetFramework="netnanoframework10" />
-</packages>
\ No newline at end of file
diff --git a/samples/Threading/Threading.sln b/samples/Threading/Threading.sln
index 9523a6aeb..c512c259a 100644
--- a/samples/Threading/Threading.sln
+++ b/samples/Threading/Threading.sln
@@ -1,21 +1,20 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.1145
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "01-Basic Threading", "01-Basic Threading\01-Basic Threading.nfproj", "{3860F240-90FD-4CEA-BD97-8E42220689EA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "01-Basic Threading", "01-Basic Threading\01-Basic Threading.csproj", "{3860F240-90FD-4CEA-BD97-8E42220689EA}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "02-Passing Parameters", "02-Passing Parameters\02-Passing Parameters.nfproj", "{9A145088-E5CD-4B10-91D4-41C149ED5BFF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "02-Passing Parameters", "02-Passing Parameters\02-Passing Parameters.csproj", "{9A145088-E5CD-4B10-91D4-41C149ED5BFF}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "03-Retrieving data from threads", "03-Retrieving data from threads\03-Retrieving data from threads.nfproj", "{5A38547F-55BA-4EEE-8D91-3FECE875FE5F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "03-Retrieving data from threads", "03-Retrieving data from threads\03-Retrieving data from threads.csproj", "{5A38547F-55BA-4EEE-8D91-3FECE875FE5F}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "04-Controlling threads", "04-Controlling threads\04-Controlling threads.nfproj", "{7175ABF6-D604-4E95-9388-424FD4F7E1DE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "04-Controlling threads", "04-Controlling threads\04-Controlling threads.csproj", "{7175ABF6-D604-4E95-9388-424FD4F7E1DE}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "05-ManualResetEvent", "05-ManualResetEvent\05-ManualResetEvent.nfproj", "{B3F04A58-67A5-40BF-A16C-0EDBEC4CE3C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "05-ManualResetEvent", "05-ManualResetEvent\05-ManualResetEvent.csproj", "{B3F04A58-67A5-40BF-A16C-0EDBEC4CE3C4}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "06-AutoResetEvent", "06-AutoResetEvent\06-AutoResetEvent.nfproj", "{E7BC01C6-1CD8-41B0-82E1-3218328CEB86}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "06-AutoResetEvent", "06-AutoResetEvent\06-AutoResetEvent.csproj", "{E7BC01C6-1CD8-41B0-82E1-3218328CEB86}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "07-Sharing resources", "07-Sharing resources\07-Sharing resources.nfproj", "{7C031844-450A-449A-B5D4-A6590361D3A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "07-Sharing resources", "07-Sharing resources\07-Sharing resources.csproj", "{7C031844-450A-449A-B5D4-A6590361D3A6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Timer/Properties/AssemblyInfo.cs b/samples/Timer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3bea5f08b..000000000
--- a/samples/Timer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/samples/Timer/Timer.csproj b/samples/Timer/Timer.csproj
new file mode 100644
index 000000000..3422587d6
--- /dev/null
+++ b/samples/Timer/Timer.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Timer</RootNamespace>
+    <AssemblyName>Timer</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Timer/Timer.nfproj b/samples/Timer/Timer.nfproj
deleted file mode 100644
index 9f3a620e7..000000000
--- a/samples/Timer/Timer.nfproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>17f41103-7cdd-4bc9-994b-802506417429</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Timer</RootNamespace>
-    <AssemblyName>Timer</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Timer/Timer.sln b/samples/Timer/Timer.sln
index 062f8b213..964bb6190 100644
--- a/samples/Timer/Timer.sln
+++ b/samples/Timer/Timer.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Timer", "Timer.nfproj", "{17F41103-7CDD-4BC9-994B-802506417429}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Timer", "Timer.csproj", "{17F41103-7CDD-4BC9-994B-802506417429}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Timer/packages.config b/samples/Timer/packages.config
deleted file mode 100644
index b5f6ab316..000000000
--- a/samples/Timer/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/ToStringTest/ToStringTest.sln b/samples/ToStringTest/ToStringTest.sln
index aede6b2f6..246f69fff 100644
--- a/samples/ToStringTest/ToStringTest.sln
+++ b/samples/ToStringTest/ToStringTest.sln
@@ -1,19 +1,14 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "ToStringTesting", "ToStringTest\ToStringTesting.nfproj", "{1E64375B-BB70-4D4B-AD1F-44F54D772F5A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToStringTesting", "ToStringTest\ToStringTesting.csproj", "{1E64375B-BB70-4D4B-AD1F-44F54D772F5A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopToStringTesting", "DesktopToStringTesting\DesktopToStringTesting.csproj", "{7B9C00B5-7E84-4998-9648-F29366743E60}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ToStringTestingShared", "ToStringTestingShared\ToStringTestingShared.shproj", "{4D808626-C015-4EA6-98A3-22B4958DEA37}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		ToStringTestingShared\ToStringTestingShared.projitems*{4d808626-c015-4ea6-98a3-22b4958dea37}*SharedItemsImports = 13
-		ToStringTestingShared\ToStringTestingShared.projitems*{7b9c00b5-7e84-4998-9648-f29366743e60}*SharedItemsImports = 4
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -35,4 +30,8 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {556AF64B-C9F6-48C4-910F-3541B1CD4F20}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		ToStringTestingShared\ToStringTestingShared.projitems*{4d808626-c015-4ea6-98a3-22b4958dea37}*SharedItemsImports = 13
+		ToStringTestingShared\ToStringTestingShared.projitems*{7b9c00b5-7e84-4998-9648-f29366743e60}*SharedItemsImports = 4
+	EndGlobalSection
 EndGlobal
diff --git a/samples/ToStringTest/ToStringTest/Properties/AssemblyInfo.cs b/samples/ToStringTest/ToStringTest/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/ToStringTest/ToStringTest/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/ToStringTest/ToStringTest/ToStringTesting.csproj b/samples/ToStringTest/ToStringTest/ToStringTesting.csproj
new file mode 100644
index 000000000..56a5204a4
--- /dev/null
+++ b/samples/ToStringTest/ToStringTest/ToStringTesting.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ToStringTest</RootNamespace>
+    <AssemblyName>ToStringTest</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+  </ItemGroup>
+
+  <Import Project="..\ToStringTestingShared\ToStringTestingShared.projitems" Label="Shared" />
+
+</Project>
diff --git a/samples/ToStringTest/ToStringTest/ToStringTesting.nfproj b/samples/ToStringTest/ToStringTest/ToStringTesting.nfproj
deleted file mode 100644
index 79359011e..000000000
--- a/samples/ToStringTest/ToStringTest/ToStringTesting.nfproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{18DD76-328B-46DF-9F39-F559910360};{FAE04EC0-30113-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{1E64375B-BB70-4D4B-AD1F-44F54D772F5A}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ToStringTest</RootNamespace>
-    <AssemblyName>ToStringTest</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="..\ToStringTestingShared\ToStringTestingShared.projitems" Label="Shared" />
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/ToStringTest/ToStringTest/packages.config b/samples/ToStringTest/ToStringTest/packages.config
deleted file mode 100644
index ddcc0baa5..000000000
--- a/samples/ToStringTest/ToStringTest/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/TouchESP32/Properties/AssemblyInfo.cs b/samples/TouchESP32/Properties/AssemblyInfo.cs
deleted file mode 100644
index eda6c3449..000000000
--- a/samples/TouchESP32/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/TouchESP32/TestTouchApp.csproj b/samples/TouchESP32/TestTouchApp.csproj
new file mode 100644
index 000000000..df32edd0b
--- /dev/null
+++ b/samples/TouchESP32/TestTouchApp.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>TestTouchApp</RootNamespace>
+    <AssemblyName>TestTouchApp</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/TouchESP32/TestTouchApp.nfproj b/samples/TouchESP32/TestTouchApp.nfproj
deleted file mode 100644
index 57acf078b..000000000
--- a/samples/TouchESP32/TestTouchApp.nfproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>21722546-a665-4fd1-8cb1-7539a4d7f037</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>TestTouchApp</RootNamespace>
-    <AssemblyName>TestTouchApp</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/TouchESP32/TestTouchApp.sln b/samples/TouchESP32/TestTouchApp.sln
index 48ca19126..862bc9a3a 100644
--- a/samples/TouchESP32/TestTouchApp.sln
+++ b/samples/TouchESP32/TestTouchApp.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33403.182
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "TestTouchApp", "TestTouchApp.nfproj", "{21722546-A665-4FD1-8CB1-7539A4D7F037}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTouchApp", "TestTouchApp.csproj", "{21722546-A665-4FD1-8CB1-7539A4D7F037}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/TouchESP32/packages.config b/samples/TouchESP32/packages.config
deleted file mode 100644
index 6ebd39b06..000000000
--- a/samples/TouchESP32/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/UdpClient/DumpSSDPRequests/DumpSSDPRequests.csproj b/samples/UdpClient/DumpSSDPRequests/DumpSSDPRequests.csproj
new file mode 100644
index 000000000..aaac5ed88
--- /dev/null
+++ b/samples/UdpClient/DumpSSDPRequests/DumpSSDPRequests.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>DumpSSDPRequests</RootNamespace>
+    <AssemblyName>DumpSSDPRequests</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Sockets.UdpClient" Version="1.1.102" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/UdpClient/DumpSSDPRequests/DumpSSDPRequests.nfproj b/samples/UdpClient/DumpSSDPRequests/DumpSSDPRequests.nfproj
deleted file mode 100644
index 2995ed1ce..000000000
--- a/samples/UdpClient/DumpSSDPRequests/DumpSSDPRequests.nfproj
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>eda31032-9d78-4f4f-89e1-1cd246131ed3</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>DumpSSDPRequests</RootNamespace>
-    <AssemblyName>DumpSSDPRequests</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Sockets.UdpClient, Version=1.1.102.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Sockets.UdpClient.1.1.102\lib\System.Net.Sockets.UdpClient.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/UdpClient/DumpSSDPRequests/Properties/AssemblyInfo.cs b/samples/UdpClient/DumpSSDPRequests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/UdpClient/DumpSSDPRequests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/UdpClient/DumpSSDPRequests/packages.config b/samples/UdpClient/DumpSSDPRequests/packages.config
deleted file mode 100644
index b9b07245a..000000000
--- a/samples/UdpClient/DumpSSDPRequests/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Sockets.UdpClient" version="1.1.102" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/UdpClient/QOTDClient/Properties/AssemblyInfo.cs b/samples/UdpClient/QOTDClient/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/UdpClient/QOTDClient/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/UdpClient/QOTDClient/QOTDClient.csproj b/samples/UdpClient/QOTDClient/QOTDClient.csproj
new file mode 100644
index 000000000..e2a908a0f
--- /dev/null
+++ b/samples/UdpClient/QOTDClient/QOTDClient.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>QOTDClient</RootNamespace>
+    <AssemblyName>QOTDClient</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Sockets.UdpClient" Version="1.1.102" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/UdpClient/QOTDClient/QOTDClient.nfproj b/samples/UdpClient/QOTDClient/QOTDClient.nfproj
deleted file mode 100644
index 15a876970..000000000
--- a/samples/UdpClient/QOTDClient/QOTDClient.nfproj
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>4a6082d2-8f0b-499a-9b5d-9de9ac5c6b51</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>QOTDClient</RootNamespace>
-    <AssemblyName>QOTDClient</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Sockets.UdpClient, Version=1.1.102.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Sockets.UdpClient.1.1.102\lib\System.Net.Sockets.UdpClient.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/UdpClient/QOTDClient/packages.config b/samples/UdpClient/QOTDClient/packages.config
deleted file mode 100644
index b9b07245a..000000000
--- a/samples/UdpClient/QOTDClient/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Sockets.UdpClient" version="1.1.102" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/UdpClient/UdpClient.sln b/samples/UdpClient/UdpClient.sln
index bb673cbaa..50e3df79a 100644
--- a/samples/UdpClient/UdpClient.sln
+++ b/samples/UdpClient/UdpClient.sln
@@ -1,13 +1,12 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "QOTDClient", "QOTDClient\QOTDClient.nfproj", "{4A6082D2-8F0B-499A-9B5D-9DE9AC5C6B51}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QOTDClient", "QOTDClient\QOTDClient.csproj", "{4A6082D2-8F0B-499A-9B5D-9DE9AC5C6B51}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "UdpEchoServer", "UdpEchoServer\UdpEchoServer.nfproj", "{24249D4E-6329-42AD-908B-5C0DB9B37468}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UdpEchoServer", "UdpEchoServer\UdpEchoServer.csproj", "{24249D4E-6329-42AD-908B-5C0DB9B37468}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "DumpSSDPRequests", "DumpSSDPRequests\DumpSSDPRequests.nfproj", "{EDA31032-9D78-4F4F-89E1-1CD246131ED3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DumpSSDPRequests", "DumpSSDPRequests\DumpSSDPRequests.csproj", "{EDA31032-9D78-4F4F-89E1-1CD246131ED3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/UdpClient/UdpEchoServer/Properties/AssemblyInfo.cs b/samples/UdpClient/UdpEchoServer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/UdpClient/UdpEchoServer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/UdpClient/UdpEchoServer/UdpEchoServer.csproj b/samples/UdpClient/UdpEchoServer/UdpEchoServer.csproj
new file mode 100644
index 000000000..e673eba30
--- /dev/null
+++ b/samples/UdpClient/UdpEchoServer/UdpEchoServer.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>UdpEchoServer</RootNamespace>
+    <AssemblyName>UdpEchoServer</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Sockets.UdpClient" Version="1.1.102" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/UdpClient/UdpEchoServer/UdpEchoServer.nfproj b/samples/UdpClient/UdpEchoServer/UdpEchoServer.nfproj
deleted file mode 100644
index 6ac90934b..000000000
--- a/samples/UdpClient/UdpEchoServer/UdpEchoServer.nfproj
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>24249d4e-6329-42ad-908b-5c0db9b37468</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>UdpEchoServer</RootNamespace>
-    <AssemblyName>UdpEchoServer</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Sockets.UdpClient, Version=1.1.102.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Sockets.UdpClient.1.1.102\lib\System.Net.Sockets.UdpClient.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/UdpClient/UdpEchoServer/packages.config b/samples/UdpClient/UdpEchoServer/packages.config
deleted file mode 100644
index b9b07245a..000000000
--- a/samples/UdpClient/UdpEchoServer/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Sockets.UdpClient" version="1.1.102" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/UnitTest/NFUnitTestDemo.sln b/samples/UnitTest/NFUnitTestDemo.sln
index b9f11a8b0..54a252f32 100644
--- a/samples/UnitTest/NFUnitTestDemo.sln
+++ b/samples/UnitTest/NFUnitTestDemo.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35222.181
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFUnitTest", "NFUnitTestDemo\NFUnitTest.nfproj", "{FBD29C49-D7DC-425E-BAD1-1AE63484A6CD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NFUnitTest", "NFUnitTestDemo\NFUnitTest.csproj", "{FBD29C49-D7DC-425E-BAD1-1AE63484A6CD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/UnitTest/NFUnitTestDemo/NFUnitTest.csproj b/samples/UnitTest/NFUnitTestDemo/NFUnitTest.csproj
new file mode 100644
index 000000000..0ce21364e
--- /dev/null
+++ b/samples/UnitTest/NFUnitTestDemo/NFUnitTest.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <RootNamespace>NFUnitTest</RootNamespace>
+    <AssemblyName>NFUnitTest</AssemblyName>
+    <IsCodedUITest>False</IsCodedUITest>
+    <IsTestProject>true</IsTestProject>
+    <TestProjectType>UnitTest</TestProjectType>
+    <RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.TestFramework" Version="3.0.80" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectCapability Include="TestContainer" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="TestOfTestFramework.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/UnitTest/NFUnitTestDemo/NFUnitTest.nfproj b/samples/UnitTest/NFUnitTestDemo/NFUnitTest.nfproj
deleted file mode 100644
index 7ecdfc88a..000000000
--- a/samples/UnitTest/NFUnitTestDemo/NFUnitTest.nfproj
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ProjectCapability Include="TestContainer" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>fbd29c49-d7dc-425e-bad1-1ae63484a6cd</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NFUnitTest</RootNamespace>
-    <AssemblyName>NFUnitTest</AssemblyName>
-    <IsCodedUITest>False</IsCodedUITest>
-    <IsTestProject>true</IsTestProject>
-    <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <PropertyGroup>
-    <RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Test.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="nano.runsettings" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.TestFramework, Version=3.0.80.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.TestFramework.3.0.80\lib\nanoFramework.TestFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.TestFramework.3.0.80\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/UnitTest/NFUnitTestDemo/packages.config b/samples/UnitTest/NFUnitTestDemo/packages.config
deleted file mode 100644
index 5c7e74bdb..000000000
--- a/samples/UnitTest/NFUnitTestDemo/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.TestFramework" version="3.0.80" targetFramework="netnano1.0" developmentDependency="true" />
-</packages>
\ No newline at end of file
diff --git a/samples/UsbClient/UsbClient/UsbClient.sln b/samples/UsbClient/UsbClient/UsbClient.sln
index cd99da135..495aa951e 100644
--- a/samples/UsbClient/UsbClient/UsbClient.sln
+++ b/samples/UsbClient/UsbClient/UsbClient.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "UsbStream", "UsbStream\UsbStream.nfproj", "{15C7A28B-B6F5-4CEC-AD56-790B83C4CAC9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UsbStream", "UsbStream\UsbStream.csproj", "{15C7A28B-B6F5-4CEC-AD56-790B83C4CAC9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/UsbClient/UsbClient/UsbStream/Properties/AssemblyInfo.cs b/samples/UsbClient/UsbClient/UsbStream/Properties/AssemblyInfo.cs
deleted file mode 100644
index acaed75a2..000000000
--- a/samples/UsbClient/UsbClient/UsbStream/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/UsbClient/UsbClient/UsbStream/UsbStream.csproj b/samples/UsbClient/UsbClient/UsbStream/UsbStream.csproj
new file mode 100644
index 000000000..abd94d77a
--- /dev/null
+++ b/samples/UsbClient/UsbClient/UsbStream/UsbStream.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>UsbStream</RootNamespace>
+    <AssemblyName>UsbStream</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.UsbStream" Version="1.0.84" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/UsbClient/UsbClient/UsbStream/UsbStream.nfproj b/samples/UsbClient/UsbClient/UsbStream/UsbStream.nfproj
deleted file mode 100644
index bf185cd42..000000000
--- a/samples/UsbClient/UsbClient/UsbStream/UsbStream.nfproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>15c7a28b-b6f5-4cec-ad56-790b83c4cac9</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>UsbStream</RootNamespace>
-    <AssemblyName>UsbStream</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.UsbStream, Version=1.0.84.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.UsbStream.1.0.84\lib\System.Device.UsbStream.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/UsbClient/UsbClient/UsbStream/packages.config b/samples/UsbClient/UsbClient/UsbStream/packages.config
deleted file mode 100644
index 1b13468a6..000000000
--- a/samples/UsbClient/UsbClient/UsbStream/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.UsbStream" version="1.0.84" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.csproj b/samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.csproj
new file mode 100644
index 000000000..7d0369d93
--- /dev/null
+++ b/samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>NFWebSockets.Client.Example</RootNamespace>
+    <AssemblyName>NFWebSockets.Client.Example</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.WebSockets.Client" Version="1.1.164" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.nfproj b/samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.nfproj
deleted file mode 100644
index 575f6e8ba..000000000
--- a/samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.nfproj
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>853b34d5-3988-412c-bad5-d2bdec214187</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NFWebSockets.Client.Example</RootNamespace>
-    <AssemblyName>NFWebSockets.Client.Example</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.WebSockets, Version=1.1.164.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.WebSockets.Client.1.1.164\lib\System.Net.WebSockets.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.sln b/samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.sln
index 3bf6f05ce..4e85451f9 100644
--- a/samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.sln
+++ b/samples/WebSockets/WebSockets.Client.Sample/NFWebSockets.Client.Example.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFWebSockets.Client.Example", "NFWebSockets.Client.Example.nfproj", "{853B34D5-3988-412C-BAD5-D2BDEC214187}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NFWebSockets.Client.Example", "NFWebSockets.Client.Example.csproj", "{853B34D5-3988-412C-BAD5-D2BDEC214187}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/WebSockets/WebSockets.Client.Sample/Properties/AssemblyInfo.cs b/samples/WebSockets/WebSockets.Client.Sample/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/WebSockets/WebSockets.Client.Sample/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/WebSockets/WebSockets.Client.Sample/packages.config b/samples/WebSockets/WebSockets.Client.Sample/packages.config
deleted file mode 100644
index da11bf944..000000000
--- a/samples/WebSockets/WebSockets.Client.Sample/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.WebSockets.Client" version="1.1.164" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.csproj b/samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.csproj
new file mode 100644
index 000000000..abc531064
--- /dev/null
+++ b/samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>NFWebSockets.Server.RgbExample</RootNamespace>
+    <AssemblyName>NFWebSockets.Server.RgbExample</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.AtomLite" Version="1.1.291" />
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Graphics.Core" Version="1.2.45" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32.Rmt" Version="2.0.35" />
+    <PackageReference Include="nanoFramework.Iot.Device.Button" Version="1.2.931" />
+    <PackageReference Include="nanoFramework.Iot.Device.Ws28xx.Esp32" Version="1.2.955" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Adc" Version="1.1.24" />
+    <PackageReference Include="nanoFramework.System.Device.Dac" Version="1.5.26" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.I2c" Version="1.1.29" />
+    <PackageReference Include="nanoFramework.System.Device.Spi" Version="1.3.82" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.FileSystem" Version="1.1.87" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Server" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Net.WebSockets.Server" Version="1.1.164" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.WebServer" Version="1.2.147" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.nfproj b/samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.nfproj
deleted file mode 100644
index 13bcbece7..000000000
--- a/samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.nfproj
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>5f445929-f0d2-4280-ac92-47ee05a8efca</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NFWebSockets.Server.RgbExample</RootNamespace>
-    <AssemblyName>NFWebSockets.Server.RgbExample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.Button, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Iot.Device.Button.1.2.931\lib\Iot.Device.Button.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Iot.Device.Ws28xx.Esp32, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Iot.Device.Ws28xx.Esp32.1.2.955\lib\Iot.Device.Ws28xx.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.AtomLite, Version=1.1.291.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.AtomLite.1.1.291\lib\nanoFramework.AtomLite.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Graphics.Core, Version=1.2.45.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Graphics.Core.1.2.45\lib\nanoFramework.Graphics.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32.Rmt, Version=2.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.Rmt.2.0.35\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.WebServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.WebServer.1.2.147\lib\nanoFramework.WebServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Adc, Version=1.1.24.44037, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Adc.1.1.24\lib\System.Device.Adc.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Dac, Version=1.5.26.53147, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Dac.1.5.26\lib\System.Device.Dac.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.I2c, Version=1.1.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.I2c.1.1.29\lib\System.Device.I2c.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Spi, Version=1.3.82.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Spi.1.3.82\lib\System.Device.Spi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=1.1.87.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.FileSystem.1.1.87\lib\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.Server.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.WebSockets, Version=1.1.164.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.WebSockets.Server.1.1.164\lib\System.Net.WebSockets.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.sln b/samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.sln
index 328aff557..e08eff8d6 100644
--- a/samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.sln
+++ b/samples/WebSockets/WebSockets.Server.RgbSample/NFWebSockets.Server.RgbExample.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFWebSockets.Server.RgbExample", "NFWebSockets.Server.RgbExample.nfproj", "{5F445929-F0D2-4280-AC92-47EE05A8EFCA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NFWebSockets.Server.RgbExample", "NFWebSockets.Server.RgbExample.csproj", "{5F445929-F0D2-4280-AC92-47EE05A8EFCA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/WebSockets/WebSockets.Server.RgbSample/Properties/AssemblyInfo.cs b/samples/WebSockets/WebSockets.Server.RgbSample/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/WebSockets/WebSockets.Server.RgbSample/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/WebSockets/WebSockets.Server.RgbSample/packages.config b/samples/WebSockets/WebSockets.Server.RgbSample/packages.config
deleted file mode 100644
index fb620464b..000000000
--- a/samples/WebSockets/WebSockets.Server.RgbSample/packages.config
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.AtomLite" version="1.1.291" targetFramework="netnano1.0" />
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Graphics.Core" version="1.2.45" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32.Rmt" version="2.0.35" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Button" version="1.2.931" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.Ws28xx.Esp32" version="1.2.955" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Adc" version="1.1.24" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Dac" version="1.5.26" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.I2c" version="1.1.29" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Spi" version="1.3.82" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.FileSystem" version="1.1.87" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Server" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.WebSockets.Server" version="1.1.164" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.WebServer" version="1.2.147" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.csproj b/samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.csproj
new file mode 100644
index 000000000..35d41b8bb
--- /dev/null
+++ b/samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>NFWebSockets.Example</RootNamespace>
+    <AssemblyName>NFWebSockets.Example</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Net.WebSockets" Version="1.1.164" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.nfproj b/samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.nfproj
deleted file mode 100644
index 8881a8aeb..000000000
--- a/samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.nfproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>1ef92d27-ffc7-40a1-beea-e695784b222a</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>NFWebSockets.Example</RootNamespace>
-    <AssemblyName>NFWebSockets.Example</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="NetworkHelpers.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.WebSockets, Version=1.1.164.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.WebSockets.1.1.164\lib\System.Net.WebSockets.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.sln b/samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.sln
index 786f3d776..39438ee49 100644
--- a/samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.sln
+++ b/samples/WebSockets/Websockets.ServerClient.Sample/NFWebsockets.Sample1.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFWebsockets.Sample1", "NFWebsockets.Sample1.nfproj", "{1EF92D27-FFC7-40A1-BEEA-E695784B222A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NFWebsockets.Sample1", "NFWebsockets.Sample1.csproj", "{1EF92D27-FFC7-40A1-BEEA-E695784B222A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/WebSockets/Websockets.ServerClient.Sample/Properties/AssemblyInfo.cs b/samples/WebSockets/Websockets.ServerClient.Sample/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/WebSockets/Websockets.ServerClient.Sample/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/WebSockets/Websockets.ServerClient.Sample/packages.config b/samples/WebSockets/Websockets.ServerClient.Sample/packages.config
deleted file mode 100644
index 01733d1a3..000000000
--- a/samples/WebSockets/Websockets.ServerClient.Sample/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.WebSockets" version="1.1.164" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Webserver/ServoMotorTester/Properties/AssemblyInfo.cs b/samples/Webserver/ServoMotorTester/Properties/AssemblyInfo.cs
deleted file mode 100644
index b7baab623..000000000
--- a/samples/Webserver/ServoMotorTester/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Webserver/ServoMotorTester/ServoMotorTester.csproj b/samples/Webserver/ServoMotorTester/ServoMotorTester.csproj
new file mode 100644
index 000000000..0340ee384
--- /dev/null
+++ b/samples/Webserver/ServoMotorTester/ServoMotorTester.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ServoMotorTester</RootNamespace>
+    <AssemblyName>ServoMotorTester</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Hardware.Esp32" Version="1.6.37" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Pwm" Version="1.1.23" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Server" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.WebServer" Version="1.2.147" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Webserver/ServoMotorTester/ServoMotorTester.nfproj b/samples/Webserver/ServoMotorTester/ServoMotorTester.nfproj
deleted file mode 100644
index 12a68f0da..000000000
--- a/samples/Webserver/ServoMotorTester/ServoMotorTester.nfproj
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>8f8ffd2f-809a-4866-9e60-73e8cae5d546</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ServoMotorTester</RootNamespace>
-    <AssemblyName>ServoMotorTester</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ServoInformation.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hardware.Esp32, Version=1.6.37.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hardware.Esp32.1.6.37\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.WebServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.WebServer.1.2.147\lib\nanoFramework.WebServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Pwm, Version=1.1.23.36628, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Pwm.1.1.23\lib\System.Device.Pwm.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.Server.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Webserver/ServoMotorTester/ServoMotorTester.sln b/samples/Webserver/ServoMotorTester/ServoMotorTester.sln
index 1e6a21582..19fc21f08 100644
--- a/samples/Webserver/ServoMotorTester/ServoMotorTester.sln
+++ b/samples/Webserver/ServoMotorTester/ServoMotorTester.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34408.163
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "ServoMotorTester", "ServoMotorTester.nfproj", "{8F8FFD2F-809A-4866-9E60-73E8CAE5D546}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServoMotorTester", "ServoMotorTester.csproj", "{8F8FFD2F-809A-4866-9E60-73E8CAE5D546}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Webserver/ServoMotorTester/packages.config b/samples/Webserver/ServoMotorTester/packages.config
deleted file mode 100644
index b89b28b39..000000000
--- a/samples/Webserver/ServoMotorTester/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hardware.Esp32" version="1.6.37" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Pwm" version="1.1.23" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Server" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.WebServer" version="1.2.147" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Webserver/WebServer.DI/Properties/AssemblyInfo.cs b/samples/Webserver/WebServer.DI/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2d9ea6ac1..000000000
--- a/samples/Webserver/WebServer.DI/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Reflection;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("WebServer.Sample")]
-[assembly: AssemblyCompany("nanoFramework Contributors")]
-[assembly: AssemblyProduct("WebServer.Sample")]
-[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]
diff --git a/samples/Webserver/WebServer.DI/WebServer.Sample.csproj b/samples/Webserver/WebServer.DI/WebServer.Sample.csproj
new file mode 100644
index 000000000..97015b7d1
--- /dev/null
+++ b/samples/Webserver/WebServer.DI/WebServer.Sample.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WebServer.Sample</RootNamespace>
+    <AssemblyName>WebServer.Sample</AssemblyName>
+    <DefineConstants>HAS_WIFI;HAS_STORAGE;</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.DependencyInjection" Version="1.1.32" />
+    <PackageReference Include="nanoFramework.Hosting" Version="2.0.11" />
+    <PackageReference Include="nanoFramework.Logging" Version="1.1.161" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Server" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.WebServer" Version="1.2.147" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Webserver/WebServer.DI/WebServer.Sample.nfproj b/samples/Webserver/WebServer.DI/WebServer.Sample.nfproj
deleted file mode 100644
index a34ccba85..000000000
--- a/samples/Webserver/WebServer.DI/WebServer.Sample.nfproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>f8e6e498-9d0d-4941-8b10-0882642f88ba</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>WebServer.Sample</RootNamespace>
-    <AssemblyName>WebServer.Sample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>HAS_WIFI;HAS_STORAGE;</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="ControllerTest.cs" />
-    <Compile Include="ITextService.cs" />
-    <Compile Include="ITextServiceSingleton.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TextService.cs" />
-    <Compile Include="WebServerDi.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.DependencyInjection, Version=1.1.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.DependencyInjection.1.1.32\lib\nanoFramework.DependencyInjection.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Hosting, Version=2.0.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Hosting.2.0.11\lib\nanoFramework.Hosting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Logging, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Logging.1.1.161\lib\nanoFramework.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.WebServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.WebServer.1.2.147\lib\nanoFramework.WebServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.Server.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Webserver/WebServer.DI/WebServer.Sample.sln b/samples/Webserver/WebServer.DI/WebServer.Sample.sln
index 981b2b638..c9ec378bb 100644
--- a/samples/Webserver/WebServer.DI/WebServer.Sample.sln
+++ b/samples/Webserver/WebServer.DI/WebServer.Sample.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "WebServer.Sample", "WebServer.Sample.nfproj", "{F8E6E498-9D0D-4941-8B10-0882642F88BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebServer.Sample", "WebServer.Sample.csproj", "{F8E6E498-9D0D-4941-8B10-0882642F88BA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Webserver/WebServer.DI/packages.config b/samples/Webserver/WebServer.DI/packages.config
deleted file mode 100644
index cf24a4c9a..000000000
--- a/samples/Webserver/WebServer.DI/packages.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.DependencyInjection" version="1.1.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Hosting" version="2.0.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging" version="1.1.161" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Server" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.WebServer" version="1.2.147" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Webserver/WebServer.GpioRest/Properties/AssemblyInfo.cs b/samples/Webserver/WebServer.GpioRest/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Webserver/WebServer.GpioRest/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.csproj b/samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.csproj
new file mode 100644
index 000000000..43ce37a8e
--- /dev/null
+++ b/samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WebServer.GpioRest</RootNamespace>
+    <AssemblyName>WebServer.GpioRest</AssemblyName>
+    <DefineConstants>HAS_WIFI;</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.FileSystem" Version="1.1.87" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Server" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.WebServer" Version="1.2.147" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.nfproj b/samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.nfproj
deleted file mode 100644
index d97d281f3..000000000
--- a/samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.nfproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>6782cc5b-f2b7-49f0-ac60-4d67e2bcc90d</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>WebServer.GpioRest</RootNamespace>
-    <AssemblyName>WebServer.GpioRest</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>HAS_WIFI;</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="ControllerGpio.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.WebServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.WebServer.1.2.147\lib\nanoFramework.WebServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=1.1.87.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.FileSystem.1.1.87\lib\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.Server.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.sln b/samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.sln
index 2a1c9ae43..04cb68e61 100644
--- a/samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.sln
+++ b/samples/Webserver/WebServer.GpioRest/WebServer.GpioRest.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "WebServer.GpioRest", "WebServer.GpioRest.nfproj", "{6782CC5B-F2B7-49F0-AC60-4D67E2BCC90D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebServer.GpioRest", "WebServer.GpioRest.csproj", "{6782CC5B-F2B7-49F0-AC60-4D67E2BCC90D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Webserver/WebServer.GpioRest/packages.config b/samples/Webserver/WebServer.GpioRest/packages.config
deleted file mode 100644
index 32cdcf7c0..000000000
--- a/samples/Webserver/WebServer.GpioRest/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.FileSystem" version="1.1.87" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Server" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.WebServer" version="1.2.147" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/Properties/AssemblyInfo.cs b/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/WebServer.Sample.FileSystem.csproj b/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/WebServer.Sample.FileSystem.csproj
new file mode 100644
index 000000000..969519ff4
--- /dev/null
+++ b/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/WebServer.Sample.FileSystem.csproj
@@ -0,0 +1,46 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WebServer.Sample</RootNamespace>
+    <AssemblyName>WebServer.Sample</AssemblyName>
+    <DefineConstants>$(DefineConstants);HAS_WIFI;HAS_STORAGE;</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.FileSystem" Version="1.1.87" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Server" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.WebServer.FileSystem" Version="1.2.147" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\WebServer.Sample\ControllerAuth.cs">
+      <Link>ControllerAuth.cs</Link>
+    </Compile>
+    <Compile Include="..\WebServer.Sample\ControllerPerson.cs">
+      <Link>ControllerPerson.cs</Link>
+    </Compile>
+    <Compile Include="..\WebServer.Sample\ControllerTest.cs">
+      <Link>ControllerTest.cs</Link>
+    </Compile>
+    <Compile Include="..\WebServer.Sample\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/WebServer.Sample.FileSystem.nfproj b/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/WebServer.Sample.FileSystem.nfproj
deleted file mode 100644
index 30dac9f85..000000000
--- a/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/WebServer.Sample.FileSystem.nfproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{129CD942-C541-4E30-A605-9AB688E92800}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>WebServer.Sample</RootNamespace>
-    <AssemblyName>WebServer.Sample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);HAS_WIFI;HAS_STORAGE;</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="..\WebServer.Sample\ControllerAuth.cs">
-      <Link>ControllerAuth.cs</Link>
-    </Compile>
-    <Compile Include="..\WebServer.Sample\ControllerPerson.cs">
-      <Link>ControllerPerson.cs</Link>
-    </Compile>
-    <Compile Include="..\WebServer.Sample\ControllerTest.cs">
-      <Link>ControllerTest.cs</Link>
-    </Compile>
-    <Compile Include="..\WebServer.Sample\Program.cs">
-      <Link>Program.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\favicon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.WebServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.WebServer.FileSystem.1.2.147\lib\nanoFramework.WebServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=1.1.87.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.FileSystem.1.1.87\lib\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Server.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/packages.config b/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/packages.config
deleted file mode 100644
index 20d12f461..000000000
--- a/samples/Webserver/WebServer.Sample/WebServer.Sample.FileSystem/packages.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.FileSystem" version="1.1.87" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Server" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.WebServer.FileSystem" version="1.2.147" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Webserver/WebServer.Sample/WebServer.Sample.sln b/samples/Webserver/WebServer.Sample/WebServer.Sample.sln
index 57759ff52..7e267a2d3 100644
--- a/samples/Webserver/WebServer.Sample/WebServer.Sample.sln
+++ b/samples/Webserver/WebServer.Sample/WebServer.Sample.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33627.172
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "WebServer.Sample", "WebServer.Sample\WebServer.Sample.nfproj", "{F8E6E498-9D0D-4941-8B10-0882642F88BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebServer.Sample", "WebServer.Sample\WebServer.Sample.csproj", "{F8E6E498-9D0D-4941-8B10-0882642F88BA}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "WebServer.Sample.FileSystem", "WebServer.Sample.FileSystem\WebServer.Sample.FileSystem.nfproj", "{129CD942-C541-4E30-A605-9AB688E92800}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebServer.Sample.FileSystem", "WebServer.Sample.FileSystem\WebServer.Sample.FileSystem.csproj", "{129CD942-C541-4E30-A605-9AB688E92800}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/Webserver/WebServer.Sample/WebServer.Sample/Properties/AssemblyInfo.cs b/samples/Webserver/WebServer.Sample/WebServer.Sample/Properties/AssemblyInfo.cs
deleted file mode 100644
index 262254df7..000000000
--- a/samples/Webserver/WebServer.Sample/WebServer.Sample/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSharp.BlankApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSharp.BlankApplication")]
-[assembly: AssemblyCopyright("Copyright © ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Webserver/WebServer.Sample/WebServer.Sample/WebServer.Sample.csproj b/samples/Webserver/WebServer.Sample/WebServer.Sample/WebServer.Sample.csproj
new file mode 100644
index 000000000..8ccec4bf0
--- /dev/null
+++ b/samples/Webserver/WebServer.Sample/WebServer.Sample/WebServer.Sample.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WebServer.Sample</RootNamespace>
+    <AssemblyName>WebServer.Sample</AssemblyName>
+    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Server" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+    <PackageReference Include="nanoFramework.WebServer" Version="1.2.147" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Webserver/WebServer.Sample/WebServer.Sample/WebServer.Sample.nfproj b/samples/Webserver/WebServer.Sample/WebServer.Sample/WebServer.Sample.nfproj
deleted file mode 100644
index 499823851..000000000
--- a/samples/Webserver/WebServer.Sample/WebServer.Sample/WebServer.Sample.nfproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>f8e6e498-9d0d-4941-8b10-0882642f88ba</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>WebServer.Sample</RootNamespace>
-    <AssemblyName>WebServer.Sample</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);HAS_WIFI;</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="ControllerAuth.cs" />
-    <Compile Include="ControllerPerson.cs" />
-    <Compile Include="ControllerTest.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\favicon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.WebServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.WebServer.1.2.147\lib\nanoFramework.WebServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.Http.Server.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Webserver/WebServer.Sample/WebServer.Sample/packages.config b/samples/Webserver/WebServer.Sample/WebServer.Sample/packages.config
deleted file mode 100644
index aca973f51..000000000
--- a/samples/Webserver/WebServer.Sample/WebServer.Sample/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Server" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.WebServer" version="1.2.147" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/WiFiAP/Properties/AssemblyInfo.cs b/samples/WiFiAP/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7f7f500ea..000000000
--- a/samples/WiFiAP/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Soft AP sample ")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("nanoFramework")]
-[assembly: AssemblyCopyright("Copyright ©2019 nanoFramework ")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/WiFiAP/WiFiAP.nfproj b/samples/WiFiAP/WiFiAP.nfproj
deleted file mode 100644
index 3d756df96..000000000
--- a/samples/WiFiAP/WiFiAP.nfproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>275e5f0e-3692-4ce2-bcf0-76857914f866</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>WifiAP</RootNamespace>
-    <AssemblyName>WifiAP</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="WirelessAP.cs" />
-    <Compile Include="WebServer.cs" />
-    <Compile Include="Wireless80211.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\Images\favicon.png" />
-    <None Include="Resources\favicon.ico.bmp" />
-    <Content Include="Resources\Html\main.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Iot.Device.DhcpServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Iot.Device.DhcpServer.1.2.951\lib\Iot.Device.DhcpServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.ResourceManager, Version=1.2.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.ResourceManager.1.2.32\lib\nanoFramework.ResourceManager.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Gpio, Version=1.1.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Gpio.1.1.57\lib\System.Device.Gpio.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=1.5.207.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Net.Http.Server.1.5.207\lib\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/WiFiAP/WiFiAP.sln b/samples/WiFiAP/WiFiAP.sln
index 3349710db..7856aa9be 100644
--- a/samples/WiFiAP/WiFiAP.sln
+++ b/samples/WiFiAP/WiFiAP.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.421
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "WifiAP", "WifiAP.nfproj", "{275E5F0E-3692-4CE2-BCF0-76857914F866}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WifiAP", "WifiAP.csproj", "{275E5F0E-3692-4CE2-BCF0-76857914F866}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/WiFiAP/WifiAP.csproj b/samples/WiFiAP/WifiAP.csproj
new file mode 100644
index 000000000..a3de6f817
--- /dev/null
+++ b/samples/WiFiAP/WifiAP.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WifiAP</RootNamespace>
+    <AssemblyName>WifiAP</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Iot.Device.DhcpServer" Version="1.2.951" />
+    <PackageReference Include="nanoFramework.ResourceManager" Version="1.2.32" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.Runtime.Native" Version="1.7.11" />
+    <PackageReference Include="nanoFramework.System.Collections" Version="1.5.67" />
+    <PackageReference Include="nanoFramework.System.Device.Gpio" Version="1.1.57" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Net.Http.Server" Version="1.5.207" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/WiFiAP/packages.config b/samples/WiFiAP/packages.config
deleted file mode 100644
index d51a1533b..000000000
--- a/samples/WiFiAP/packages.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Iot.Device.DhcpServer" version="1.2.951" targetFramework="netnano1.0" />
-  <package id="nanoFramework.ResourceManager" version="1.2.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Gpio" version="1.1.57" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net.Http.Server" version="1.5.207" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Wifi/ScanWiFi/Properties/AssemblyInfo.cs b/samples/Wifi/ScanWiFi/Properties/AssemblyInfo.cs
deleted file mode 100644
index 653f53ba2..000000000
--- a/samples/Wifi/ScanWiFi/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ScanWifi")]
-[assembly: AssemblyDescription("Sample Wifi scaanner using Windows.Device.Wifi")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ScanWifi sample")]
-[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Wifi/ScanWiFi/ScanWiFi.nfproj b/samples/Wifi/ScanWiFi/ScanWiFi.nfproj
deleted file mode 100644
index 11ec99188..000000000
--- a/samples/Wifi/ScanWiFi/ScanWiFi.nfproj
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>330d0350-433f-4a60-b545-2911379ddeb7</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>ScanWifi</RootNamespace>
-    <AssemblyName>ScanWifi</AssemblyName>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Device.Wifi, Version=1.5.144.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Device.Wifi.1.5.144\lib\System.Device.Wifi.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net, Version=1.11.52.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.1.11.52\lib\System.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
-  <ProjectExtensions>
-    <ProjectCapabilities>
-      <ProjectConfigurationsDeclaredAsItems />
-    </ProjectCapabilities>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/samples/Wifi/ScanWiFi/ScanWifi.csproj b/samples/Wifi/ScanWiFi/ScanWifi.csproj
new file mode 100644
index 000000000..ad3f46126
--- /dev/null
+++ b/samples/Wifi/ScanWiFi/ScanWifi.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="nanoFramework.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netnano1.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ScanWifi</RootNamespace>
+    <AssemblyName>ScanWifi</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nanoFramework.CoreLibrary" Version="1.17.11" />
+    <PackageReference Include="nanoFramework.Runtime.Events" Version="1.11.32" />
+    <PackageReference Include="nanoFramework.System.Device.Wifi" Version="1.5.144" />
+    <PackageReference Include="nanoFramework.System.IO.Streams" Version="1.1.96" />
+    <PackageReference Include="nanoFramework.System.Net" Version="1.11.52" />
+    <PackageReference Include="nanoFramework.System.Text" Version="1.3.42" />
+    <PackageReference Include="nanoFramework.System.Threading" Version="1.1.52" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Wifi/ScanWiFi/packages.config b/samples/Wifi/ScanWiFi/packages.config
deleted file mode 100644
index 925d727e6..000000000
--- a/samples/Wifi/ScanWiFi/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Device.Wifi" version="1.5.144" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="1.11.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
-</packages>
\ No newline at end of file
diff --git a/samples/Wifi/Wifi.sln b/samples/Wifi/Wifi.sln
index a8d048235..ca0b5f0b7 100644
--- a/samples/Wifi/Wifi.sln
+++ b/samples/Wifi/Wifi.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33103.184
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "ScanWifi", "ScanWifi\ScanWifi.nfproj", "{330D0350-433F-4A60-B545-2911379DDEB7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScanWifi", "ScanWifi\ScanWifi.csproj", "{330D0350-433F-4A60-B545-2911379DDEB7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution