FileServer部分修改 (#196)

删除部分包引用，netcore3.0以上不需要再引入Microsoft.AspNetCore.App

Tools/FileServer/Appsettings.cs

@@ -1,9 +0,0 @@
-namespace ETFileServer
-{
-    public class Appsettings
-    {
-        public string DirectoryPath;
-
-        public int Port;
-    }
-}

Tools/FileServer/FileServer.csproj

@@ -14,13 +14,6 @@
       <OutputPath>../../FileServer/</OutputPath>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
-    </ItemGroup>
-
     <ItemGroup>
       <_ContentIncludedByDefault Remove="Properties\launchSettings.json" />
     </ItemGroup>

Tools/FileServer/Program.cs

@@ -1,26 +1,26 @@
-using System.IO;
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using System.IO;
 
 
 namespace ETFileServer
 {
     public class Program
     {
+        public static IConfigurationRoot mConfig;
         public static void Main(string[] args)
         {
+            mConfig = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json", true)
+                .Build();
             CreateWebHostBuilder(args).Build().Run();
         }
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args)
         {
-            var config = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile("appsettings.json", true)
-                .Build();
-            
-            return WebHost.CreateDefaultBuilder(args).UseUrls(config["urls"])
+            return WebHost.CreateDefaultBuilder(args).UseUrls(mConfig["urls"])
                 .UseStartup<Startup>();
         }
     }

Tools/FileServer/Properties/PublishProfiles/FolderProfile.pubxml

@@ -15,7 +15,7 @@
     <ProjectGuid>1c2827bf-aa19-402a-bfd1-1c92e6b8fd84</ProjectGuid>
     <publishUrl>../../FileServer/</publishUrl>
     <DeleteExistingFiles>True</DeleteExistingFiles>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <SelfContained>false</SelfContained>
     <_IsPortable>true</_IsPortable>
   </PropertyGroup>

Tools/FileServer/Startup.cs

@@ -1,12 +1,12 @@
-using System;
-using System.IO;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Hosting;
+using System;
+using System.IO;
 
 namespace ETFileServer
 {
@@ -16,17 +16,12 @@ namespace ETFileServer
         {
             services.AddDirectoryBrowser();  //开启目录浏览
         }
-       
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment()) app.UseDeveloperExceptionPage();
             
-            var config = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile("appsettings.json", true)
-                .Build();
-
-            string configDir = config["DirectoryPath"];
+            string configDir = Program.mConfig["DirectoryPath"];
             
             configDir = new DirectoryInfo(configDir).FullName;
             Console.WriteLine(configDir);