dotnet/Doc/Publish/nuget publish.bat

@@ -111,25 +111,17 @@ dotnet pack --configuration Release --output ..\..\..\..\Doc\Publish\nuget
 cd /d ../../../ 
 
 
-
-
-cd ..
-
-
-
-
-::------------------Gateway
-
 echo 'pack Sers.Gateway'
-cd /d Gateway\Sers.Gateway\Sers.Gateway
+cd /d Sers\Sers.Gateway\Sers.Gateway
 dotnet build --configuration Release
-dotnet pack --configuration Release --output ..\..\..\Doc\Publish\nuget
+dotnet pack --configuration Release --output ..\..\..\..\Doc\Publish\nuget
 @if errorlevel 1 (echo . & echo .  & echo ³ö´í£¬ÇëÅŲ飡& pause) 
-cd /d ../../../
+cd /d ../../../  
 
 
 
 
+cd ..
 
 
 

dotnet/Gateway/App.Gateway/App.Gateway.csproj

@@ -1,19 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
 		<Version>2.1.3.627</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
- 
 
-	<ItemGroup>
 
+	<ItemGroup>
 		<ProjectReference Include="..\..\Library\Sers\Sers.CL\Ipc\Sers.CL.Ipc.SharedMemory\Sers.CL.Ipc.SharedMemory.csproj" />
 		<ProjectReference Include="..\..\Library\Sers\Sers.CL\WebSocket\Sers.CL.WebSocket\Sers.CL.WebSocket.csproj" />
 		<ProjectReference Include="..\..\Library\Sers\Sers.CL\Zmq\FullDuplex\Sers.CL.Zmq.FullDuplex\Sers.CL.Zmq.FullDuplex.csproj" />
 		<ProjectReference Include="..\..\Library\Sers\Sers.CL\Zmq\ThreadWait\Sers.CL.ClrZmq.ThreadWait\Sers.CL.ClrZmq.ThreadWait.csproj" />
-		<ProjectReference Include="..\Sers.Gateway\Sers.Gateway\Sers.Gateway.csproj" />
+		<ProjectReference Include="..\..\Library\Sers\Sers.Gateway\Sers.Gateway\Sers.Gateway.csproj" />
 	</ItemGroup>
 
 

dotnet/Gateway/App.Gateway/Properties/PublishProfiles/FolderProfile.pubxml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <PublishDir>bin\Publish</PublishDir>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <ProjectGuid>0a6511c0-869e-4f00-b187-fb46234474c8</ProjectGuid>
-    <publishUrl>.\bin\Gateway</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
-    <SelfContained>false</SelfContained>
-  </PropertyGroup>
-</Project>

dotnet/Gateway/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj

@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.3.627</Version>
-  </PropertyGroup>
-
-	<PropertyGroup>
-		<Authors>Lith</Authors>
-		<Description>Sers微服务-网关</Description>
-		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
-	</PropertyGroup>
-
-
-  <PropertyGroup>
-    <DocumentationFile>bin\Debug\netstandard2.0\Sers.Gateway.xml</DocumentationFile>
-  </PropertyGroup>
-
-
-  <ItemGroup>  
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
-  
-    <ProjectReference Include="..\..\..\Library\Sers\Sers.ServiceStation\Sers.ServiceStation\Sers.ServiceStation.csproj" />
-    <ProjectReference Include="..\..\..\Library\Vit\Vit.WebHost\Vit.WebHost.csproj" />
-  </ItemGroup>
-
-</Project>

dotnet/Library/Sers/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<Version>2.1.3.627</Version>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Authors>Lith</Authors>
+		<Description>Sers微服务-网关</Description>
+		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
+	</PropertyGroup>
+
+
+	<PropertyGroup>
+		<DocumentationFile>bin\Debug\netstandard2.0\Sers.Gateway.xml</DocumentationFile>
+	</PropertyGroup>
+
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\..\Vit\Vit.WebHost\Vit.WebHost.csproj" />
+		<ProjectReference Include="..\..\Sers.ServiceStation\Sers.ServiceStation\Sers.ServiceStation.csproj" />
+	</ItemGroup>
+
+</Project>

dotnet/Sers.sln

@@ -113,8 +113,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sers.Gateway", "Sers.Gatewa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Hardware.Demo", "Library\Sers\Sers.Hardware\Test\Sers.Hardware.Demo\Sers.Hardware.Demo.csproj", "{A32DA747-010D-4CF4-8E14-5276D172107D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Gateway", "Gateway\Sers.Gateway\Sers.Gateway\Sers.Gateway.csproj", "{C4E13240-C54A-43FC-9B21-6D3B386F73AF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Gateway", "Gateway\App.Gateway\App.Gateway.csproj", "{0A6511C0-869E-4F00-B187-FB46234474C8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Gover.Gateway", "ServiceCenter\App.Gover.Gateway\App.Gover.Gateway.csproj", "{B16C9556-0AF5-4802-84DC-56D21E867E33}"
@@ -153,6 +151,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Serslot", "Library\Ser
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Did.Serslot.HelloWorld60", "ServiceStation\Demo\Serslot\Did.Serslot.HelloWorld60\Did.Serslot.HelloWorld60.csproj", "{7C7DDF36-CB84-45A4-ABE3-BDBF1C239D68}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Gateway", "Library\Sers\Sers.Gateway\Sers.Gateway\Sers.Gateway.csproj", "{4EADA81F-6554-4A2E-A0F5-2B9459558347}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -361,14 +361,6 @@ Global
 		{A32DA747-010D-4CF4-8E14-5276D172107D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A32DA747-010D-4CF4-8E14-5276D172107D}.Release|x86.ActiveCfg = Release|Any CPU
 		{A32DA747-010D-4CF4-8E14-5276D172107D}.Release|x86.Build.0 = Release|Any CPU
-		{C4E13240-C54A-43FC-9B21-6D3B386F73AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4E13240-C54A-43FC-9B21-6D3B386F73AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4E13240-C54A-43FC-9B21-6D3B386F73AF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C4E13240-C54A-43FC-9B21-6D3B386F73AF}.Debug|x86.Build.0 = Debug|Any CPU
-		{C4E13240-C54A-43FC-9B21-6D3B386F73AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4E13240-C54A-43FC-9B21-6D3B386F73AF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4E13240-C54A-43FC-9B21-6D3B386F73AF}.Release|x86.ActiveCfg = Release|Any CPU
-		{C4E13240-C54A-43FC-9B21-6D3B386F73AF}.Release|x86.Build.0 = Release|Any CPU
 		{0A6511C0-869E-4F00-B187-FB46234474C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0A6511C0-869E-4F00-B187-FB46234474C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0A6511C0-869E-4F00-B187-FB46234474C8}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -505,6 +497,14 @@ Global
 		{7C7DDF36-CB84-45A4-ABE3-BDBF1C239D68}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7C7DDF36-CB84-45A4-ABE3-BDBF1C239D68}.Release|x86.ActiveCfg = Release|Any CPU
 		{7C7DDF36-CB84-45A4-ABE3-BDBF1C239D68}.Release|x86.Build.0 = Release|Any CPU
+		{4EADA81F-6554-4A2E-A0F5-2B9459558347}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EADA81F-6554-4A2E-A0F5-2B9459558347}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4EADA81F-6554-4A2E-A0F5-2B9459558347}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4EADA81F-6554-4A2E-A0F5-2B9459558347}.Debug|x86.Build.0 = Debug|Any CPU
+		{4EADA81F-6554-4A2E-A0F5-2B9459558347}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4EADA81F-6554-4A2E-A0F5-2B9459558347}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4EADA81F-6554-4A2E-A0F5-2B9459558347}.Release|x86.ActiveCfg = Release|Any CPU
+		{4EADA81F-6554-4A2E-A0F5-2B9459558347}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -559,9 +559,8 @@ Global
 		{AF17FAEF-DBCC-4E5C-954D-BD4F60A016C1} = {97C34C06-AE79-4E1A-8D04-EB0107643302}
 		{DD0CB14B-D8E6-46EC-AE42-2B1215C1BBDD} = {AF17FAEF-DBCC-4E5C-954D-BD4F60A016C1}
 		{545F1A7C-68B6-4F1F-B165-1A0F8F3DC51D} = {ECEEABBB-DEA2-4CD4-99EA-3E048DB23219}
-		{E07D5AC5-2B0F-4916-9B10-5038C8C16B71} = {D06867E2-E739-4E00-827A-F604E9844CBD}
+		{E07D5AC5-2B0F-4916-9B10-5038C8C16B71} = {5522AB94-C73C-4BB6-A2DB-8E84061D0D14}
 		{A32DA747-010D-4CF4-8E14-5276D172107D} = {8ECF169A-14B8-469F-AA72-F1125238B5D7}
-		{C4E13240-C54A-43FC-9B21-6D3B386F73AF} = {E07D5AC5-2B0F-4916-9B10-5038C8C16B71}
 		{0A6511C0-869E-4F00-B187-FB46234474C8} = {D06867E2-E739-4E00-827A-F604E9844CBD}
 		{B16C9556-0AF5-4802-84DC-56D21E867E33} = {ADF8B647-D701-4460-8384-8FA8E7FAEC11}
 		{75C5993B-EF75-47D0-9FCE-9073A4BF481D} = {ADF8B647-D701-4460-8384-8FA8E7FAEC11}
@@ -581,6 +580,7 @@ Global
 		{A0686CA6-5BAA-4A0A-BB38-43B5C9E865A7} = {5522AB94-C73C-4BB6-A2DB-8E84061D0D14}
 		{093170D0-D4B4-4274-BE02-A28CB1154B22} = {A0686CA6-5BAA-4A0A-BB38-43B5C9E865A7}
 		{7C7DDF36-CB84-45A4-ABE3-BDBF1C239D68} = {015B5793-0478-4884-A58B-8889639FD65A}
+		{4EADA81F-6554-4A2E-A0F5-2B9459558347} = {E07D5AC5-2B0F-4916-9B10-5038C8C16B71}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C7DA16E3-9949-49FA-B0B4-F830636DE60F}

dotnet/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj

@@ -15,7 +15,7 @@
 		<ProjectReference Include="..\..\Library\Sers\Sers.CL\WebSocket\Sers.CL.WebSocket\Sers.CL.WebSocket.csproj" />
 		<ProjectReference Include="..\..\Library\Sers\Sers.CL\Zmq\FullDuplex\Sers.CL.Zmq.FullDuplex\Sers.CL.Zmq.FullDuplex.csproj" />
 		<ProjectReference Include="..\..\Library\Sers\Sers.CL\Zmq\ThreadWait\Sers.CL.ClrZmq.ThreadWait\Sers.CL.ClrZmq.ThreadWait.csproj" />
-		<ProjectReference Include="..\..\Gateway\Sers.Gateway\Sers.Gateway\Sers.Gateway.csproj" />
+		<ProjectReference Include="..\..\Library\Sers\Sers.Gateway\Sers.Gateway\Sers.Gateway.csproj" />
 	</ItemGroup>
 
 	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">

dotnet/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj

@@ -11,7 +11,7 @@
 		<ProjectReference Include="..\..\Library\Sers\Sers.CL\WebSocket\Sers.CL.WebSocket\Sers.CL.WebSocket.csproj" />
 		<ProjectReference Include="..\..\Library\Sers\Sers.CL\Zmq\FullDuplex\Sers.CL.Zmq.FullDuplex\Sers.CL.Zmq.FullDuplex.csproj" />
 		<ProjectReference Include="..\..\Library\Sers\Sers.CL\Zmq\ThreadWait\Sers.CL.ClrZmq.ThreadWait\Sers.CL.ClrZmq.ThreadWait.csproj" />
-		<ProjectReference Include="..\..\Gateway\Sers.Gateway\Sers.Gateway\Sers.Gateway.csproj" />
+		<ProjectReference Include="..\..\Library\Sers\Sers.Gateway\Sers.Gateway\Sers.Gateway.csproj" />
 		<ProjectReference Include="..\Sers.ServiceCenter\Apm\Sers.Gover.Apm.Zipkin\Sers.Gover.Apm.Zipkin.csproj" />
 		<ProjectReference Include="..\Sers.ServiceCenter\Sers.Gover\Sers.Gover.csproj" />
 	</ItemGroup>