diff --git a/.gitignore b/.gitignore
index 4f8bdf3..092033d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -297,4 +297,6 @@ __pycache__/
 *.odx.cs
 *.xsd.cs
 
-# End of https://www.gitignore.io/api/csharp
\ No newline at end of file
+# End of https://www.gitignore.io/api/csharp
+AnalysisReport.sarif
+upgrade-assistant.clef
diff --git a/BuildAndRunAllTests.bat b/BuildAndRunAllTests.bat
index 4e8b23b..f9d050d 100644
--- a/BuildAndRunAllTests.bat
+++ b/BuildAndRunAllTests.bat
@@ -1,9 +1,9 @@
 pushd .
 cd "src\TinyOSCore"
-dotnet build -c DEBUG
-copy "..\..\Sample Programs\*" bin\Debug
+dotnet publish -r win-x64 --self-contained -p:PublishSingleFile=true -p:SuppressTrimAnalysisWarnings=true -p:EnableCompressionInSingleFile=true
+copy "..\..\Sample Programs\*" bin\Debug\net6.0\win-x64\publish
 pushd .
-cd bin\Debug
+cd bin\Debug\net6.0\win-x64\publish
 call testAll.bat
 popd
 popd
diff --git a/BuildAndRunAllTests.sh b/BuildAndRunAllTests.sh
index cfa7fa0..05f8cbc 100755
--- a/BuildAndRunAllTests.sh
+++ b/BuildAndRunAllTests.sh
@@ -2,10 +2,10 @@
 set -v
 pushd .
 cd src/TinyOSCore
-dotnet build -c Debug                              
-cp ../../Sample\ Programs/* bin/Debug/                       
+dotnet publish -r linux-x64 --self-contained -p:PublishSingleFile=true -p:SuppressTrimAnalysisWarnings=true -p:EnableCompressionInSingleFile=true
+cp ../../Sample\ Programs/* bin/Debug/net6.0/linux-x64/publish                    
 pushd .                                                     
-cd bin/Debug/                                                
+cd bin/Debug/net6.0/linux-x64/publish
 ./testAll.sh                                            
 popd                                                        
 popd
diff --git a/Sample Programs/readme.txt b/Sample Programs/readme.txt
index 0d754c9..fb2869a 100644
--- a/Sample Programs/readme.txt	
+++ b/Sample Programs/readme.txt	
@@ -1,6 +1,6 @@
 Sample Programs
 -----------------
-* I usually keep these in the ..\bin dir for ease of execution
+* I usually keep these in the ..\bin\Debug\net6.0 dir for ease of execution
 
 * If you want to debug in VS.NET go to the Properties Dialog of the current Project.  Go to "Configuration Properties|Debugging" under Command Line Arguments and add the same args you'd add on the command line.  
 
diff --git a/Sample Programs/testAllocAndFree.bat b/Sample Programs/testAllocAndFree.bat
index 46d0d3c..ea37ca1 100755
--- a/Sample Programs/testAllocAndFree.bat	
+++ b/Sample Programs/testAllocAndFree.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 512 scott13.txt  
\ No newline at end of file
+TinyOSCore.exe 512 scott13.txt  
\ No newline at end of file
diff --git a/Sample Programs/testCalls.bat b/Sample Programs/testCalls.bat
index 4863755..802601f 100755
--- a/Sample Programs/testCalls.bat	
+++ b/Sample Programs/testCalls.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 512 scott6.txt
+TinyOSCore.exe 512 scott6.txt
diff --git a/Sample Programs/testEvents.bat b/Sample Programs/testEvents.bat
index 83e43df..28474db 100755
--- a/Sample Programs/testEvents.bat	
+++ b/Sample Programs/testEvents.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 1024 scott9.txt scott10.txt
\ No newline at end of file
+TinyOSCore.exe 1024 scott9.txt scott10.txt
\ No newline at end of file
diff --git a/Sample Programs/testJumps.bat b/Sample Programs/testJumps.bat
index ca09bc9..62a576b 100755
--- a/Sample Programs/testJumps.bat	
+++ b/Sample Programs/testJumps.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 512 scott5.txt
+TinyOSCore.exe 512 scott5.txt
diff --git a/Sample Programs/testLocks.bat b/Sample Programs/testLocks.bat
index 8a2cb52..6636ea6 100755
--- a/Sample Programs/testLocks.bat	
+++ b/Sample Programs/testLocks.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 1568 scott8.txt scott8.txt scott8.txt
\ No newline at end of file
+TinyOSCore.exe 1568 scott8.txt scott8.txt scott8.txt
\ No newline at end of file
diff --git a/Sample Programs/testMemoryProtection.bat b/Sample Programs/testMemoryProtection.bat
index d04974a..dbde0a8 100755
--- a/Sample Programs/testMemoryProtection.bat	
+++ b/Sample Programs/testMemoryProtection.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 512 scott4.txt
+TinyOSCore.exe 512 scott4.txt
diff --git a/Sample Programs/testMulti.bat b/Sample Programs/testMulti.bat
index 03c8652..f7d2932 100755
--- a/Sample Programs/testMulti.bat	
+++ b/Sample Programs/testMulti.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 5760 scott1.txt scott2.txt scott3.txt scott4.txt scott5.txt scott6.txt scott7.txt scott8.txt scott11.txt scott13.txt
\ No newline at end of file
+TinyOSCore.exe 5760 scott1.txt scott2.txt scott3.txt scott4.txt scott5.txt scott6.txt scott7.txt scott8.txt scott11.txt scott13.txt
\ No newline at end of file
diff --git a/Sample Programs/testMultiSuper.bat b/Sample Programs/testMultiSuper.bat
index 394735f..365c630 100755
--- a/Sample Programs/testMultiSuper.bat	
+++ b/Sample Programs/testMultiSuper.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 7000 scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt 
\ No newline at end of file
+TinyOSCore.exe 7000 scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt scott1.txt scott2.txt 
\ No newline at end of file
diff --git a/Sample Programs/testRegisters.bat b/Sample Programs/testRegisters.bat
index ea4082c..6c167f5 100755
--- a/Sample Programs/testRegisters.bat	
+++ b/Sample Programs/testRegisters.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 1024 scott1.txt scott3.txt
+TinyOSCore.exe 1024 scott1.txt scott3.txt
diff --git a/Sample Programs/testSharedMem.bat b/Sample Programs/testSharedMem.bat
index b1db690..a4ce98e 100755
--- a/Sample Programs/testSharedMem.bat	
+++ b/Sample Programs/testSharedMem.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 1024 scott11.txt scott12.txt
\ No newline at end of file
+TinyOSCore.exe 1024 scott11.txt scott12.txt
\ No newline at end of file
diff --git a/Sample Programs/testStack.bat b/Sample Programs/testStack.bat
index abafa4a..e416da0 100755
--- a/Sample Programs/testStack.bat	
+++ b/Sample Programs/testStack.bat	
@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 512 scott3.txt
+TinyOSCore.exe 512 scott3.txt
diff --git a/src/TinyOSCore/TinyOSCore.csproj b/src/TinyOSCore/TinyOSCore.csproj
index 468162a..adbd30a 100644
--- a/src/TinyOSCore/TinyOSCore.csproj
+++ b/src/TinyOSCore/TinyOSCore.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+	<PublishTrimmed>true</PublishTrimmed>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -17,9 +18,11 @@
   </ItemGroup>
   <ItemGroup>
     <!-- <PackageReference Include="ILLink.Tasks" Version="0.1.4-preview-906439" /> -->
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0-preview2-final" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0-preview2-final" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0-preview2-final" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.256001">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TinyOSCore/publish.bat b/src/TinyOSCore/publish.bat
new file mode 100644
index 0000000..77497fc
--- /dev/null
+++ b/src/TinyOSCore/publish.bat
@@ -0,0 +1 @@
+dotnet publish -r win-x64 --self-contained -p:PublishSingleFile=true -p:SuppressTrimAnalysisWarnings=true -p:EnableCompressionInSingleFile=true
\ No newline at end of file