Skip to content

- Migrated WebSocketProxy project to Multi targeting: .NET Standard 2.0 and .NET 4.5 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Daddoon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

- Migrated WebSocketProxy project to Multi targeting: .NET Standard 2.0 and .NET 4.5 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WebSocketProxy.Sample/HelloWorldController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public class HelloWorldController : NancyModule
{
public HelloWorldController()
{
Get["/"] = v => View["Content/index.html"];
Get["/"] = v => View["Resources/Content/index.html"];
}
}
}
5 changes: 5 additions & 0 deletions WebSocketProxy.Sample/WebSocketProxy.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
41 changes: 0 additions & 41 deletions WebSocketProxy/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

81 changes: 13 additions & 68 deletions WebSocketProxy/WebSocketProxy.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

</Project>
2 changes: 1 addition & 1 deletion WebSocketProxy/WebSocketProxy.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down