From 377f4482815f91c59141ab1ba63f12d9b343df99 Mon Sep 17 00:00:00 2001
From: Guillaume <gzahra@2bee.io>
Date: Sun, 15 Dec 2019 23:31:07 +0100
Subject: [PATCH] - Migrated WebSocketProxy project to Multi targeting: .NET
 Standard 2.0 and .NET 4.5

---
 WebSocketProxy.Sample/HelloWorldController.cs |  2 +-
 .../WebSocketProxy.Sample.csproj              |  5 ++
 WebSocketProxy/Properties/AssemblyInfo.cs     | 41 ----------
 WebSocketProxy/WebSocketProxy.csproj          | 81 +++----------------
 WebSocketProxy/WebSocketProxy.nuspec          |  2 +-
 5 files changed, 20 insertions(+), 111 deletions(-)
 delete mode 100644 WebSocketProxy/Properties/AssemblyInfo.cs

diff --git a/WebSocketProxy.Sample/HelloWorldController.cs b/WebSocketProxy.Sample/HelloWorldController.cs
index fd631b8..e16b679 100644
--- a/WebSocketProxy.Sample/HelloWorldController.cs
+++ b/WebSocketProxy.Sample/HelloWorldController.cs
@@ -6,7 +6,7 @@ public class HelloWorldController : NancyModule
     {
         public HelloWorldController()
         {
-            Get["/"] = v => View["Content/index.html"];
+            Get["/"] = v => View["Resources/Content/index.html"];
         }
     }
 }
\ No newline at end of file
diff --git a/WebSocketProxy.Sample/WebSocketProxy.Sample.csproj b/WebSocketProxy.Sample/WebSocketProxy.Sample.csproj
index 0f2d655..a830c59 100644
--- a/WebSocketProxy.Sample/WebSocketProxy.Sample.csproj
+++ b/WebSocketProxy.Sample/WebSocketProxy.Sample.csproj
@@ -73,6 +73,11 @@
       <Name>WebSocketProxy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\Content\index.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/WebSocketProxy/Properties/AssemblyInfo.cs b/WebSocketProxy/Properties/AssemblyInfo.cs
deleted file mode 100644
index 47df50d..0000000
--- a/WebSocketProxy/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Reflection;
-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("WebSocketProxy")]
-[assembly: AssemblyDescription("WebSocket Proxy acts as gateway for HTTP and WebSocket servers")]
-[assembly: AssemblyCompany("life.emotions")]
-[assembly: AssemblyProduct("SwaggerWcf")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif
-
-// 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("54d57407-92ae-4f22-b327-65e4c79ae515")]
-
-// 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.2")]
-[assembly: AssemblyFileVersion("1.0.2")]
-[assembly: AssemblyInformationalVersion("1.0.2")]
diff --git a/WebSocketProxy/WebSocketProxy.csproj b/WebSocketProxy/WebSocketProxy.csproj
index 4d0a8d0..d0170d1 100644
--- a/WebSocketProxy/WebSocketProxy.csproj
+++ b/WebSocketProxy/WebSocketProxy.csproj
@@ -1,72 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" 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>{BDA44986-B4D2-43E2-9486-CAC4F62EEB4F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WebSocketProxy</RootNamespace>
-    <AssemblyName>WebSocketProxy</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <Description>WebSocket Proxy acts as gateway for HTTP and WebSocket servers</Description>
+    <Company>life.emotions</Company>
+    <Authors>SwaggerWcf</Authors>
+    <Copyright>Copyright ©  2015</Copyright>
+    <AssemblyVersion>1.0.2.0</AssemblyVersion>
+    <Version>1.0.2</Version>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>5</LangVersion>
-  </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.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Logger.cs" />
-    <Compile Include="TcpRoute.cs" />
-    <Compile Include="TcpConnectionManager.cs" />
-    <Compile Include="TcpHost.cs" />
-    <Compile Include="Host.cs" />
-    <Compile Include="HttpPacket.cs" />
-    <Compile Include="HttpPacketBuilder.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TcpProxyConfiguration.cs" />
-    <Compile Include="TcpProxyServer.cs" />
-    <Compile Include="TcpStateContainer.cs" />
-    <Compile Include="WebSocketHeaders.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <None Include="WebSocketProxy.nuspec" />
+    <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+  
+ </Project>
diff --git a/WebSocketProxy/WebSocketProxy.nuspec b/WebSocketProxy/WebSocketProxy.nuspec
index 30d6745..99e761e 100644
--- a/WebSocketProxy/WebSocketProxy.nuspec
+++ b/WebSocketProxy/WebSocketProxy.nuspec
@@ -10,7 +10,7 @@
     <projectUrl>https://github.com/lifeemotions/websocketproxy</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
-    <releaseNotes>fix to avoid excepion when stopping</releaseNotes>
+    <releaseNotes>.NET Standard 2.0 migration</releaseNotes>
     <copyright>Copyright ©  2015</copyright>
     <tags>.net websocket http ssl proxy</tags>
   </metadata>