From 37356667d92f65c2bfdf15b8922f92efa3733472 Mon Sep 17 00:00:00 2001
From: MattMo <matt@montoyatech.com>
Date: Thu, 5 May 2022 10:18:28 -0700
Subject: [PATCH] Cleaning up project structure and simplifying things.

---
 .../{Rest.Net.Example => }/App.config         |  0
 .../{Rest.Net.Example => }/Program.cs         |  0
 .../Properties/AssemblyInfo.cs                |  0
 .../Rest.Net.Example.csproj                   |  0
 Rest.Net.Example/Rest.Net.Example.sln         | 25 --------------
 .../Rest.Net.Tests.csproj                     |  0
 Rest.Net.Tests/Rest.Net.Tests.sln             | 25 --------------
 .../{Rest.Net.Tests => }/RouteMatcherTests.cs |  0
 Rest.Net.sln                                  | 22 ++++++------
 .../HttpListenerRequestExtensions.cs          |  0
 .../HttpListenerResponseExtensions.cs         |  0
 .../Extensions/StringExtensions.cs            |  0
 Rest.Net/{Rest.Net => }/HttpRequestMethod.cs  |  0
 Rest.Net/{Rest.Net => }/Rest.Net.csproj       |  0
 Rest.Net/Rest.Net.sln                         | 25 --------------
 Rest.Net/Rest.Net/Rest - Backup.Net.csproj    | 34 -------------------
 Rest.Net/{Rest.Net => }/Route.cs              |  0
 .../{Rest.Net => }/RouteArgumentConverter.cs  |  0
 Rest.Net/{Rest.Net => }/RouteContext.cs       |  0
 Rest.Net/{Rest.Net => }/RouteListener.cs      |  0
 Rest.Net/{Rest.Net => }/RouteMatcher.cs       |  0
 Rest.Net/{Rest.Net => }/RoutePostprocess.cs   |  0
 Rest.Net/{Rest.Net => }/RoutePreprocess.cs    |  0
 23 files changed, 11 insertions(+), 120 deletions(-)
 rename Rest.Net.Example/{Rest.Net.Example => }/App.config (100%)
 rename Rest.Net.Example/{Rest.Net.Example => }/Program.cs (100%)
 rename Rest.Net.Example/{Rest.Net.Example => }/Properties/AssemblyInfo.cs (100%)
 rename Rest.Net.Example/{Rest.Net.Example => }/Rest.Net.Example.csproj (100%)
 delete mode 100644 Rest.Net.Example/Rest.Net.Example.sln
 rename Rest.Net.Tests/{Rest.Net.Tests => }/Rest.Net.Tests.csproj (100%)
 delete mode 100644 Rest.Net.Tests/Rest.Net.Tests.sln
 rename Rest.Net.Tests/{Rest.Net.Tests => }/RouteMatcherTests.cs (100%)
 rename Rest.Net/{Rest.Net => }/Extensions/HttpListenerRequestExtensions.cs (100%)
 rename Rest.Net/{Rest.Net => }/Extensions/HttpListenerResponseExtensions.cs (100%)
 rename Rest.Net/{Rest.Net => }/Extensions/StringExtensions.cs (100%)
 rename Rest.Net/{Rest.Net => }/HttpRequestMethod.cs (100%)
 rename Rest.Net/{Rest.Net => }/Rest.Net.csproj (100%)
 delete mode 100644 Rest.Net/Rest.Net.sln
 delete mode 100644 Rest.Net/Rest.Net/Rest - Backup.Net.csproj
 rename Rest.Net/{Rest.Net => }/Route.cs (100%)
 rename Rest.Net/{Rest.Net => }/RouteArgumentConverter.cs (100%)
 rename Rest.Net/{Rest.Net => }/RouteContext.cs (100%)
 rename Rest.Net/{Rest.Net => }/RouteListener.cs (100%)
 rename Rest.Net/{Rest.Net => }/RouteMatcher.cs (100%)
 rename Rest.Net/{Rest.Net => }/RoutePostprocess.cs (100%)
 rename Rest.Net/{Rest.Net => }/RoutePreprocess.cs (100%)

diff --git a/Rest.Net.Example/Rest.Net.Example/App.config b/Rest.Net.Example/App.config
similarity index 100%
rename from Rest.Net.Example/Rest.Net.Example/App.config
rename to Rest.Net.Example/App.config
diff --git a/Rest.Net.Example/Rest.Net.Example/Program.cs b/Rest.Net.Example/Program.cs
similarity index 100%
rename from Rest.Net.Example/Rest.Net.Example/Program.cs
rename to Rest.Net.Example/Program.cs
diff --git a/Rest.Net.Example/Rest.Net.Example/Properties/AssemblyInfo.cs b/Rest.Net.Example/Properties/AssemblyInfo.cs
similarity index 100%
rename from Rest.Net.Example/Rest.Net.Example/Properties/AssemblyInfo.cs
rename to Rest.Net.Example/Properties/AssemblyInfo.cs
diff --git a/Rest.Net.Example/Rest.Net.Example/Rest.Net.Example.csproj b/Rest.Net.Example/Rest.Net.Example.csproj
similarity index 100%
rename from Rest.Net.Example/Rest.Net.Example/Rest.Net.Example.csproj
rename to Rest.Net.Example/Rest.Net.Example.csproj
diff --git a/Rest.Net.Example/Rest.Net.Example.sln b/Rest.Net.Example/Rest.Net.Example.sln
deleted file mode 100644
index 8d840a1..0000000
--- a/Rest.Net.Example/Rest.Net.Example.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32112.339
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rest.Net.Example", "Rest.Net.Example\Rest.Net.Example.csproj", "{D476199D-526A-4831-866F-790676F8BC37}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D476199D-526A-4831-866F-790676F8BC37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D476199D-526A-4831-866F-790676F8BC37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D476199D-526A-4831-866F-790676F8BC37}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D476199D-526A-4831-866F-790676F8BC37}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {15F2CFE4-AA3C-4D24-BD82-FA12BDA760E6}
-	EndGlobalSection
-EndGlobal
diff --git a/Rest.Net.Tests/Rest.Net.Tests/Rest.Net.Tests.csproj b/Rest.Net.Tests/Rest.Net.Tests.csproj
similarity index 100%
rename from Rest.Net.Tests/Rest.Net.Tests/Rest.Net.Tests.csproj
rename to Rest.Net.Tests/Rest.Net.Tests.csproj
diff --git a/Rest.Net.Tests/Rest.Net.Tests.sln b/Rest.Net.Tests/Rest.Net.Tests.sln
deleted file mode 100644
index 0ab01b1..0000000
--- a/Rest.Net.Tests/Rest.Net.Tests.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32112.339
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rest.Net.Tests", "Rest.Net.Tests\Rest.Net.Tests.csproj", "{729431C7-DA13-4668-9D6A-C785C5AB4064}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{729431C7-DA13-4668-9D6A-C785C5AB4064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{729431C7-DA13-4668-9D6A-C785C5AB4064}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{729431C7-DA13-4668-9D6A-C785C5AB4064}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{729431C7-DA13-4668-9D6A-C785C5AB4064}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0DB589F0-19C2-46AC-9CAB-903F66E22B52}
-	EndGlobalSection
-EndGlobal
diff --git a/Rest.Net.Tests/Rest.Net.Tests/RouteMatcherTests.cs b/Rest.Net.Tests/RouteMatcherTests.cs
similarity index 100%
rename from Rest.Net.Tests/Rest.Net.Tests/RouteMatcherTests.cs
rename to Rest.Net.Tests/RouteMatcherTests.cs
diff --git a/Rest.Net.sln b/Rest.Net.sln
index 2cdab73..9a15590 100644
--- a/Rest.Net.sln
+++ b/Rest.Net.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rest.Net", "Rest.Net\Rest.Net\Rest.Net.csproj", "{03D4578F-3239-4B12-88BB-5D877C2609D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rest.Net", "Rest.Net\Rest.Net.csproj", "{B187FA1E-9BBA-45A2-A587-0DA76B161A2A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rest.Net.Example", "Rest.Net.Example\Rest.Net.Example\Rest.Net.Example.csproj", "{D476199D-526A-4831-866F-790676F8BC37}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rest.Net.Example", "Rest.Net.Example\Rest.Net.Example.csproj", "{D476199D-526A-4831-866F-790676F8BC37}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rest.Net.Tests", "Rest.Net.Tests\Rest.Net.Tests\Rest.Net.Tests.csproj", "{CBA3A43C-3987-433D-9924-3486E9782E2F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rest.Net.Tests", "Rest.Net.Tests\Rest.Net.Tests.csproj", "{C87133A6-7BE8-4843-BA9B-BD05907A2FBD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,18 +15,18 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{03D4578F-3239-4B12-88BB-5D877C2609D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03D4578F-3239-4B12-88BB-5D877C2609D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03D4578F-3239-4B12-88BB-5D877C2609D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03D4578F-3239-4B12-88BB-5D877C2609D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B187FA1E-9BBA-45A2-A587-0DA76B161A2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B187FA1E-9BBA-45A2-A587-0DA76B161A2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B187FA1E-9BBA-45A2-A587-0DA76B161A2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B187FA1E-9BBA-45A2-A587-0DA76B161A2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D476199D-526A-4831-866F-790676F8BC37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D476199D-526A-4831-866F-790676F8BC37}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D476199D-526A-4831-866F-790676F8BC37}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D476199D-526A-4831-866F-790676F8BC37}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBA3A43C-3987-433D-9924-3486E9782E2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBA3A43C-3987-433D-9924-3486E9782E2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBA3A43C-3987-433D-9924-3486E9782E2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBA3A43C-3987-433D-9924-3486E9782E2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C87133A6-7BE8-4843-BA9B-BD05907A2FBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C87133A6-7BE8-4843-BA9B-BD05907A2FBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C87133A6-7BE8-4843-BA9B-BD05907A2FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C87133A6-7BE8-4843-BA9B-BD05907A2FBD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Rest.Net/Rest.Net/Extensions/HttpListenerRequestExtensions.cs b/Rest.Net/Extensions/HttpListenerRequestExtensions.cs
similarity index 100%
rename from Rest.Net/Rest.Net/Extensions/HttpListenerRequestExtensions.cs
rename to Rest.Net/Extensions/HttpListenerRequestExtensions.cs
diff --git a/Rest.Net/Rest.Net/Extensions/HttpListenerResponseExtensions.cs b/Rest.Net/Extensions/HttpListenerResponseExtensions.cs
similarity index 100%
rename from Rest.Net/Rest.Net/Extensions/HttpListenerResponseExtensions.cs
rename to Rest.Net/Extensions/HttpListenerResponseExtensions.cs
diff --git a/Rest.Net/Rest.Net/Extensions/StringExtensions.cs b/Rest.Net/Extensions/StringExtensions.cs
similarity index 100%
rename from Rest.Net/Rest.Net/Extensions/StringExtensions.cs
rename to Rest.Net/Extensions/StringExtensions.cs
diff --git a/Rest.Net/Rest.Net/HttpRequestMethod.cs b/Rest.Net/HttpRequestMethod.cs
similarity index 100%
rename from Rest.Net/Rest.Net/HttpRequestMethod.cs
rename to Rest.Net/HttpRequestMethod.cs
diff --git a/Rest.Net/Rest.Net/Rest.Net.csproj b/Rest.Net/Rest.Net.csproj
similarity index 100%
rename from Rest.Net/Rest.Net/Rest.Net.csproj
rename to Rest.Net/Rest.Net.csproj
diff --git a/Rest.Net/Rest.Net.sln b/Rest.Net/Rest.Net.sln
deleted file mode 100644
index 022102b..0000000
--- a/Rest.Net/Rest.Net.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32112.339
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rest.Net", "Rest.Net\Rest.Net.csproj", "{C885E940-05C8-43BB-B80B-02F6AAF1AE09}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C885E940-05C8-43BB-B80B-02F6AAF1AE09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C885E940-05C8-43BB-B80B-02F6AAF1AE09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C885E940-05C8-43BB-B80B-02F6AAF1AE09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C885E940-05C8-43BB-B80B-02F6AAF1AE09}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D951ABAA-266B-4E0D-9E11-E6ABD08C8BAB}
-	EndGlobalSection
-EndGlobal
diff --git a/Rest.Net/Rest.Net/Rest - Backup.Net.csproj b/Rest.Net/Rest.Net/Rest - Backup.Net.csproj
deleted file mode 100644
index a23745a..0000000
--- a/Rest.Net/Rest.Net/Rest - Backup.Net.csproj	
+++ /dev/null
@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>library</OutputType>
-    <TargetFramework>net472</TargetFramework>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Authors>MontoyaTech</Authors>
-    <Company>MontoyaTech</Company>
-    <Copyright>MontoyaTech 2022</Copyright>
-    <PackageProjectUrl>https://code.montoyatech.com/MontoyaTech/Rest.Net</PackageProjectUrl>
-    <Description>A simple C# library for creating a rest api.</Description>
-    <PackageTags>MontoyaTech;Rest.Net</PackageTags>
-    <NeutralLanguage>en</NeutralLanguage>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <AssemblyName>MontoyaTech.Rest.Net</AssemblyName>
-    <RootNamespace>MontoyaTech.Rest.Net</RootNamespace>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <Version>1.0.*</Version>
-  </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" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Rest.Net/Rest.Net/Route.cs b/Rest.Net/Route.cs
similarity index 100%
rename from Rest.Net/Rest.Net/Route.cs
rename to Rest.Net/Route.cs
diff --git a/Rest.Net/Rest.Net/RouteArgumentConverter.cs b/Rest.Net/RouteArgumentConverter.cs
similarity index 100%
rename from Rest.Net/Rest.Net/RouteArgumentConverter.cs
rename to Rest.Net/RouteArgumentConverter.cs
diff --git a/Rest.Net/Rest.Net/RouteContext.cs b/Rest.Net/RouteContext.cs
similarity index 100%
rename from Rest.Net/Rest.Net/RouteContext.cs
rename to Rest.Net/RouteContext.cs
diff --git a/Rest.Net/Rest.Net/RouteListener.cs b/Rest.Net/RouteListener.cs
similarity index 100%
rename from Rest.Net/Rest.Net/RouteListener.cs
rename to Rest.Net/RouteListener.cs
diff --git a/Rest.Net/Rest.Net/RouteMatcher.cs b/Rest.Net/RouteMatcher.cs
similarity index 100%
rename from Rest.Net/Rest.Net/RouteMatcher.cs
rename to Rest.Net/RouteMatcher.cs
diff --git a/Rest.Net/Rest.Net/RoutePostprocess.cs b/Rest.Net/RoutePostprocess.cs
similarity index 100%
rename from Rest.Net/Rest.Net/RoutePostprocess.cs
rename to Rest.Net/RoutePostprocess.cs
diff --git a/Rest.Net/Rest.Net/RoutePreprocess.cs b/Rest.Net/RoutePreprocess.cs
similarity index 100%
rename from Rest.Net/Rest.Net/RoutePreprocess.cs
rename to Rest.Net/RoutePreprocess.cs