Upgraded to .NET 6

.gitignore

@@ -297,4 +297,6 @@ __pycache__/
 *.odx.cs
 *.xsd.cs
 
-# End of https://www.gitignore.io/api/csharp
+# End of https://www.gitignore.io/api/csharp
+AnalysisReport.sarif
+upgrade-assistant.clef

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

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

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.  
 

Sample Programs/testAllocAndFree.bat

@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 512 scott13.txt  
+TinyOSCore.exe 512 scott13.txt  

Sample Programs/testCalls.bat

@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 512 scott6.txt
+TinyOSCore.exe 512 scott6.txt

Sample Programs/testEvents.bat

@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 1024 scott9.txt scott10.txt
+TinyOSCore.exe 1024 scott9.txt scott10.txt

Sample Programs/testJumps.bat

@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 512 scott5.txt
+TinyOSCore.exe 512 scott5.txt

Sample Programs/testLocks.bat

@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 1568 scott8.txt scott8.txt scott8.txt
+TinyOSCore.exe 1568 scott8.txt scott8.txt scott8.txt

Sample Programs/testMemoryProtection.bat

@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 512 scott4.txt
+TinyOSCore.exe 512 scott4.txt

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
+TinyOSCore.exe 5760 scott1.txt scott2.txt scott3.txt scott4.txt scott5.txt scott6.txt scott7.txt scott8.txt scott11.txt scott13.txt

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 
+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 

Sample Programs/testRegisters.bat

@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 1024 scott1.txt scott3.txt
+TinyOSCore.exe 1024 scott1.txt scott3.txt

Sample Programs/testSharedMem.bat

@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 1024 scott11.txt scott12.txt
+TinyOSCore.exe 1024 scott11.txt scott12.txt

Sample Programs/testStack.bat

@@ -1 +1 @@
-dotnet netcoreapp2.0/TinyOSCore.dll 512 scott3.txt
+TinyOSCore.exe 512 scott3.txt

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>

src/TinyOSCore/publish.bat

@@ -0,0 +1 @@
+dotnet publish -r win-x64 --self-contained -p:PublishSingleFile=true -p:SuppressTrimAnalysisWarnings=true -p:EnableCompressionInSingleFile=true