diff --git a/Borepin.sln b/Borepin.sln
index 922d82c..11e47e5 100644
--- a/Borepin.sln
+++ b/Borepin.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.32002.261
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33122.133
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Borepin.UWP", "Borepin\Borepin.UWP\Borepin.UWP.csproj", "{664AA356-2920-4353-A80A-B89128011381}"
 EndProject
@@ -11,10 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Borepin.iOS", "Borepin\Bore
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin", "Borepin\Borepin\Borepin.csproj", "{F93856BD-0C8D-4469-A8DB-6E513002BFD7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Borepin.GTK", "Borepin\Borepin.GTK\Borepin.GTK.csproj", "{61D956D2-5819-4736-BBD8-AD8208DE6A62}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Borepin.macOS", "Borepin\Borepin.macOS\Borepin.macOS.csproj", "{3EC23FE7-395E-4BBC-B56B-9455354BDA34}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FabAccessAPI", "FabAccessAPI\FabAccessAPI.csproj", "{3251FCE9-FEA3-4662-8BEB-636BE6732D48}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "S22.Sasl", "external\SASL\S22.Sasl.csproj", "{7FEC3D5E-C240-41B6-BBFA-895C4F4D45CA}"
@@ -194,54 +190,6 @@ Global
 		{F93856BD-0C8D-4469-A8DB-6E513002BFD7}.Release|x86.ActiveCfg = Release|Any CPU
 		{F93856BD-0C8D-4469-A8DB-6E513002BFD7}.Release|x86.Build.0 = Release|Any CPU
 		{F93856BD-0C8D-4469-A8DB-6E513002BFD7}.Release|x86.Deploy.0 = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|ARM.Build.0 = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x64.Build.0 = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x86.Build.0 = Debug|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|ARM.ActiveCfg = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|ARM.Build.0 = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhone.Build.0 = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x64.ActiveCfg = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x64.Build.0 = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x86.ActiveCfg = Release|Any CPU
-		{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x86.Build.0 = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|ARM.Build.0 = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|x64.Build.0 = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|x86.Build.0 = Debug|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|ARM.ActiveCfg = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|ARM.Build.0 = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|iPhone.Build.0 = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|x64.ActiveCfg = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|x64.Build.0 = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|x86.ActiveCfg = Release|Any CPU
-		{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|x86.Build.0 = Release|Any CPU
 		{3251FCE9-FEA3-4662-8BEB-636BE6732D48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3251FCE9-FEA3-4662-8BEB-636BE6732D48}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3251FCE9-FEA3-4662-8BEB-636BE6732D48}.Debug|ARM.ActiveCfg = Debug|Any CPU
diff --git a/Borepin/Borepin.UWP/Borepin.UWP.csproj b/Borepin/Borepin.UWP/Borepin.UWP.csproj
index aa6495f..52680ed 100644
--- a/Borepin/Borepin.UWP/Borepin.UWP.csproj
+++ b/Borepin/Borepin.UWP/Borepin.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Borepin.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
diff --git a/Borepin_Test/Borepin_Test.csproj b/Borepin_Test/Borepin_Test.csproj
index ac9636d..eb5930a 100644
--- a/Borepin_Test/Borepin_Test.csproj
+++ b/Borepin_Test/Borepin_Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/FabAccessAPI_Test/FabAccessAPI_Test.csproj b/FabAccessAPI_Test/FabAccessAPI_Test.csproj
index 2dc8931..5e16fe7 100644
--- a/FabAccessAPI_Test/FabAccessAPI_Test.csproj
+++ b/FabAccessAPI_Test/FabAccessAPI_Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>