From 3e190641a040dc1f896a4b002824bb6f9cb851b7 Mon Sep 17 00:00:00 2001
From: Matt Mo <matt@montoyatech.com>
Date: Thu, 21 Jul 2022 09:56:23 -0700
Subject: [PATCH] Upgraded project to DotNet 6, increased package version to
 1.1.0

---
 Rest.Net.Example/App.config                 |  6 --
 Rest.Net.Example/Properties/AssemblyInfo.cs | 36 ------------
 Rest.Net.Example/Rest.Net.Example.csproj    | 62 +++------------------
 Rest.Net.Tests/Rest.Net.Tests.csproj        |  5 +-
 Rest.Net/Rest.Net.csproj                    | 23 +++-----
 Rest.Net/RouteListener.cs                   |  9 +--
 6 files changed, 24 insertions(+), 117 deletions(-)
 delete mode 100644 Rest.Net.Example/App.config
 delete mode 100644 Rest.Net.Example/Properties/AssemblyInfo.cs

diff --git a/Rest.Net.Example/App.config b/Rest.Net.Example/App.config
deleted file mode 100644
index 56efbc7..0000000
--- a/Rest.Net.Example/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/Rest.Net.Example/Properties/AssemblyInfo.cs b/Rest.Net.Example/Properties/AssemblyInfo.cs
deleted file mode 100644
index 9d6daa1..0000000
--- a/Rest.Net.Example/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +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("Rest.Net.Example")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Rest.Net.Example")]
-[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)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("d476199d-526a-4831-866f-790676f8bc37")]
-
-// 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/Rest.Net.Example/Rest.Net.Example.csproj b/Rest.Net.Example/Rest.Net.Example.csproj
index a650230..96f1275 100644
--- a/Rest.Net.Example/Rest.Net.Example.csproj
+++ b/Rest.Net.Example/Rest.Net.Example.csproj
@@ -1,59 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D476199D-526A-4831-866F-790676F8BC37}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>MontoyaTech.Rest.Net.Example</RootNamespace>
+    <OutputType>exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>disable</Nullable>
     <AssemblyName>MontoyaTech.Rest.Net.Example</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\Rest.Net\Rest.Net.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Rest.Net\Rest.Net\Rest.Net.csproj">
-      <Project>{03d4578f-3239-4b12-88bb-5d877c2609d6}</Project>
-      <Name>Rest.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Rest.Net.Tests/Rest.Net.Tests.csproj b/Rest.Net.Tests/Rest.Net.Tests.csproj
index b5624ef..65a0920 100644
--- a/Rest.Net.Tests/Rest.Net.Tests.csproj
+++ b/Rest.Net.Tests/Rest.Net.Tests.csproj
@@ -2,10 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
     <IsPackable>false</IsPackable>
-
     <AssemblyName>MontoyaTech.Rest.Net.Tests</AssemblyName>
   </PropertyGroup>
 
diff --git a/Rest.Net/Rest.Net.csproj b/Rest.Net/Rest.Net.csproj
index 595afa5..6b5df79 100644
--- a/Rest.Net/Rest.Net.csproj
+++ b/Rest.Net/Rest.Net.csproj
@@ -1,7 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>disable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>MontoyaTech</Authors>
     <Company>MontoyaTech</Company>
@@ -14,22 +17,12 @@
     <AssemblyName>MontoyaTech.Rest.Net</AssemblyName>
     <RootNamespace>MontoyaTech.Rest.Net</RootNamespace>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <Version>1.0.9</Version>
+    <Version>1.1.0</Version>
     <PackageReleaseNotes>Optimized and fixed bugs within the route matcher. Changed argument matching to support segments after the argument for more complex routes.</PackageReleaseNotes>
   </PropertyGroup>
+
   <ItemGroup>
-   <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/Rest.Net/RouteListener.cs b/Rest.Net/RouteListener.cs
index af818e2..d060a77 100644
--- a/Rest.Net/RouteListener.cs
+++ b/Rest.Net/RouteListener.cs
@@ -101,9 +101,10 @@ namespace MontoyaTech.Rest.Net
         {
             ThreadPool.QueueUserWorkItem((o) =>
             {
-                try
+                while (this.HttpListener.IsListening)
                 {
-                    while (this.HttpListener.IsListening)
+                    //Try catch around the thread pool, don't allow it to die.
+                    try
                     {
                         ThreadPool.QueueUserWorkItem((item) =>
                         {
@@ -137,7 +138,7 @@ namespace MontoyaTech.Rest.Net
                                         {
                                             this.Routes[i].Invoke(context, arguments);
                                         }
-                                        catch 
+                                        catch
                                         {
                                             ctx.Response.WithStatus(HttpStatusCode.InternalServerError);
                                         }
@@ -167,8 +168,8 @@ namespace MontoyaTech.Rest.Net
                             }
                         }, this.HttpListener.GetContext());
                     }
+                    catch { }
                 }
-                catch { }
             });
         }