Skip to content

Nuget包由1.x升级到2.x #1

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
iEricZHENG wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Nuget包由1.x升级到2.x #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b48dff1
.net core包从1.x升级到2.1
iEricZHENG Oct 23, 2018
b18d5bd
Example地址改为127.0.0.1
iEricZHENG Oct 23, 2018
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
14 changes: 7 additions & 7 deletions src/WS.Core/WS.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6.1</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="4.6.0" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
<PackageReference Include="protobuf-net" Version="2.2.1" />
<PackageReference Include="Autofac" Version="4.8.1" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
<PackageReference Include="protobuf-net" Version="2.4.0" />
<PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0-preview1-25305-02" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/WS.Test/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://192.168.3.192:8987",
"applicationUrl": "http://127.0.0.1:8987",
"sslPort": 0
}
},
Expand All @@ -21,7 +21,7 @@
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://192.168.199.236:8987"
"applicationUrl": "http://127.0.0.1:8987"
}
}
}
}
3 changes: 2 additions & 1 deletion src/WS.Test/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using WS.Core;
using WS.Core.IO;
using System;
using WS.Core.Base;

namespace WS.Coin
{
Expand Down Expand Up @@ -50,7 +51,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
app.UseStaticFiles();

app.UseWebSockets();
app.UseWSSockets(GlobalConfig.DefaultIocManager, loggerGenerator);
app.UseWSSockets(GlobalConfig.DefaultIocManager, loggerGenerator,new WSSessionManager());

GlobalConfig.DefaultIocManager.Build();//初始化默认IOC管理器
}
Expand Down
12 changes: 6 additions & 6 deletions src/WS.Test/WS.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultContentItems>false</EnableDefaultContentItems>
</PropertyGroup>
<ItemGroup>
<Content Include="wwwroot\Example\Chat.js" />
Expand All @@ -12,12 +13,11 @@
<Content Include="wwwroot\Example\proto\proto_market.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.4" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.WebSockets.Server" Version="0.1.0" />
<PackageReference Include="Npgsql" Version="3.2.0" />
<PackageReference Include="Npgsql" Version="4.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WS.Core\WS.Core.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/WS.Test/wwwroot/Example/Chat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var SendCommand = {
function StartWS(root) {
var Chat = root.lookup("Chat");

var ws = new WebSocket("ws://192.168.199.236:8987/ws/market");
var ws = new WebSocket("ws://127.0.0.1:8987ws/market");
ws.onopen = function (e) {
console.log("Connection open...");
};
Expand Down
35 changes: 19 additions & 16 deletions src/WS.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,33 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x64.ActiveCfg = Debug|x64
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x64.Build.0 = Debug|x64
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x86.ActiveCfg = Debug|x86
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x86.Build.0 = Debug|x86
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x64.ActiveCfg = Debug|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x64.Build.0 = Debug|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x86.ActiveCfg = Debug|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x86.Build.0 = Debug|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|Any CPU.Build.0 = Release|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x64.ActiveCfg = Release|x64
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x64.Build.0 = Release|x64
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x86.ActiveCfg = Release|x86
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x86.Build.0 = Release|x86
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x64.ActiveCfg = Release|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x64.Build.0 = Release|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x86.ActiveCfg = Release|Any CPU
{159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x86.Build.0 = Release|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x64.ActiveCfg = Debug|x64
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x64.Build.0 = Debug|x64
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x86.ActiveCfg = Debug|x86
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x86.Build.0 = Debug|x86
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x64.ActiveCfg = Debug|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x64.Build.0 = Debug|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x86.ActiveCfg = Debug|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x86.Build.0 = Debug|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|Any CPU.Build.0 = Release|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x64.ActiveCfg = Release|x64
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x64.Build.0 = Release|x64
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x86.ActiveCfg = Release|x86
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x86.Build.0 = Release|x86
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x64.ActiveCfg = Release|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x64.Build.0 = Release|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x86.ActiveCfg = Release|Any CPU
{BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {00FCB4A8-436F-43EC-B71C-321A17AABAB3}
EndGlobalSection
EndGlobal