JR.Cms v3.2

.gitignore

@@ -25,3 +25,4 @@ packages
 /script/generator/generated_code
 output
 
+/cms/core/JR.Cms.Core/*.user

bootstrap/JR.Cms.Bootstrap/Properties/AssemblyInfo.cs

@@ -15,7 +15,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("JR.Cms .NET！The cross platform content manage system.")]
-[assembly: AssemblyCopyright("Copyright To2.Net 2008-2019")]
+[assembly: AssemblyCopyright("Copyright to2.net 2008-2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

cms/core/JR.Cms.Core/Conf/CmsVariables.cs

@@ -6,7 +6,7 @@ public class CmsVariables
         /// <summary>
     	/// 版本号
     	/// </summary>
-        public const string VERSION="3.2.002";
+        public const string VERSION="3.2.004";
 
         /// <summary>
         /// 框架目录

patch/upgrade.xml → cms/core/JR.Cms.Core/Conf/upgrade.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<upgrade version="3.2.001" patch="cms.patch.zip">
+<upgrade version="3.2.004" patch="cms-patch.zip">
 <![CDATA[
 
-JRCMS 版本:v3.2.001  build20181220
+JRCMS 版本:v3.2.004  build20181220
 =============================================
 1.系统栏目重构，支持同名的栏目
 2.修改已知的问题

cms/core/JR.Cms.Core/JR.Cms.Core.csproj

@@ -124,7 +124,7 @@
   <ItemGroup />
   <ItemGroup>
     <Content Include="_#upgrade\upgrade.sql" />
-    <Content Include="_#upgrade\upgrade.xml" />
+    <Content Include="Conf\upgrade.xml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Cache\JR.Cms.CacheService\JR.Cms.CacheService.csproj">

cms/core/JR.Cms.Core/Updater.cs

@@ -68,7 +68,7 @@ static Updater()
                     if (UpgradePercent < 0.3F) UpgradePercent = 0.3F;
 
                     //最后更新dll
-                    UpgradeFile("bin.zip", UpgradeFileType.Zip,UpgadeDir, false);
+                    UpgradeFile("boot.zip", UpgradeFileType.Zip,UpgadeDir, false);
 
                     //v2.1 版本切换至于sponet.dll
                 }

script/build.sh

@@ -4,11 +4,19 @@ echo "======================================="
 echo "= JR Cms .NET ! assembly ="
 echo "======================================="
 
-echo scanning assemblies...
+echo scanning assemblies... && cd ..
 
-cur=$(pwd)
+dist_dir=$(pwd)/dist
+tmp_dir=$(pwd)/dist/tmp
+dll_dir=$(pwd)/refrence.dll
+exe_dir=$(pwd)/script
+
+rm -rf $dist_dir/patch && rm -rf $dist_dir/*.zip
+
+mkdir -p $tmp_dir/templates \
+        && mkdir -p $tmp_dir/bin \
+        && mkdir -p $tmp_dir/../patch
 
-cd ../bin
 
 echo "1. build dll "
 
@@ -17,7 +25,7 @@ echo "1. build dll "
 #cd %dir%/src/bin/
 #echo  /keyfile:%dir%\src\JR.cms.snk>nul
 
-${cur}/merge.exe -closed -ndebug \
+cd ./bin && $exe_dir/merge.exe -closed -ndebug \
 	/keyfile:../cms/jr.cms.snk \
 	/targetplatform:v4 /target:dll /out:../dist/jrcms.dll \
  	JR.Cms.Core.dll JR.Cms.BLL.dll JR.Cms.DAL.dll \
@@ -31,13 +39,6 @@ ${cur}/merge.exe -closed -ndebug \
 	&& cd ..
 
 echo "2. prepare files"
-tmp_dir=$(pwd)/dist/tmp
-dll_dir=$(pwd)/refrence.dll
-exe_dir=$(pwd)/script
-
-rm -rf $tmp_dir && mkdir -p $tmp_dir/templates \
-	&& mkdir -p $tmp_dir/bin \
-	&& mkdir -p $tmp_dir/../patch
 
 cd $(find . -path "*/JR.Cms.WebUI") && \
 	cp -r \$server install plugins public \
@@ -52,9 +53,15 @@ cp LICENSE README.md $tmp_dir && cp dist/boot.dll \
 cp dist/jrcms.dll $dll_dir/jrdev* $tmp_dir/public/assemblies 
 
 echo "3. package upgrade zip"
-cd $tmp_dir && cp -r $(find $exe_dir/../cms -name "upgrade.xml") ../patch \
-	&& $exe_dir/7z.exe a -tzip ../patch/boot.zip bin >/dev/null \
-	&& $exe_dir/7z.exe a -tzip ../patch/cms-patch.zip >/dev/null
+# copy upgrade.xml
+cd $tmp_dir && cp -r $(find $exe_dir/../cms -name "upgrade.xml") ../patch
+# copy bin folder
+mv bin/System.Data.SQLite.dll bin/System.Data.SQLite.dll.bak \
+	&& $exe_dir/7z.exe a -tzip ../patch/boot.zip bin/*.dll >/dev/null \
+	&& mv  bin/System.Data.SQLite.dll.bak  bin/System.Data.SQLite.dll
+# copy patch folders
+$exe_dir/7z.exe a -tzip ../patch/cms-patch.zip public \
+	plugins README.md LICENSE >/dev/null
 
 echo "4. package all" 
 $exe_dir/7z.exe a -tzip ../jrcms-dist-1.0.zip * >/dev/null