From 0df71a8c0a2dc284b85cc43a1fe70ee9c6134a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=98=8E=E9=94=8B?= <gmf520@yeah.net>
Date: Fri, 2 Apr 2021 16:01:54 +0800
Subject: [PATCH] =?UTF-8?q?publish(nuget):=20=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BAv5.0.4=EF=BC=8C=E5=8F=91=E5=B8=83nug?=
 =?UTF-8?q?et?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/OSharpNS.nuspec | 12 ++++++------
 build/nuget-build.bat | 31 -------------------------------
 build/version.props   |  4 ++--
 3 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 build/nuget-build.bat

diff --git a/build/OSharpNS.nuspec b/build/OSharpNS.nuspec
index 41446f42d..e7f906b2e 100644
--- a/build/OSharpNS.nuspec
+++ b/build/OSharpNS.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>OSharpNS</id>
-    <version>5.0.4-preview.329</version>
+    <version>5.0.4</version>
     <title>OSharpFramework(.NETCoreApp3.1)</title>
     <authors>柳柳软件(66soft.net)</authors>
     <owners>LiuliuSoft nnc</owners>
@@ -16,11 +16,11 @@
     <tags>osharp osharpns</tags>
     <dependencies>
       <group targetFramework=".NETCoreApp3.1">
-        <dependency id="OSharpNS.Core" version="5.0.4-preview.329" />
-        <dependency id="OSharpNS.EntityFrameworkCore" version="5.0.4-preview.329" />
-        <dependency id="OSharpNS.AutoMapper" version="5.0.4-preview.329" />
-        <dependency id="OSharpNS.AspNetCore" version="5.0.4-preview.329" />
-        <dependency id="OSharpNS.Log4Net" version="5.0.4-preview.329" />
+        <dependency id="OSharpNS.Core" version="5.0.4" />
+        <dependency id="OSharpNS.EntityFrameworkCore" version="5.0.4" />
+        <dependency id="OSharpNS.AutoMapper" version="5.0.4" />
+        <dependency id="OSharpNS.AspNetCore" version="5.0.4" />
+        <dependency id="OSharpNS.Log4Net" version="5.0.4" />
       </group>
     </dependencies>
   </metadata>
diff --git a/build/nuget-build.bat b/build/nuget-build.bat
deleted file mode 100644
index f4f633b79..000000000
--- a/build/nuget-build.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-del /f /s /q nupkgs\*.*
-
-dotnet build ../osharp.sln -c Release
-
-dotnet pack ../src/OSharp/OSharp.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.AspNetCore/OSharp.AspNetCore.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Authorization.Datas/OSharp.Authorization.Datas.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.AutoMapper/OSharp.AutoMapper.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.EntityFrameworkCore.MySql/OSharp.EntityFrameworkCore.MySql.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Exceptionless/OSharp.Exceptionless.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Hangfire/OSharp.Hangfire.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Hosting.Apis/OSharp.Hosting.Apis.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Hosting.Core/OSharp.Hosting.Core.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Hosting.EntityConfiguration/OSharp.Hosting.EntityConfiguration.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Identity/OSharp.Identity.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Log4Net/OSharp.Log4Net.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.MiniProfiler/OSharp.MiniProfiler.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Redis/OSharp.Redis.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Swagger/OSharp.Swagger.csproj -c Release --output nupkgs
-dotnet pack ../src/OSharp.Wpf/OSharp.Wpf.csproj -c Release --output nupkgs
-
-nuget pack ./osharpns.nuspec -OutputDirectory nupkgs
-
-start "" nupkgs
-exit
\ No newline at end of file
diff --git a/build/version.props b/build/version.props
index b36f325c8..0b5ac8f73 100644
--- a/build/version.props
+++ b/build/version.props
@@ -5,8 +5,8 @@
     <VersionSuffix>-preview.</VersionSuffix>
     <VersionSuffixVersion>329</VersionSuffixVersion>
     <Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
-    <!--<Version>$(VersionMain).$(VersionPrefix)</Version>-->
-    <AssemblyVersion>$(VersionMain).$(VersionPrefix)</AssemblyVersion>
+    <Version>$(VersionMain).$(VersionPrefix)</Version>
+    <!--<AssemblyVersion>$(VersionMain).$(VersionPrefix)</AssemblyVersion>-->
     <FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
   </PropertyGroup>
 </Project>