🔨 调整项目文件中.netstandard公共配置信息的位置

likeshan168 · Sep 27, 2019 · eb369a9 · eb369a9
1 parent 1acd364
commit eb369a9
Show file tree

Hide file tree

Showing 23 changed files with 129 additions and 130 deletions.
diff --git a/build/public.netcoreapp.props b/build/public.netcoreapp.props
@@ -7,9 +7,9 @@
     <Company>柳柳软件(66soft.net)</Company>
     <Copyright>Copyright @ 66SOFT 2014-2019</Copyright>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/i66soft/osharp-ns20</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/i66soft/osharp</PackageProjectUrl>
     <PackageIconUrl>https://en.gravatar.com/userimage/140788132/0ff3b1e68fa0154337b1528c4276e276.png?size=80</PackageIconUrl>
-    <RepositoryUrl>https://github.com/i66soft/osharp-ns20</RepositoryUrl>
+    <RepositoryUrl>https://github.com/i66soft/osharp.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>osharp osharpns</PackageTags>
     <NeutralLanguage>zh-CHS</NeutralLanguage>

diff --git a/build/public.netstandard.props b/build/public.netstandard.props
@@ -7,9 +7,9 @@
     <Company>柳柳软件(66soft.net)</Company>
     <Copyright>Copyright @ 66SOFT 2014-2019</Copyright>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/i66soft/osharp-ns20</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/i66soft/osharp</PackageProjectUrl>
     <PackageIconUrl>https://en.gravatar.com/userimage/140788132/0ff3b1e68fa0154337b1528c4276e276.png?size=80</PackageIconUrl>
-    <RepositoryUrl>https://github.com/i66soft/osharp-ns20</RepositoryUrl>
+    <RepositoryUrl>https://github.com/i66soft/osharp.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>osharp osharpns</PackageTags>
     <NeutralLanguage>zh-CHS</NeutralLanguage>

diff --git a/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj b/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.AspNetCore</PackageId>
     <Summary>OSharp(.NetStandard2.0) AspNetCore组件</Summary>
@@ -15,9 +18,6 @@
     <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
-
   <ItemGroup>
     <Compile Remove="Mvc\Extensions\**" />
     <EmbeddedResource Remove="Mvc\Extensions\**" />

diff --git a/src/OSharp.AutoMapper/OSharp.AutoMapper.csproj b/src/OSharp.AutoMapper/OSharp.AutoMapper.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.AutoMapper</PackageId>
     <Summary>OSharp(.NetStandard2.0) AutoMapper 对象映射组件</Summary>
@@ -14,8 +17,6 @@
     <DocumentationFile>bin\Debug\netstandard2.0\OSharp.AutoMapper.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
   <ItemGroup>
     <Compile Remove="ServiceCollectionExtensions1.cs" />
   </ItemGroup>

diff --git a/src/OSharp.CodeGeneration/OSharp.CodeGeneration.csproj b/src/OSharp.CodeGeneration/OSharp.CodeGeneration.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.CodeGeneration</PackageId>
     <Summary>OSharp(.NetStandard2.0) 代码生成组件</Summary>
@@ -16,8 +19,6 @@
     <DocumentationFile>bin\Release\netstandard2.0\OSharp.CodeGeneration.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
   <ItemGroup>
     <None Remove="Templates\AdminController.cshtml" />
     <None Remove="Templates\Entity.cshtml" />

diff --git a/src/OSharp.EntityFrameworkCore.MySql/OSharp.EntityFrameworkCore.MySql.csproj b/src/OSharp.EntityFrameworkCore.MySql/OSharp.EntityFrameworkCore.MySql.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <RootNamespace>OSharp.Entity.MySql</RootNamespace>
     <PackageId>OSharpNS.EntityFrameworkCore.MySql</PackageId>
@@ -15,9 +18,6 @@
     <DocumentationFile>bin\Release\netstandard2.0\OSharp.EntityFrameworkCore.MySql.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
-
   <ItemGroup>
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="[2.2.0, 3.0)" />
   </ItemGroup>

diff --git a/src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj b/src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <RootNamespace>OSharp.Entity.Oracle</RootNamespace>
     <PackageId>OSharpNS.EntityFrameworkCore.Oracle</PackageId>
@@ -15,9 +18,6 @@
     <DocumentationFile>bin\Release\netstandard2.0\OSharp.EntityFrameworkCore.Oracle.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
-
   <ItemGroup>
     <PackageReference Include="Citms.EntityFrameworkCore.Oracle" Version="1.0.9" />
   </ItemGroup>

diff --git a/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj b/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <RootNamespace>OSharp.Entity.PostgreSql</RootNamespace>
     <PackageId>OSharpNS.EntityFrameworkCore.PostgreSql</PackageId>
@@ -17,8 +20,6 @@
     <DocumentationFile>bin\Release\netstandard2.0\OSharp.EntityFrameworkCore.PostgreSql.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
   <ItemGroup>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[2.2.4, 3.0)" />
   </ItemGroup>

diff --git a/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj b/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.EntityFrameworkCore.SqlServer</PackageId>
     <Description>OSharp(.NetStandard2.0)数据访问组件，封装EntityFrameworkCore的SqlServer数据访问功能的实现</Description>
     <Summary>OSharp(.NetStandard2.0)数据访问组件SqlServer</Summary>
     <RootNamespace>OSharp.Entity.SqlServer</RootNamespace>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>bin\Debug\netstandard2.0\OSharp.EntityFrameworkCore.SqlServer.xml</DocumentationFile>
   </PropertyGroup>

diff --git a/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj b/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <RootNamespace>OSharp.Entity.Sqlite</RootNamespace>
     <PackageId>OSharpNS.EntityFrameworkCore.Sqlite</PackageId>
     <Description>OSharp(.NetStandard2.0)数据访问组件，封装EntityFrameworkCore的Sqlite数据访问功能的实现</Description>
     <Summary>OSharp(.NetStandard2.0)数据访问组件Sqlite</Summary>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>bin\Debug\netstandard2.0\OSharp.EntityFrameworkCore.Sqlite.xml</DocumentationFile>
   </PropertyGroup>

diff --git a/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj b/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
   <PropertyGroup>
     <PackageId>OSharpNS.EntityFrameworkCore</PackageId>
     <Description>OSharp(.NetStandard2.0)数据访问组件，封装EntityFrameworkCore数据访问功能的实现</Description>
     <Summary>OSharp(.NetStandard2.0)数据访问组件</Summary>
     <RootNamespace>OSharp.Entity</RootNamespace>
   </PropertyGroup>
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>bin\Debug\netstandard2.0\OSharp.EntityFrameworkCore.xml</DocumentationFile>
   </PropertyGroup>

diff --git a/src/OSharp.Exceptionless/OSharp.Exceptionless.csproj b/src/OSharp.Exceptionless/OSharp.Exceptionless.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netcoreapp.props"/>
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.Exceptionless</PackageId>
     <Summary>OSharp(.NetStandard2.0) Exceptionless 分布式日志组件</Summary>
     <Description>OSharp(.NetStandard2.0) Exceptionless 分布式日志组件，封装基于Exceptionless 分布式日志记录实现</Description>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netcoreapp.props"/>
-  <Import Project="../../build/version.props" />
-
   <ItemGroup>
     <PackageReference Include="Exceptionless.AspNetCore" Version="4.3.2027" />
   </ItemGroup>

diff --git a/src/OSharp.Hangfire/OSharp.Hangfire.csproj b/src/OSharp.Hangfire/OSharp.Hangfire.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.Hangfire</PackageId>
     <Summary>OSharp(.NetStandard2.0) Hangfire 后台任务组件</Summary>
@@ -16,8 +19,6 @@
     <DocumentationFile>bin\Release\netstandard2.0\OSharp.Hangfire.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
   <ItemGroup>
     <PackageReference Include="Hangfire" Version="1.7.6" />
     <PackageReference Include="Hangfire.MemoryStorage.Core" Version="1.4.0" />

diff --git a/src/OSharp.Log4Net/OSharp.Log4Net.csproj b/src/OSharp.Log4Net/OSharp.Log4Net.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.Log4Net</PackageId>
     <Description>OSharp(.NetStandard2.0)Log4Net组件，封装使用log4net组件来实现框架的日志输出功能</Description>
@@ -14,8 +17,6 @@
     <DocumentationFile>bin\Release\netstandard2.0\OSharp.Log4Net.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.8" />
   </ItemGroup>

diff --git a/src/OSharp.MiniProfiler/OSharp.MiniProfiler.csproj b/src/OSharp.MiniProfiler/OSharp.MiniProfiler.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.MiniProfiler</PackageId>
     <Summary>OSharp(.NetStandard2.0) MiniProfiler 性能监测组件</Summary>
@@ -16,9 +19,6 @@
     <DocumentationFile>bin\Debug\netstandard2.0\OSharp.MiniProfiler.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
-
   <ItemGroup>
     <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.0.180" />
     <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.0.180" />

diff --git a/src/OSharp.NLog/OSharp.NLog.csproj b/src/OSharp.NLog/OSharp.NLog.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.NLog</PackageId>
     <Description>OSharp(.NetStandard2.0)NLog组件，封装使用nlog组件来实现框架的日志输出功能</Description>
@@ -14,8 +17,6 @@
     <DocumentationFile>bin\Release\netstandard2.0\OSharp.NLog.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
   <ItemGroup>
     <PackageReference Include="NLog" Version="4.6.7" />
   </ItemGroup>

diff --git a/src/OSharp.Permissions/OSharp.Permissions.csproj b/src/OSharp.Permissions/OSharp.Permissions.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.Permissions</PackageId>
     <Summary>OSharp(.NetStandard2.0)核心组件</Summary>
@@ -15,8 +18,6 @@
     <DocumentationFile>bin\Debug\netstandard2.0\OSharp.Permissions.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
   <ItemGroup>
     <Compile Remove="Authentication\**" />
     <EmbeddedResource Remove="Authentication\**" />

diff --git a/src/OSharp.Redis/OSharp.Redis.csproj b/src/OSharp.Redis/OSharp.Redis.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.Redis</PackageId>
     <Summary>OSharp(.NetStandard2.0) Redis 缓存组件</Summary>
@@ -15,9 +18,6 @@
     <DocumentationFile>bin\Release\netstandard2.0\OSharp.Redis.xml</DocumentationFile>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
   </ItemGroup>

diff --git a/src/OSharp.Swagger/OSharp.Swagger.csproj b/src/OSharp.Swagger/OSharp.Swagger.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="../../build/public.netstandard.props" />
+  <Import Project="../../build/version.props" />
+
   <PropertyGroup>
     <PackageId>OSharpNS.Swagger</PackageId>
     <Summary>OSharp(.NetStandard2.0) Swagger 客户端组件</Summary>
     <Description>OSharp(.NetStandard2.0) Swagger 客户端组件，封装基于Redis客户端实现</Description>
   </PropertyGroup>
 
-  <Import Project="../../build/public.netstandard.props" />
-  <Import Project="../../build/version.props" />
   <ItemGroup>
     <None Remove="index.html" />
   </ItemGroup>