fix: 更新配置文件引用

jianxuanbing · jianxuanbing · commit 507554077a47 · 2021-01-08T10:27:48.000+08:00
diff --git a/Bing.All.sln b/Bing.All.sln
@@ -61,6 +61,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_SolutionItems", "_Solution
 		framework.props = framework.props
 		LICENSE = LICENSE
 		README.md = README.md
+		version.dev.props = version.dev.props
 		version.props = version.props
 	EndProjectSection
 EndProject
@@ -201,7 +202,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Events.Cap.MySql", "fr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Caching.FreeRedis", "framework\src\Bing.Caching.FreeRedis\Bing.Caching.FreeRedis.csproj", "{591D9280-33FD-4090-AFBE-D513A2A18316}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bing.Admin.FreeSQL", "modules\admin\src\Bing.Admin.FreeSQL\Bing.Admin.FreeSQL.csproj", "{872470DC-8FC6-4AD4-BE9E-F3F2CA9DC616}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Admin.FreeSQL", "modules\admin\src\Bing.Admin.FreeSQL\Bing.Admin.FreeSQL.csproj", "{872470DC-8FC6-4AD4-BE9E-F3F2CA9DC616}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/common.props b/common.props
@@ -27,4 +27,6 @@
   <Import Project="asset/props/misc.props"/>
 
   <Import Project="./version.props"/>
+
+  <Import Project="./version.dev.props"/>
 </Project>
diff --git a/framework.props b/framework.props
@@ -31,4 +31,6 @@
   <Import Project="asset/props/misc.props"/>
 
   <Import Project="./common.props"/>
+
+
 </Project>
diff --git a/framework/src/Bing.AspNetCore/Bing.AspNetCore._shared.props b/framework/src/Bing.AspNetCore/Bing.AspNetCore._shared.props
@@ -1,6 +1,6 @@
 ﻿<Project>
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netstandard2.0;</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/framework/src/Bing.Caching.FreeRedis/Bing.Caching.FreeRedis.csproj b/framework/src/Bing.Caching.FreeRedis/Bing.Caching.FreeRedis.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FreeRedis" Version="0.1.4" />
+    <PackageReference Include="FreeRedis" Version="0.2.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/framework/src/Bing.Datas.EntityFramework.MySql/Bing.Datas.EntityFramework.MySql._shared.props b/framework/src/Bing.Datas.EntityFramework.MySql/Bing.Datas.EntityFramework.MySql._shared.props
@@ -13,12 +13,4 @@
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
   </ItemGroup>
 
-  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.6" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
-  </ItemGroup>-->
-
 </Project>
diff --git a/framework/src/Bing.Datas.EntityFramework.SqlServer/Bing.Datas.EntityFramework.SqlServer._shared.props b/framework/src/Bing.Datas.EntityFramework.SqlServer/Bing.Datas.EntityFramework.SqlServer._shared.props
@@ -10,15 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftPackageVersion)" />
   </ItemGroup>
 
-  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.6" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.10" />
-  </ItemGroup>-->
-
 </Project>
diff --git a/framework/src/Bing.Datas.EntityFramework.Sqlite/Bing.Datas.EntityFramework.Sqlite._shared.props b/framework/src/Bing.Datas.EntityFramework.Sqlite/Bing.Datas.EntityFramework.Sqlite._shared.props
@@ -10,15 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftPackageVersion)" />
   </ItemGroup>
 
-  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.10" />
-  </ItemGroup>-->
-
 </Project>
diff --git a/framework/src/Bing.Datas.EntityFramework/Bing.Datas.EntityFramework._shared.props b/framework/src/Bing.Datas.EntityFramework/Bing.Datas.EntityFramework._shared.props
@@ -12,29 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.10" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftPackageVersion)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftPackageVersion)" />
   </ItemGroup>
 
-  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.6" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.10" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.10" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>NETSTANDARD</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <DefineConstants>NETCOREAPP3_1</DefineConstants>
-  </PropertyGroup>-->
-
 </Project>
diff --git a/framework/src/Bing.Events/Bing.Events._shared.props b/framework/src/Bing.Events/Bing.Events._shared.props
@@ -14,20 +14,4 @@
     <PackageReference Include="DotNetCore.CAP" Version="3.1.1" />
   </ItemGroup>
 
-  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="DotNetCore.CAP" Version="2.6.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="DotNetCore.CAP" Version="3.1.1" />
-  </ItemGroup>-->
-
-  <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>NETSTANDARD</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <DefineConstants>NETCOREAPP3_1</DefineConstants>
-  </PropertyGroup>-->
-
 </Project>
diff --git a/framework/src/Bing.Events/Cap/MessageEventBus.cs b/framework/src/Bing.Events/Cap/MessageEventBus.cs
@@ -5,7 +5,6 @@
 using Bing.Logs;
 using Bing.Utils.Json;
 using DotNetCore.CAP;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Bing.Events.Cap
 {
diff --git a/framework/src/Bing.Events/EventHandlerAttribute.cs b/framework/src/Bing.Events/EventHandlerAttribute.cs
@@ -1,9 +1,4 @@
-﻿//#if NETCOREAPP3_1
-//using DotNetCore.CAP.Internal;
-//#else
-//using DotNetCore.CAP.Abstractions;
-//#endif
-using DotNetCore.CAP.Internal;
+﻿using DotNetCore.CAP.Internal;
 
 namespace Bing.Events
 {
diff --git a/framework/src/Bing.FreeSQL.MySql/Bing.FreeSQL.MySql._shared.props b/framework/src/Bing.FreeSQL.MySql/Bing.FreeSQL.MySql._shared.props
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FreeSql.Provider.MySqlConnector" Version="2.0.0-preview1120" />
+    <PackageReference Include="FreeSql.Provider.MySqlConnector" Version="2.0.105" />
   </ItemGroup>
 
 </Project>
diff --git a/framework/src/Bing.FreeSQL/Bing.FreeSQL._shared.props b/framework/src/Bing.FreeSQL/Bing.FreeSQL._shared.props
@@ -12,9 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FreeSql" Version="2.0.0-preview1120" />
-    <PackageReference Include="FreeSql.DbContext" Version="2.0.0-preview1120" />
-    <PackageReference Include="FreeSql.Extensions.Linq" Version="2.0.0-preview1119" />
+    <PackageReference Include="FreeSql" Version="2.0.105" />
+    <PackageReference Include="FreeSql.DbContext" Version="2.0.105" />
+    <PackageReference Include="FreeSql.Extensions.Linq" Version="2.0.105" />
   </ItemGroup>
 
 </Project>
diff --git a/framework/src/Bing.MiniProfiler/Bing.MiniProfiler._shared.props b/framework/src/Bing.MiniProfiler/Bing.MiniProfiler._shared.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.1" />
+    <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/framework/src/Bing.Permissions/Bing.Permissions._shared.props b/framework/src/Bing.Permissions/Bing.Permissions._shared.props
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/framework/src/Bing.Security/Bing.Security._shared.props b/framework/src/Bing.Security/Bing.Security._shared.props
@@ -6,21 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!--<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="2.2.0" />-->
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="3.1.10" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="$(MicrosoftPackageVersion)" />
   </ItemGroup>
 
-  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="2.2.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="3.1.10" />
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>-->
-
   <ItemGroup>
     <ProjectReference Include="..\Bing\Bing.csproj" />
   </ItemGroup>
diff --git a/framework/src/Bing/Bing._shared.props b/framework/src/Bing/Bing._shared.props
@@ -8,24 +8,16 @@
   <ItemGroup>
     <PackageReference Include="AspectCore.Extensions.AspectScope" Version="2.1.0" />
     <PackageReference Include="AspectCore.Extensions.Configuration" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
     <PackageReference Include="AspectCore.Extensions.DependencyInjection" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.5" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.10" />
     <PackageReference Include="Bing.Utils" Version="1.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
-  </ItemGroup>
-  
-  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="2.2.0" />
+
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
   </ItemGroup>
-  
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.10" />
-  </ItemGroup>-->
 
   <ItemGroup>
     <Compile Update="Properties\LibraryResource.Designer.cs">
diff --git a/framework/src/Bing/Bing.csproj b/framework/src/Bing/Bing.csproj
@@ -3,4 +3,13 @@
 
   <Import Project="..\..\..\framework.props" />
 
+  <ItemGroup>
+    <Compile Update="Properties\LibraryResource.Designer.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Update="Properties\R.Designer.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/framework/tests/Directory.Build.props b/framework/tests/Directory.Build.props
@@ -16,8 +16,6 @@
     <PackageReference Include="xunit" Version="2.*" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.*" />
     <PackageReference Include="NSubstitute" Version="4.*" />
-    <!--<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.*" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.*" />-->
     <PackageReference Include="Castle.Core" Version="4.*" />
     <PackageReference Include="Shouldly" Version="3.0.2" />
   </ItemGroup>
diff --git a/version.dev.props b/version.dev.props
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <!-- All Microsoft packages -->
+    <MicrosoftPackageVersion>3.1.*</MicrosoftPackageVersion>
+  </PropertyGroup>
+</Project>
