Skip to content

Commit 1b93b0a

Browse files
committed
package updates, netstandard
1 parent 334b209 commit 1b93b0a

File tree

21 files changed

+24
-456
lines changed

21 files changed

+24
-456
lines changed

NetCoreStack.WebSockets.sln

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26403.7
4+
VisualStudioVersion = 15.0.26730.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{52C54080-F48B-4DBA-A418-8057611CAF6D}"
77
EndProject
@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
README.md = README.md
1414
EndProjectSection
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutobahnTestApp", "test\AutobahnTestApp\AutobahnTestApp.csproj", "{6AB2B480-3BC6-4A17-9298-906DB11235CB}"
17-
EndProject
1816
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerTestApp", "test\ServerTestApp\ServerTestApp.csproj", "{B8DE19DA-F0D1-48BA-B808-631A27D74C2B}"
1917
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebClientTestApp", "test\WebClientTestApp\WebClientTestApp.csproj", "{079F8A19-BC40-46AC-A31F-B133F7D7F1B8}"
@@ -35,10 +33,6 @@ Global
3533
Release|Any CPU = Release|Any CPU
3634
EndGlobalSection
3735
GlobalSection(ProjectConfigurationPlatforms) = postSolution
38-
{6AB2B480-3BC6-4A17-9298-906DB11235CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{6AB2B480-3BC6-4A17-9298-906DB11235CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{6AB2B480-3BC6-4A17-9298-906DB11235CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{6AB2B480-3BC6-4A17-9298-906DB11235CB}.Release|Any CPU.Build.0 = Release|Any CPU
4236
{B8DE19DA-F0D1-48BA-B808-631A27D74C2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4337
{B8DE19DA-F0D1-48BA-B808-631A27D74C2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
4438
{B8DE19DA-F0D1-48BA-B808-631A27D74C2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +66,6 @@ Global
7266
HideSolutionNode = FALSE
7367
EndGlobalSection
7468
GlobalSection(NestedProjects) = preSolution
75-
{6AB2B480-3BC6-4A17-9298-906DB11235CB} = {A1704016-03C8-4917-9C50-AE9DDF55ECB7}
7669
{B8DE19DA-F0D1-48BA-B808-631A27D74C2B} = {A1704016-03C8-4917-9C50-AE9DDF55ECB7}
7770
{079F8A19-BC40-46AC-A31F-B133F7D7F1B8} = {A1704016-03C8-4917-9C50-AE9DDF55ECB7}
7871
{C6BD4266-256A-4FF6-B991-D44EFC825FC6} = {52C54080-F48B-4DBA-A418-8057611CAF6D}
@@ -81,4 +74,7 @@ Global
8174
{1AAECD28-5C1D-4ED6-8CBC-6FCAA3804ABF} = {A1704016-03C8-4917-9C50-AE9DDF55ECB7}
8275
{1738B969-D294-4417-999C-A3AC3B04EFE4} = {52C54080-F48B-4DBA-A418-8057611CAF6D}
8376
EndGlobalSection
77+
GlobalSection(ExtensibilityGlobals) = postSolution
78+
SolutionGuid = {F299AD98-9AB4-4C7B-B125-5E82EB9B8700}
79+
EndGlobalSection
8480
EndGlobal

src/NetCoreStack.WebSockets.ProxyClient/NetCoreStack.WebSockets.ProxyClient.csproj

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>1.0.1</VersionPrefix>
5-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
6-
<AssemblyName>NetCoreStack.WebSockets.ProxyClient</AssemblyName>
7-
<PackageId>NetCoreStack.WebSockets.ProxyClient</PackageId>
8-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
9-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
125
</PropertyGroup>
136

147
<ItemGroup>
158
<ProjectReference Include="..\NetCoreStack.WebSockets\NetCoreStack.WebSockets.csproj" />
169
</ItemGroup>
1710

1811
<ItemGroup>
19-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.1.2" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
21-
</ItemGroup>
22-
23-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
24-
<Reference Include="System" />
25-
<Reference Include="Microsoft.CSharp" />
26-
</ItemGroup>
27-
28-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
12+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
2914
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.1" />
3015
</ItemGroup>
3116

src/NetCoreStack.WebSockets.ProxyClient/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>1.0.1</VersionPrefix>
5-
<TargetFrameworks>net451;netstandard1.3</TargetFrameworks>
6-
<AssemblyName>NetCoreStack.WebSockets</AssemblyName>
7-
<PackageId>NetCoreStack.WebSockets</PackageId>
8-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
9-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
10-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
11-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
12-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
135
</PropertyGroup>
146

157
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="1.0.2" />
17-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
8+
<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
1810
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1911
</ItemGroup>
2012

21-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
22-
<Reference Include="System" />
23-
<Reference Include="Microsoft.CSharp" />
24-
</ItemGroup>
25-
2613
</Project>

src/NetCoreStack.WebSockets/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

test/AutobahnTestApp/AutobahnTestApp.csproj

Lines changed: 0 additions & 30 deletions
This file was deleted.

test/AutobahnTestApp/Program.cs

Lines changed: 0 additions & 39 deletions
This file was deleted.

test/AutobahnTestApp/Properties/launchSettings.json

Lines changed: 0 additions & 42 deletions
This file was deleted.

test/AutobahnTestApp/Startup.cs

Lines changed: 0 additions & 58 deletions
This file was deleted.

test/AutobahnTestApp/TestResources/testCert.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)