Merge pull request #206 from meetmandeep/develop

Changes to Packager & Missing placeholder.htm
vanjarosoftware · Oct 13, 2020 · ddd6f1b · ddd6f1b
2 parents eeb5505 + f9db25a
commit ddd6f1b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/DesktopModules/Vanjaro/Core/Library/Packager/Packager.bat b/DesktopModules/Vanjaro/Core/Library/Packager/Packager.bat
@@ -383,6 +383,9 @@ del ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_Pl
 
 :: Vanjaro for DNN
 "C:\Program Files\7-Zip\7z.exe" a ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_For_DNN_"%Version%"_x64_Install.zip @PackageList.txt >NUL
+:: Copy it for Vanjaro Platform
+copy ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_For_DNN_"%Version%"_x64_Install.zip ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_Platform_"%Version%"_Install.zip >NUL
+
 "C:\Program Files\7-Zip\7z.exe" a ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_For_DNN_"%Version%"_x64_Install.zip Packager\Vanjaro\bin\x64\*.dll >NUL
 "C:\Program Files\7-Zip\7z.exe" rn ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_For_DNN_"%Version%"_x64_Install.zip Packager\Vanjaro\bin\x64\libsass.dll bin\libsass.dll >NUL
 
@@ -391,7 +394,6 @@ del ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_Pl
 "C:\Program Files\7-Zip\7z.exe" rn ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_For_DNN_"%Version%"_x86_Install.zip Packager\Vanjaro\bin\x86\libsass.dll bin\libsass.dll >NUL
 
 :: Vanjaro Platform 
-copy ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_For_DNN_"%Version%"_x64_Install.zip ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_Platform_"%Version%"_Install.zip >NUL
 "C:\Program Files\7-Zip\7z.exe" d -r ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_Platform_"%Version%"_Install.zip @DistrubtionRemoveList.txt >NUL
 "C:\Program Files\7-Zip\7z.exe" a ..\..\..\..\DesktopModules\Vanjaro\Core\Library\Packager\Releases\Vanjaro_Platform_"%Version%"_Install.zip @DistrubtionAddList.txt >NUL
 

diff --git a/DesktopModules/Vanjaro/UXManager/Library/Resources.txt b/DesktopModules/Vanjaro/UXManager/Library/Resources.txt
@@ -4,5 +4,6 @@ Resources\Scripts
 Resources\StyleSheets
 Resources\tui
 Resources\extension.html
+Resources\placeholder.html
 *.ascx
 *.cshtml
diff --git a/DesktopModules/Vanjaro/UXManager/Library/Vanjaro.UX.csproj b/DesktopModules/Vanjaro/UXManager/Library/Vanjaro.UX.csproj
@@ -167,7 +167,6 @@
     <Content Include="Resources\node_modules\.bin\webpack.config.js" />
     <Content Include="Resources\Scripts\Blocks\carousel.js" />
     <Content Include="Resources\Scripts\Blocks\config.js" />
-    <Content Include="Resources\library.html" />
     <Content Include="Resources\Scripts\Blocks\map.js" />
     <Content Include="Resources\Scripts\Blocks\heading.js" />
     <Content Include="Resources\Scripts\Blocks\icon.js" />