lith 4 vuotta sitten
vanhempi
commit
d1f17d057a

+ 1 - 1
dotnet/Doc/PublishFile/SersDocker/docker制作镜像Sers/sers/Dockerfile

@@ -1,2 +1,2 @@
-FROM serset/dotnet:6.0-runtime
+FROM serset/dotnet:6.0
 COPY root /root

+ 1 - 1
dotnet/Doc/PublishFile/SersDocker/docker制作镜像Sers/sers_demo_sersall/Dockerfile

@@ -1,2 +1,2 @@
-FROM serset/dotnet:6.0-runtime
+FROM serset/dotnet:6.0
 COPY root /root

+ 1 - 1
dotnet/Doc/PublishFile/SersDocker/docker制作镜像Sers/sers_gateway/Dockerfile

@@ -1,2 +1,2 @@
-FROM serset/dotnet:6.0-runtime
+FROM serset/dotnet:6.0
 COPY root /root

+ 1 - 1
dotnet/Doc/PublishFile/SersDocker/docker制作镜像Sers/sers_gover/Dockerfile

@@ -1,2 +1,2 @@
-FROM serset/dotnet:6.0-runtime
+FROM serset/dotnet:6.0
 COPY root /root

+ 4 - 13
dotnet/Gateway/App.Gateway/App.Gateway.csproj

@@ -1,26 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
 		<Version>2.1.3.627</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
+		<UserSecretsId>7f6416b5-a916-438d-825d-feba700d497d</UserSecretsId>
 	</PropertyGroup>
-
+ 
 
 	<ItemGroup>
-		<Content Include="contentTypeMap.json">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="appsettings.json">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="web.config">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.App" />
 
-	<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" />

+ 9 - 1
dotnet/Gateway/App.Gateway/Properties/PublishProfiles/FolderProfile.pubxml

@@ -9,7 +9,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <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>
-    <_IsPortable>true</_IsPortable>
   </PropertyGroup>
 </Project>

+ 0 - 12
dotnet/Gateway/App.Gateway/web.config

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <location path="." inheritInChildApplications="false">
-    <system.webServer>
-      <handlers>
-        <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
-      </handlers>
-      <aspNetCore processPath="dotnet" arguments=".\App.Gateway.dll" stdoutLogEnabled="true" stdoutLogFile=".\logs\stdout" />
-    </system.webServer>
-  </location>
-</configuration>
-<!--ProjectGuid: c9869c8c-011c-46a8-9e99-88fe982ece67-->

+ 3 - 2
dotnet/Gateway/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj

@@ -17,8 +17,9 @@
   </PropertyGroup>
 
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.1.0" />
+  <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>

+ 4 - 14
dotnet/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
@@ -10,21 +10,11 @@
 
 	<ItemGroup>
 		<Compile Include="..\..\Gateway\App.Gateway\Program.cs" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Content Include="appsettings.json">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="contentTypeMap.json">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="web.config">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
+	</ItemGroup> 
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.App" />
+		
 		<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" />

+ 3 - 21
dotnet/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
@@ -7,16 +7,9 @@
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
 
-
-
-	<ItemGroup>
-		<Content Include="web.config">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-
-
 	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.App" />
+		
 		<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" />
@@ -27,19 +20,8 @@
 	</ItemGroup>
 
 
-
-	<ItemGroup>
-		<None Update="appsettings.json">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-		<None Update="contentTypeMap.json">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-
 	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
 		<Exec Command="xcopy  &quot;$(ProjectDir)..\App.Gover.Gateway\wwwroot&quot; &quot;$(TargetDir)\wwwroot&quot; /e /i /r /y" />
 	</Target>
 
-
 </Project>