From ff5872d4f0d9d98813017d860a46cdec394e4b89 Mon Sep 17 00:00:00 2001
From: Savorboard <yangxiaodong1214@126.com>
Date: Tue, 5 Jun 2018 10:32:49 +0800
Subject: [PATCH] refactor csproj structure.

---
 CAP.sln                                       |  1 -
 .../Sample.RabbitMQ.MySql.csproj              |  6 ++--
 src/DotNetCore.CAP/DotNetCore.CAP.csproj      | 33 ++++---------------
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/CAP.sln b/CAP.sln
index 828d82a..225537c 100644
--- a/CAP.sln
+++ b/CAP.sln
@@ -36,7 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{10C0818D
 		build.cake = build.cake
 		build.ps1 = build.ps1
 		build.sh = build.sh
-		build\common.props = build\common.props
 		build\index.cake = build\index.cake
 		build\util.cake = build\util.cake
 		build\version.cake = build\version.cake
diff --git a/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj b/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj
index 3b11738..cf0add9 100644
--- a/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj
+++ b/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj
@@ -12,10 +12,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.0-rc1-final" />
-  </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
-  </ItemGroup>
+  </ItemGroup> 
+  
   <ItemGroup>
     <ProjectReference Include="..\..\src\DotNetCore.CAP.MySql\DotNetCore.CAP.MySql.csproj" />
     <ProjectReference Include="..\..\src\DotNetCore.CAP.RabbitMQ\DotNetCore.CAP.RabbitMQ.csproj" />
diff --git a/src/DotNetCore.CAP/DotNetCore.CAP.csproj b/src/DotNetCore.CAP/DotNetCore.CAP.csproj
index 464a2a5..20df14b 100644
--- a/src/DotNetCore.CAP/DotNetCore.CAP.csproj
+++ b/src/DotNetCore.CAP/DotNetCore.CAP.csproj
@@ -1,32 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\build\common.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+  
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>DotNetCore.CAP</AssemblyName>
-    <PackageTags>$(PackageTags);</PackageTags>
   </PropertyGroup>
+  
   <PropertyGroup>
     <DocumentationFile>bin\$(Configuration)\netstandard2.0\DotNetCore.CAP.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;CS1591</NoWarn>
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Dashboard\Content\css\bootstrap.min.css" />
-    <None Remove="Dashboard\Content\css\jsonview.min.css" />
-    <None Remove="Dashboard\Content\css\rickshaw.min.css" />
-    <None Remove="Dashboard\Content\fonts\glyphicons-halflings-regular.eot" />
-    <None Remove="Dashboard\Content\fonts\glyphicons-halflings-regular.svg" />
-    <None Remove="Dashboard\Content\fonts\glyphicons-halflings-regular.ttf" />
-    <None Remove="Dashboard\Content\fonts\glyphicons-halflings-regular.woff" />
-    <None Remove="Dashboard\Content\fonts\glyphicons-halflings-regular.woff2" />
-    <None Remove="Dashboard\Content\js\bootstrap.min.js" />
-    <None Remove="Dashboard\Content\js\d3.layout.min.js" />
-    <None Remove="Dashboard\Content\js\d3.min.js" />
-    <None Remove="Dashboard\Content\js\jquery-2.1.4.min.js" />
-    <None Remove="Dashboard\Content\js\jsonview.min.js" />
-    <None Remove="Dashboard\Content\js\moment-with-locales.min.js" />
-    <None Remove="Dashboard\Content\js\moment.min.js" />
-    <None Remove="Dashboard\Content\js\rickshaw.min.js" />
-  </ItemGroup>
+  
   <ItemGroup>
     <EmbeddedResource Include="Dashboard\Content\css\bootstrap.min.css" />
     <EmbeddedResource Include="Dashboard\Content\css\cap.css" />
@@ -47,6 +29,7 @@
     <EmbeddedResource Include="Dashboard\Content\js\moment.min.js" />
     <EmbeddedResource Include="Dashboard\Content\js\rickshaw.min.js" />
   </ItemGroup>
+  
   <ItemGroup>
     <PackageReference Include="Consul" Version="0.7.2.4" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.2" />
@@ -60,6 +43,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
   </ItemGroup>
+  
   <ItemGroup>
     <Compile Update="Dashboard\Content\resx\Strings.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -143,9 +127,4 @@
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Update="Dashboard\Pages\PublishedPage.cshtml">
-      <Generator>RazorGenerator</Generator>
-    </None>
-  </ItemGroup>
 </Project>
\ No newline at end of file