From ed6054b082990fc1985954658772c3f1bbab4440 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Wed, 9 Oct 2024 14:35:27 +0200 Subject: [PATCH 1/3] Updated Microsoft Components for 8.0.8 to 8.0.10 Tested on upgrade and new Oqtane instance creation. --- Oqtane.Client/Oqtane.Client.csproj | 8 +-- .../Oqtane.Database.PostgreSQL.csproj | 2 +- .../Oqtane.Database.SqlServer.csproj | 2 +- .../Oqtane.Database.Sqlite.csproj | 2 +- Oqtane.Server/--appsettings.json | 63 +++++++++++++++++++ Oqtane.Server/--appsettings.release.json | 48 ++++++++++++++ Oqtane.Server/Oqtane.Server.csproj | 14 ++--- Oqtane.Server/appsettings.release.json | 2 +- Oqtane.Shared/Oqtane.Shared.csproj | 8 +-- 9 files changed, 130 insertions(+), 19 deletions(-) create mode 100644 Oqtane.Server/--appsettings.json create mode 100644 Oqtane.Server/--appsettings.release.json diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index 034ec87b..72c6447c 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -22,10 +22,10 @@ - - - - + + + + diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj index 789a6611..111a1251 100644 --- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj +++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj @@ -34,7 +34,7 @@ - + diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj index 61124187..48f7282f 100644 --- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj +++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj @@ -33,7 +33,7 @@ - + diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj index 2a41a397..1fa10f5b 100644 --- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj +++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj @@ -33,7 +33,7 @@ - + diff --git a/Oqtane.Server/--appsettings.json b/Oqtane.Server/--appsettings.json new file mode 100644 index 00000000..d670835f --- /dev/null +++ b/Oqtane.Server/--appsettings.json @@ -0,0 +1,63 @@ +{ + "RenderMode": "Interactive", + "Runtime": "Server", + "Database": { + "DefaultDBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" + }, + "ConnectionStrings": { + "DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\\Oqtane-Fork.mdf;Initial Catalog=Oqtane-Fork;Integrated Security=SSPI;Encrypt=false;" + }, + "Installation": { + "DefaultAlias": "", + "HostPassword": "", + "HostEmail": "", + "SiteTemplate": "", + "DefaultTheme": "", + "DefaultContainer": "" + }, + "Localization": { + "DefaultCulture": "en" + }, + "AvailableDatabases": [ + { + "Name": "LocalDB", + "ControlType": "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client", + "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" + }, + { + "Name": "SQL Server", + "ControlType": "Oqtane.Installer.Controls.SqlServerConfig, Oqtane.Client", + "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" + }, + { + "Name": "SQLite", + "ControlType": "Oqtane.Installer.Controls.SqliteConfig, Oqtane.Client", + "DBType": "Oqtane.Database.Sqlite.SqliteDatabase, Oqtane.Database.Sqlite" + }, + { + "Name": "MySQL", + "ControlType": "Oqtane.Installer.Controls.MySQLConfig, Oqtane.Client", + "DBType": "Oqtane.Database.MySQL.MySQLDatabase, Oqtane.Database.MySQL" + }, + { + "Name": "PostgreSQL", + "ControlType": "Oqtane.Installer.Controls.PostgreSQLConfig, Oqtane.Client", + "DBType": "Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Database.PostgreSQL" + } + ], + "Logging": { + "FileLogger": { + "LogLevel": { + "Default": "Error" + } + }, + "LogLevel": { + "Default": "Information" + } + }, + "InstallationId": "b9ab2e37-8983-40ef-83cd-1e3285129a6c", + "ReCaptcha": { + "SiteKey": "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI", + "SecretKey": "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe" + } +} \ No newline at end of file diff --git a/Oqtane.Server/--appsettings.release.json b/Oqtane.Server/--appsettings.release.json new file mode 100644 index 00000000..3b74ae04 --- /dev/null +++ b/Oqtane.Server/--appsettings.release.json @@ -0,0 +1,48 @@ +{ + "RenderMode": "Interactive", + "Runtime": "Server", + "Database": { + "DefaultDBType": "" + }, + "ConnectionStrings": { + "DefaultConnection": "" + }, + "Installation": { + "DefaultAlias": "", + "HostPassword": "", + "HostEmail": "", + "SiteTemplate": "", + "DefaultTheme": "", + "DefaultContainer": "" + }, + "Localization": { + "DefaultCulture": "en" + }, + "AvailableDatabases": [ + { + "Name": "LocalDB", + "ControlType": "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client", + "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" + }, + { + "Name": "SQL Server", + "ControlType": "Oqtane.Installer.Controls.SqlServerConfig, Oqtane.Client", + "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" + }, + { + "Name": "SQLite", + "ControlType": "Oqtane.Installer.Controls.SqliteConfig, Oqtane.Client", + "DBType": "Oqtane.Database.Sqlite.SqliteDatabase, Oqtane.Database.Sqlite" + }, + { + "Name": "MySQL", + "ControlType": "Oqtane.Installer.Controls.MySQLConfig, Oqtane.Client", + "DBType": "Oqtane.Database.MySQL.MySQLDatabase, Oqtane.Database.MySQL" + }, + { + "Name": "PostgreSQL", + "ControlType": "Oqtane.Installer.Controls.PostgreSQLConfig, Oqtane.Client", + "DBType": "Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Database.PostgreSQL" + } + ] +} diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 7530c9c0..d5c51ea8 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -34,19 +34,19 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + diff --git a/Oqtane.Server/appsettings.release.json b/Oqtane.Server/appsettings.release.json index 3b74ae04..8549fa0b 100644 --- a/Oqtane.Server/appsettings.release.json +++ b/Oqtane.Server/appsettings.release.json @@ -1,6 +1,6 @@ { - "RenderMode": "Interactive", "Runtime": "Server", + "RenderMode": "ServerPrerendered", "Database": { "DefaultDBType": "" }, diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj index 1b61bcef..ab34bf21 100644 --- a/Oqtane.Shared/Oqtane.Shared.csproj +++ b/Oqtane.Shared/Oqtane.Shared.csproj @@ -19,11 +19,11 @@ - - - + + + - + From 4c4255be6b47316f84511ec153a1bace59d6c77d Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Wed, 9 Oct 2024 14:42:07 +0200 Subject: [PATCH 2/3] Updated Template files with new component version 8.0.10 --- .../Client/[Owner].Module.[Module].Client.csproj | 10 +++++----- .../Server/[Owner].Module.[Module].Server.csproj | 8 ++++---- .../Client/[Owner].Theme.[Theme].Client.csproj | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj index 9d3a0460..21ef0312 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj index e8540965..8a9cfe06 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj index 2dca8a8e..48056a8a 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj @@ -13,9 +13,9 @@ - - - + + + From 3d83fccbf19671128199e23dc6f6504dc242b879 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Wed, 9 Oct 2024 15:07:57 +0200 Subject: [PATCH 3/3] remove appsettings --- Oqtane.Server/--appsettings.json | 63 ------------------------ Oqtane.Server/--appsettings.release.json | 48 ------------------ Oqtane.Server/appsettings.release.json | 2 +- 3 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 Oqtane.Server/--appsettings.json delete mode 100644 Oqtane.Server/--appsettings.release.json diff --git a/Oqtane.Server/--appsettings.json b/Oqtane.Server/--appsettings.json deleted file mode 100644 index d670835f..00000000 --- a/Oqtane.Server/--appsettings.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "RenderMode": "Interactive", - "Runtime": "Server", - "Database": { - "DefaultDBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" - }, - "ConnectionStrings": { - "DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\\Oqtane-Fork.mdf;Initial Catalog=Oqtane-Fork;Integrated Security=SSPI;Encrypt=false;" - }, - "Installation": { - "DefaultAlias": "", - "HostPassword": "", - "HostEmail": "", - "SiteTemplate": "", - "DefaultTheme": "", - "DefaultContainer": "" - }, - "Localization": { - "DefaultCulture": "en" - }, - "AvailableDatabases": [ - { - "Name": "LocalDB", - "ControlType": "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client", - "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" - }, - { - "Name": "SQL Server", - "ControlType": "Oqtane.Installer.Controls.SqlServerConfig, Oqtane.Client", - "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" - }, - { - "Name": "SQLite", - "ControlType": "Oqtane.Installer.Controls.SqliteConfig, Oqtane.Client", - "DBType": "Oqtane.Database.Sqlite.SqliteDatabase, Oqtane.Database.Sqlite" - }, - { - "Name": "MySQL", - "ControlType": "Oqtane.Installer.Controls.MySQLConfig, Oqtane.Client", - "DBType": "Oqtane.Database.MySQL.MySQLDatabase, Oqtane.Database.MySQL" - }, - { - "Name": "PostgreSQL", - "ControlType": "Oqtane.Installer.Controls.PostgreSQLConfig, Oqtane.Client", - "DBType": "Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Database.PostgreSQL" - } - ], - "Logging": { - "FileLogger": { - "LogLevel": { - "Default": "Error" - } - }, - "LogLevel": { - "Default": "Information" - } - }, - "InstallationId": "b9ab2e37-8983-40ef-83cd-1e3285129a6c", - "ReCaptcha": { - "SiteKey": "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI", - "SecretKey": "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe" - } -} \ No newline at end of file diff --git a/Oqtane.Server/--appsettings.release.json b/Oqtane.Server/--appsettings.release.json deleted file mode 100644 index 3b74ae04..00000000 --- a/Oqtane.Server/--appsettings.release.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "RenderMode": "Interactive", - "Runtime": "Server", - "Database": { - "DefaultDBType": "" - }, - "ConnectionStrings": { - "DefaultConnection": "" - }, - "Installation": { - "DefaultAlias": "", - "HostPassword": "", - "HostEmail": "", - "SiteTemplate": "", - "DefaultTheme": "", - "DefaultContainer": "" - }, - "Localization": { - "DefaultCulture": "en" - }, - "AvailableDatabases": [ - { - "Name": "LocalDB", - "ControlType": "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client", - "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" - }, - { - "Name": "SQL Server", - "ControlType": "Oqtane.Installer.Controls.SqlServerConfig, Oqtane.Client", - "DBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" - }, - { - "Name": "SQLite", - "ControlType": "Oqtane.Installer.Controls.SqliteConfig, Oqtane.Client", - "DBType": "Oqtane.Database.Sqlite.SqliteDatabase, Oqtane.Database.Sqlite" - }, - { - "Name": "MySQL", - "ControlType": "Oqtane.Installer.Controls.MySQLConfig, Oqtane.Client", - "DBType": "Oqtane.Database.MySQL.MySQLDatabase, Oqtane.Database.MySQL" - }, - { - "Name": "PostgreSQL", - "ControlType": "Oqtane.Installer.Controls.PostgreSQLConfig, Oqtane.Client", - "DBType": "Oqtane.Database.PostgreSQL.PostgreSQLDatabase, Oqtane.Database.PostgreSQL" - } - ] -} diff --git a/Oqtane.Server/appsettings.release.json b/Oqtane.Server/appsettings.release.json index 8549fa0b..3b74ae04 100644 --- a/Oqtane.Server/appsettings.release.json +++ b/Oqtane.Server/appsettings.release.json @@ -1,6 +1,6 @@ { + "RenderMode": "Interactive", "Runtime": "Server", - "RenderMode": "ServerPrerendered", "Database": { "DefaultDBType": "" },