完全以netcore为主，不再支持net40

2020-04-06 22:23:08 +08:00 · 2020-04-06 22:23:08 +08:00 · 02c40bc832
parent d41961581e
commit 02c40bc832
12 changed files with 31 additions and 56 deletions
--- a/AntJob.Agent/AntJob.Agent.csproj
+++ b/AntJob.Agent/AntJob.Agent.csproj
@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <AssemblyName>AntAgent</AssemblyName>
-    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
    <AssemblyTitle>蚂蚁代理</AssemblyTitle>
    <Description>调度中心下发C#或Sql给蚂蚁代理执行</Description>
    <Company>新生命开发团队</Company>
@ -12,7 +12,8 @@
    <FileVersion>1.0.2020.0111</FileVersion>
    <AssemblyVersion>1.0.*</AssemblyVersion>
    <Deterministic>false</Deterministic>
-    <OutputPath>..\BinAgent</OutputPath>
+    <OutputPath>..\Bin\Agent</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <DefineConstants>TRACE</DefineConstants>
@ -39,4 +40,7 @@
    <ProjectReference Include="..\AntJob\AntJob.csproj" />
  </ItemGroup>

+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="del &quot;$(TargetDir)*.xml&quot; /q&#xD;&#xA;del &quot;$(TargetDir)*.dll.config&quot; /q" />
+  </Target>
 </Project>
--- a/AntJob.Extensions/AntJob.Extensions.csproj
+++ b/AntJob.Extensions/AntJob.Extensions.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;net40</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
    <AssemblyTitle>蚂蚁调度系统扩展</AssemblyTitle>
    <Description>分布式任务调度系统，纯NET打造的重量级大数据实时计算平台，万亿级调度经验积累</Description>
    <Company>新生命开发团队</Company>
--- a/AntJob.Server/AntJob.Server.csproj
+++ b/AntJob.Server/AntJob.Server.csproj
@ -2,7 +2,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <AssemblyName>AntServer</AssemblyName>
-    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
    <AssemblyTitle>蚂蚁调度中心</AssemblyTitle>
    <Description>分布式任务调度系统，纯NET打造的重量级大数据实时计算平台，万亿级调度经验积累</Description>
    <Company>新生命开发团队</Company>
@ -11,7 +11,8 @@
    <FileVersion>1.0.2020.0110</FileVersion>
    <AssemblyVersion>1.0.*</AssemblyVersion>
    <Deterministic>false</Deterministic>
-    <OutputPath>..\BinServer</OutputPath>
+    <OutputPath>..\Bin\Server</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <DefineConstants>TRACE</DefineConstants>
@ -46,4 +47,8 @@
  <ItemGroup>
    <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />
  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="del &quot;$(TargetDir)*.xml&quot; /q&#xD;&#xA;del &quot;$(TargetDir)*.dll.config&quot; /q" />
+  </Target>
 </Project>
--- a/AntJob.Server/appsettings.json
+++ b/AntJob.Server/appsettings.json
@ -7,15 +7,15 @@
  "AllowedHosts": "*",
  "ConnectionStrings": {
    "Membership": {
-      "connectionString": "Data Source=..\\..\\Data\\Membership.db",
+      "connectionString": "Data Source=..\\Data\\Membership.db",
      "providerName": "SQLite"
    },
    "Log": {
-      "connectionString": "Data Source=..\\..\\Data\\Log.db",
+      "connectionString": "Data Source=..\\Data\\Log.db",
      "providerName": "SQLite"
    },
    "Ant": {
-      "connectionString": "Data Source=..\\..\\Data\\Ant.db",
+      "connectionString": "Data Source=..\\Data\\Ant.db",
      "providerName": "SQLite"
    }
  }
--- a/AntJob.Web/AntJob.Web.csproj
+++ b/AntJob.Web/AntJob.Web.csproj
@ -9,7 +9,8 @@
    <FileVersion>1.0.2020.0110</FileVersion>
    <AssemblyVersion>1.0.*</AssemblyVersion>
    <Deterministic>false</Deterministic>
-    <OutputPath>..\BinWeb</OutputPath>
+    <OutputPath>..\Bin\Web</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <DefineConstants>TRACE</DefineConstants>
@ -29,4 +30,8 @@
    <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />
    <ProjectReference Include="..\AntJob\AntJob.csproj" />
  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="del &quot;$(TargetDir)*.xml&quot; /q&#xD;&#xA;del &quot;$(TargetDir)*.dll.config&quot; /q" />
+  </Target>
 </Project>
--- a/AntJob.Web/Properties/launchSettings.json
+++ b/AntJob.Web/Properties/launchSettings.json
@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:3614/",
-      "sslPort": 44393
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "AntJob.Web": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
-    }
-  }
-}
--- a/AntJob.Web/appsettings.Development.json
+++ b/AntJob.Web/appsettings.Development.json
@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Debug",
-      "System": "Information",
-      "Microsoft": "Information"
-    }
-  }
-}
--- a/AntJob.Web/appsettings.json
+++ b/AntJob.Web/appsettings.json
@ -7,15 +7,15 @@
  "AllowedHosts": "*",
  "ConnectionStrings": {
    "Membership": {
-      "connectionString": "Data Source=..\\..\\Data\\Membership.db",
+      "connectionString": "Data Source=..\\Data\\Membership.db",
      "providerName": "SQLite"
    },
    "Log": {
-      "connectionString": "Data Source=..\\..\\Data\\Log.db",
+      "connectionString": "Data Source=..\\Data\\Log.db",
      "providerName": "SQLite"
    },
    "Ant": {
-      "connectionString": "Data Source=..\\..\\Data\\Ant.db",
+      "connectionString": "Data Source=..\\Data\\Ant.db",
      "providerName": "SQLite"
    }
  }
--- a/AntJob/AntJob.csproj
+++ b/AntJob/AntJob.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;net40</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
    <AssemblyTitle>蚂蚁调度系统</AssemblyTitle>
    <Description>分布式任务调度系统，纯NET打造的重量级大数据实时计算平台，万亿级调度经验积累</Description>
    <Company>新生命开发团队</Company>
--- a/Samples/HelloWork/HelloWork.csproj
+++ b/Samples/HelloWork/HelloWork.csproj
@ -5,6 +5,8 @@
    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
    <AssemblyVersion>1.0.*</AssemblyVersion>
    <Deterministic>false</Deterministic>
+    <OutputPath>..\..\Bin\Hello</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
  </PropertyGroup>

  <ItemGroup>
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@ -5,12 +5,13 @@
    <TargetFramework>netcoreapp3.1</TargetFramework>
    <AssemblyVersion>1.0.*</AssemblyVersion>
    <Deterministic>false</Deterministic>
+    <OutputPath>..\Bin\Test</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
  </PropertyGroup>

  <ItemGroup>
    <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />
    <ProjectReference Include="..\AntJob.Extensions\AntJob.Extensions.csproj" />
-    <ProjectReference Include="..\AntJob.Server\AntJob.Server.csproj" />
    <ProjectReference Include="..\AntJob\AntJob.csproj" />
  </ItemGroup>

--- a/nuget.config
+++ b/nuget.config
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-</configuration>