Merge pull request #669 from sbwalker/master

modifications for System Update

Oqtane.Package/Oqtane.Framework.nuspec

@@ -17,12 +17,7 @@
     <summary>A modular application framework for Blazor</summary>
   </metadata>
   <files>
-    <file src="..\Oqtane.Client\bin\Release\netstandard2.1\Oqtane.Client.dll" target="lib\netcoreapp3.1" /> 
-    <file src="..\Oqtane.Client\bin\Release\netstandard2.1\Oqtane.Client.pdb" target="lib\netcoreapp3.1" /> 
-    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.dll" target="lib\netcoreapp3.1" /> 
-    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.pdb" target="lib\netcoreapp3.1" /> 
-    <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.dll" target="lib\netcoreapp3.1" /> 
-    <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.pdb" target="lib\netcoreapp3.1" /> 
-    <file src="..\Oqtane.Server\wwwroot\**\*.*" target="wwwroot" /> 
+    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\*.*" target="lib\netcoreapp3.1" /> 
+    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\wwwroot\**\*.*" target="wwwroot" /> 
   </files>
 </package>

Oqtane.Package/install.ps1

@@ -0,0 +1 @@
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\*" -DestinationPath "..\Oqtane.Server\bin\Release\Oqtane.Framework.Install.zip" -Force

Oqtane.Package/release.cmd

@@ -1,8 +1,18 @@
 del "*.nupkg"
 dotnet clean -c Release ..\Oqtane.sln 
 dotnet build -c Release ..\Oqtane.sln 
-dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release
-nuget.exe pack Oqtane.Framework.nuspec
 nuget.exe pack Oqtane.Client.nuspec
 nuget.exe pack Oqtane.Server.nuspec
 nuget.exe pack Oqtane.Shared.nuspec                  
+del /F/Q/S "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish" > NUL
+rmdir /Q/S "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish"
+dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release
+del "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\appsettings.json"
+ren "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\appsettings.release.json" "appsettings.json"
+C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\install.ps1"
+del "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\appsettings.json"
+C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\upgrade.ps1"
+del "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\Oqtane.Upgrade.*"
+nuget.exe pack Oqtane.Framework.nuspec
+
+

Oqtane.Package/upgrade.ps1

@@ -0,0 +1 @@
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\*" -DestinationPath "..\Oqtane.Server\bin\Release\Oqtane.Framework.Upgrade.zip" -Force

Oqtane.Server/Oqtane.Server.csproj

@@ -51,7 +51,9 @@
     <ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <UpgradeFiles Include="$(ProjectDir)bin\Release\netcoreapp3.1\Oqtane.Upgrade.deps.json" />
     <UpgradeFiles Include="$(ProjectDir)bin\Release\netcoreapp3.1\Oqtane.Upgrade.dll" />
+    <UpgradeFiles Include="$(ProjectDir)bin\Release\netcoreapp3.1\Oqtane.Upgrade.pdb" />
     <UpgradeFiles Include="$(ProjectDir)bin\Release\netcoreapp3.1\Oqtane.Upgrade.runtimeconfig.json" />
     <TemplateFiles Include="$(ProjectDir)wwwroot\Modules\Templates\**\*.*" />
   </ItemGroup>

Oqtane.Server/appsettings.release.json

@@ -0,0 +1,15 @@
+{
+  "Runtime": "Server",
+  "ConnectionStrings": {
+    "DefaultConnection": ""
+  },
+  "Installation": {
+    "DefaultAlias": "",
+    "HostPassword": "",
+    "HostEmail": "",
+    "SiteTemplate": "",
+    "DefaultTheme": "",
+    "DefaultLayout": "",
+    "DefaultContainer": ""
+  }
+}