diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fa36a065ff..4123b45662 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -73,7 +73,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
+        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.9 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
         shell: bash
 
       - name: Create Jars
@@ -117,8 +117,8 @@ jobs:
           fetch-depth: '1'
           submodules: 'true'
 
-      - name: Pre compile templates
-        run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030" src\net\JNetTemplates.sln
+      - name: Pre compile tests and templates
+        run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030" tests\net\JNetTest.sln
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030" src\net\JNet\JNet.csproj
@@ -136,7 +136,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
+        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.9 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
         shell: bash
 
       - name: Create Jars
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4614f7895f..ed26cde4bb 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -77,16 +77,6 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Install .NET SDKs
-    - name: Setup .NET Core 3.1
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 3.1.x
-    - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 6.0.x
-
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
@@ -118,7 +108,7 @@ jobs:
 
     - name: Maven preparation (step 2)
       if: matrix.language == 'java' 
-      run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
+      run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.9 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
       shell: bash
 
     - if: matrix.language == 'java' 
diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml
index 0409300f38..8e2a27ca63 100644
--- a/.github/workflows/pullrequest.yaml
+++ b/.github/workflows/pullrequest.yaml
@@ -66,7 +66,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
+        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.9 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
         shell: bash
 
       - name: Create Jars
@@ -98,8 +98,8 @@ jobs:
           fetch-depth: '1'
           submodules: 'true'
 
-      - name: Pre compile templates
-        run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030" src\net\JNetTemplates.sln
+      - name: Pre compile tests and templates
+        run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030" tests\net\JNetTest.sln
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030" src\net\JNet\JNet.csproj
@@ -117,7 +117,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
+        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.9 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
         shell: bash
 
       - name: Create Jars
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 729e84ecb0..b860b9a9ee 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -37,7 +37,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
+        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.9 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
         shell: bash
 
       - name: Create Jars
@@ -102,7 +102,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
+        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.9 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
         shell: bash
 
       - name: Create Jars
diff --git a/src/jvm/jnet/pom.xml b/src/jvm/jnet/pom.xml
index 40960636c5..2967342679 100644
--- a/src/jvm/jnet/pom.xml
+++ b/src/jvm/jnet/pom.xml
@@ -41,7 +41,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <classpathfile>${basedir}/classpathfile.classpath</classpathfile>
 		<jnetversion>2.1.0.0</jnetversion>
-		<jcobridgeversion>2.5.8</jcobridgeversion>
+		<jcobridgeversion>2.5.9</jcobridgeversion>
     </properties>
     <distributionManagement>
         <snapshotRepository>
diff --git a/src/net/Common/Common.props b/src/net/Common/Common.props
index b447623642..a225ec6c56 100644
--- a/src/net/Common/Common.props
+++ b/src/net/Common/Common.props
@@ -21,7 +21,7 @@
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(JNET_DOCKER_BUILD_ACTIONS)' != 'true'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net462;net6.0;net7.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(JNET_DOCKER_BUILD_ACTIONS)' == 'true'">
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
@@ -35,7 +35,7 @@
 		<None Include="..\Common\JNet.snk" Link="JNet.snk" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0"/>
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0"/>
 		<Reference Include="Microsoft.CSharp" />
 	</ItemGroup>
 	<!-- Fix start https://github.com/dotnet/sourcelink/issues/572 -->
diff --git a/src/net/JNet/JNet.csproj b/src/net/JNet/JNet.csproj
index 11e2bf74c2..fb651e8c38 100644
--- a/src/net/JNet/JNet.csproj
+++ b/src/net/JNet/JNet.csproj
@@ -24,11 +24,11 @@
     <None Remove="Generated\Java\Util\Function\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MASES.CLIParser" Version="3.1.2" />
-    <PackageReference Include="MASES.JCOBridge" Version="2.5.8">
+    <PackageReference Include="MASES.CLIParser" Version="3.2.0" />
+    <PackageReference Include="MASES.JCOBridge" Version="2.5.9">
       <IncludeAssets>All</IncludeAssets>
       <PrivateAssets>None</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/net/JNetCLI/JNetCLI.csproj b/src/net/JNetCLI/JNetCLI.csproj
index 4933cbcc72..3a6189b2f1 100644
--- a/src/net/JNetCLI/JNetCLI.csproj
+++ b/src/net/JNetCLI/JNetCLI.csproj
@@ -20,7 +20,7 @@
 		<IncludeAssets>All</IncludeAssets>
         <PrivateAssets>None</PrivateAssets>
     </ProjectReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.7.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/net/JNetPSCore/JNetPSCore.csproj b/src/net/JNetPSCore/JNetPSCore.csproj
index 7a5ff60109..8fa2fd5c8c 100644
--- a/src/net/JNetPSCore/JNetPSCore.csproj
+++ b/src/net/JNetPSCore/JNetPSCore.csproj
@@ -21,6 +21,6 @@
 		<PackageReference Include="PowerShellStandard.Library" Version="5.1.1">
 			<PrivateAssets>All</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
 	</ItemGroup>
 </Project>
diff --git a/src/net/JNetReflector/JNetReflector.csproj b/src/net/JNetReflector/JNetReflector.csproj
index 6e657aa88e..337984dba2 100644
--- a/src/net/JNetReflector/JNetReflector.csproj
+++ b/src/net/JNetReflector/JNetReflector.csproj
@@ -147,12 +147,12 @@
     <EmbeddedResource Include="Templates\AllPackageClasses.template" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MASES.CLIParser" Version="3.1.2" />
-	<PackageReference Include="MASES.JCOBridge" Version="2.5.8">
+    <PackageReference Include="MASES.CLIParser" Version="3.2.0" />
+	<PackageReference Include="MASES.JCOBridge" Version="2.5.9">
 		<IncludeAssets>All</IncludeAssets>
 		<PrivateAssets>None</PrivateAssets>
 	</PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Java\Lang\Annotation\" />
diff --git a/src/net/JNetTemplates.sln b/src/net/JNetTemplates.sln
deleted file mode 100644
index 5746f4e1b4..0000000000
--- a/src/net/JNetTemplates.sln
+++ /dev/null
@@ -1,53 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32014.148
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNet", "JNet\JNet.csproj", "{E3614C53-869D-4E9E-B03B-231E270BD782}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jnetApp", "templates\templates\jnetApp\jnetApp.csproj", "{72B4B72F-87E2-41D5-81A4-F694DD94DA6F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jcobridgeConsoleApp", "templates\templates\jcobridgeConsoleApp\jcobridgeConsoleApp.csproj", "{3B1B8CD2-B966-4975-8895-5B93B0DBC717}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{16E78E90-7D24-4043-8258-8DF9C68B6BA6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{B1512319-991C-4654-8490-2E770C2CFF54}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jnetAWTApp", "templates\templates\jnetAWTApp\jnetAWTApp.csproj", "{2A9477CF-DE5B-4C4A-9AB1-C112FC4722EA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E3614C53-869D-4E9E-B03B-231E270BD782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3614C53-869D-4E9E-B03B-231E270BD782}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3614C53-869D-4E9E-B03B-231E270BD782}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3614C53-869D-4E9E-B03B-231E270BD782}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72B4B72F-87E2-41D5-81A4-F694DD94DA6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72B4B72F-87E2-41D5-81A4-F694DD94DA6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72B4B72F-87E2-41D5-81A4-F694DD94DA6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72B4B72F-87E2-41D5-81A4-F694DD94DA6F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B1B8CD2-B966-4975-8895-5B93B0DBC717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B1B8CD2-B966-4975-8895-5B93B0DBC717}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B1B8CD2-B966-4975-8895-5B93B0DBC717}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B1B8CD2-B966-4975-8895-5B93B0DBC717}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A9477CF-DE5B-4C4A-9AB1-C112FC4722EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A9477CF-DE5B-4C4A-9AB1-C112FC4722EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A9477CF-DE5B-4C4A-9AB1-C112FC4722EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A9477CF-DE5B-4C4A-9AB1-C112FC4722EA}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E3614C53-869D-4E9E-B03B-231E270BD782} = {B1512319-991C-4654-8490-2E770C2CFF54}
-		{72B4B72F-87E2-41D5-81A4-F694DD94DA6F} = {16E78E90-7D24-4043-8258-8DF9C68B6BA6}
-		{3B1B8CD2-B966-4975-8895-5B93B0DBC717} = {16E78E90-7D24-4043-8258-8DF9C68B6BA6}
-		{2A9477CF-DE5B-4C4A-9AB1-C112FC4722EA} = {16E78E90-7D24-4043-8258-8DF9C68B6BA6}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {337100A8-DBCD-4838-B9C7-74EC0DE78755}
-	EndGlobalSection
-EndGlobal
diff --git a/src/net/templates/templatepack.csproj b/src/net/templates/templatepack.csproj
index 51b93ae0f4..deb9204cea 100644
--- a/src/net/templates/templatepack.csproj
+++ b/src/net/templates/templatepack.csproj
@@ -23,6 +23,6 @@
     <Compile Remove="**\*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/net/templates/templates/jcobridgeConsoleApp/jcobridgeConsoleApp.csproj b/src/net/templates/templates/jcobridgeConsoleApp/jcobridgeConsoleApp.csproj
index 80f4e870ab..cc65b0009e 100644
--- a/src/net/templates/templates/jcobridgeConsoleApp/jcobridgeConsoleApp.csproj
+++ b/src/net/templates/templates/jcobridgeConsoleApp/jcobridgeConsoleApp.csproj
@@ -7,6 +7,6 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MASES.JCOBridge" Version="2.5.8" IncludeAssets="All" PrivateAssets="None" />
+    <PackageReference Include="MASES.JCOBridge" Version="2.5.9" IncludeAssets="All" PrivateAssets="None" />
   </ItemGroup>
 </Project>
diff --git a/src/net/templates/templates/jnetAWTApp/jnetAWTApp.csproj b/src/net/templates/templates/jnetAWTApp/jnetAWTApp.csproj
index 8e29ca9167..8ac306d08c 100644
--- a/src/net/templates/templates/jnetAWTApp/jnetAWTApp.csproj
+++ b/src/net/templates/templates/jnetAWTApp/jnetAWTApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net462;net6.0;net7.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
 		<Reference Include="Microsoft.CSharp" />
diff --git a/src/net/templates/templates/jnetApp/jnetApp.csproj b/src/net/templates/templates/jnetApp/jnetApp.csproj
index 008836a09b..dc4957fa37 100644
--- a/src/net/templates/templates/jnetApp/jnetApp.csproj
+++ b/src/net/templates/templates/jnetApp/jnetApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="Microsoft.CSharp" />
diff --git a/tests/net/JNetTest.sln b/tests/net/JNetTest.sln
index 8759160efb..38b1186800 100644
--- a/tests/net/JNetTest.sln
+++ b/tests/net/JNetTest.sln
@@ -13,6 +13,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNet", "..\..\src\net\JNet\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNetReflectorGenerated", "JNetReflectorGenerated\JNetReflectorGenerated.csproj", "{D417C2E0-E317-4547-969F-1C21E031478A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{1BF0B566-4513-405A-BF67-76E826EA6DA0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{D622CE4D-8CE5-486A-9AAE-97AC093122C7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jcobridgeConsoleApp", "..\..\src\net\templates\templates\jcobridgeConsoleApp\jcobridgeConsoleApp.csproj", "{6F8234A7-1336-49D9-A68A-3327DFBDFCDD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jnetApp", "..\..\src\net\templates\templates\jnetApp\jnetApp.csproj", "{17DC32BC-9C75-4846-B08D-D90241B71436}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jnetAWTApp", "..\..\src\net\templates\templates\jnetAWTApp\jnetAWTApp.csproj", "{BD61B857-1919-4546-8B87-3F525BF269F1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{360FAD84-7744-4B18-8624-1B5AE07534F6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,10 +51,32 @@ Global
 		{D417C2E0-E317-4547-969F-1C21E031478A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D417C2E0-E317-4547-969F-1C21E031478A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D417C2E0-E317-4547-969F-1C21E031478A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F8234A7-1336-49D9-A68A-3327DFBDFCDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F8234A7-1336-49D9-A68A-3327DFBDFCDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F8234A7-1336-49D9-A68A-3327DFBDFCDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F8234A7-1336-49D9-A68A-3327DFBDFCDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17DC32BC-9C75-4846-B08D-D90241B71436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17DC32BC-9C75-4846-B08D-D90241B71436}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17DC32BC-9C75-4846-B08D-D90241B71436}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17DC32BC-9C75-4846-B08D-D90241B71436}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD61B857-1919-4546-8B87-3F525BF269F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD61B857-1919-4546-8B87-3F525BF269F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD61B857-1919-4546-8B87-3F525BF269F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD61B857-1919-4546-8B87-3F525BF269F1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{F3A53651-9728-427B-A429-7B3F1B6C8DA0} = {360FAD84-7744-4B18-8624-1B5AE07534F6}
+		{C34F594A-16F6-4BF1-A11B-5C92CD618DD2} = {360FAD84-7744-4B18-8624-1B5AE07534F6}
+		{94523BE2-B9F9-403E-B93B-AE1AED3256D3} = {360FAD84-7744-4B18-8624-1B5AE07534F6}
+		{EC444991-FDF7-4521-AED6-6BE32EAF8542} = {1BF0B566-4513-405A-BF67-76E826EA6DA0}
+		{D417C2E0-E317-4547-969F-1C21E031478A} = {360FAD84-7744-4B18-8624-1B5AE07534F6}
+		{6F8234A7-1336-49D9-A68A-3327DFBDFCDD} = {D622CE4D-8CE5-486A-9AAE-97AC093122C7}
+		{17DC32BC-9C75-4846-B08D-D90241B71436} = {D622CE4D-8CE5-486A-9AAE-97AC093122C7}
+		{BD61B857-1919-4546-8B87-3F525BF269F1} = {D622CE4D-8CE5-486A-9AAE-97AC093122C7}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0A7C16DC-1BAA-44BC-AA1C-D40B7B61878E}
 	EndGlobalSection