升级nuget包 增加单文件发布配置

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -20,16 +20,16 @@
 
   <ItemGroup>
     <PackageReference Include="Caching.CSRedis" Version="3.8.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.5.1" />
-    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.5.1" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.5.1" />
-    <PackageReference Include="Furion.Pure" Version="3.5.1" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.5.2" />
+    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.5.2" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.5.2" />
+    <PackageReference Include="Furion.Pure" Version="3.5.2" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="MySql.Data" Version="8.0.29" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.5" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.14.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.10.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.0.8.8" />
+    <PackageReference Include="SqlSugarCore" Version="5.0.8.9" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.18" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.12" />

Admin.NET/Admin.NET.Core/Entity/EntityBase.cs

@@ -56,6 +56,7 @@ public abstract class DataEntityBase : EntityBase
     /// <summary>
     /// 创建者部门Id
     /// </summary>
+    [SugarColumn(ColumnDescription = "创建者部门Id")]
     public virtual long? CreateOrgId { get; set; }
 }
 

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarRepository.cs

@@ -6,11 +6,11 @@
 /// <typeparam name="T"></typeparam>
 public class SqlSugarRepository<T> : SimpleClient<T> where T : class, new()
 {
-    // protected ITenant itenant = null; // 多租户事务
+    protected ITenant iTenant = null; // 多租户事务
 
     public SqlSugarRepository(ISqlSugarClient context = null) : base(context) // 默认值等于null不能少
     {
-        base.Context = App.GetService<ISqlSugarClient>().AsTenant().GetConnectionWithAttr<T>();
-        //itenant = App.GetService<ISqlSugarClient>().AsTenant() ;
+        iTenant = App.GetService<ISqlSugarClient>().AsTenant();        
+        base.Context = iTenant.GetConnectionWithAttr<T>();
     }
 }

Admin.NET/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\CODEWORK\Admin.NET-Next\Admin.NET\Admin.NET.Web.Entry\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\CODEWORK\Admin.NET\Admin.NET\Admin.NET.Web.Entry\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
     <ActiveDebugProfile>IIS Express</ActiveDebugProfile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Admin.NET/Admin.NET.Web.Entry/Properties/PublishProfiles/FolderProfile1.pubxml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>publish\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <SiteUrlToLaunchAfterPublish />
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <ProjectGuid>11ea630b-4600-4236-a117-ce6c6cd67586</ProjectGuid>
+    <SelfContained>true</SelfContained>
+  </PropertyGroup>
+</Project>

Admin.NET/Admin.NET.Web.Entry/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <_PublishTargetUrl>D:\CODEWORK\Admin.NET\Admin.NET\Admin.NET.Web.Entry\publish\</_PublishTargetUrl>
+    <History>True|2022-06-11T15:23:24.0217186Z;</History>
+  </PropertyGroup>
+</Project>

Admin.NET/Admin.NET.Web.Entry/SingleFilePublish.cs

@@ -0,0 +1,37 @@
+using Furion;
+using System.Reflection;
+
+namespace Admin.NET.Web.Entry;
+
+/// <summary>
+/// 解决单文件发布问题
+/// </summary>
+public class SingleFilePublish : ISingleFilePublish
+{
+    /// <summary>
+    /// 解决单文件不能扫描的程序集
+    /// </summary>
+    /// <remarks>和 <see cref="IncludeAssemblyNames"/>可同时配置</remarks>
+    /// <returns></returns>
+    public Assembly[] IncludeAssemblies()
+    {
+        // 需要 Furion 框架扫描哪些程序集就写上去即可
+        return Array.Empty<Assembly>();
+    }
+
+    /// <summary>
+    /// 解决单文件不能扫描的程序集名称
+    /// </summary>
+    /// <remarks>和 <see cref="IncludeAssemblies"/>可同时配置</remarks>
+    /// <returns></returns>
+    public string[] IncludeAssemblyNames()
+    {
+        // 需要 Furion 框架扫描哪些程序集就写上去即可
+        return new[]
+        {
+            "Admin.NET.Application",
+            "Admin.NET.Core",
+            "Admin.NET.Web.Core"
+        };
+    }
+}