From 263946d0fcea765f85ff952e119f3ded7c65c189 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 15 Sep 2026 18:24:17 +0200 Subject: [PATCH] Update NuGet packages, publish profiles, and config - Bump Microsoft.NET.Test.Sdk, xunit.v3, MailKit, MimeKit, SixLabors.ImageSharp, Microsoft.Data.SqlClient, and Microsoft.Identity.Client.Extensions.Msal to latest patch versions - Publish ZIP filename now includes environment name (Development/Production) in Fuchs.csproj - Add FolderProfile-Dev.pubxml (Development) and FolderProfile.pubxml (Production) with EnvironmentName property - Fix connection string keys in appsettings.Development.json to match production; set IsTestDeployment=true for development - Set production DB and Azure Storage container names in appsettings.json; IsTestDeployment=false for production - Mark OCORE, OCORE_web, and eRechnungLib submodules as dirty (local changes) --- Fuchs.Tests/Fuchs.Tests.csproj | 4 ++-- Fuchs/Fuchs.csproj | 12 +++++++---- .../PublishProfiles/FolderProfile-Dev.pubxml | 21 +++++++++++++++++++ .../PublishProfiles/FolderProfile.pubxml | 1 + Fuchs/appsettings.Development.json | 5 +++-- Fuchs/appsettings.json | 8 +++---- MFR_RESTClient/MFR_RESTClient.csproj | 2 +- 7 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 Fuchs/Properties/PublishProfiles/FolderProfile-Dev.pubxml diff --git a/Fuchs.Tests/Fuchs.Tests.csproj b/Fuchs.Tests/Fuchs.Tests.csproj index cf64653..f4a93a7 100644 --- a/Fuchs.Tests/Fuchs.Tests.csproj +++ b/Fuchs.Tests/Fuchs.Tests.csproj @@ -9,8 +9,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Fuchs/Fuchs.csproj b/Fuchs/Fuchs.csproj index 6181750..4ca9050 100644 --- a/Fuchs/Fuchs.csproj +++ b/Fuchs/Fuchs.csproj @@ -32,7 +32,7 @@ - + @@ -47,11 +47,11 @@ - + - + @@ -90,12 +90,16 @@ <_ZipStamp>$([System.DateTime]::UtcNow.ToString("yyyyMMdd_HHmmss")) + + <_ZipEnvironmentTag Condition="'$(EnvironmentName)' != ''">$(EnvironmentName) + <_ZipEnvironmentTag Condition="'$(_ZipEnvironmentTag)' == ''">$(Configuration) <_SourceDir>$([System.IO.Path]::GetFullPath('$(PublishDir)')) <_ZipOutputDir Condition="'$(PublishUrl)' != ''">$([System.IO.Path]::GetFullPath('$(PublishUrl)\..\')) <_ZipOutputDir Condition="'$(_ZipOutputDir)' == ''">$([System.IO.Path]::GetFullPath('$(_SourceDir)\..\')) - <_ZipFileName>$(MSBuildProjectName)-publish-$(_ZipStamp).zip + <_ZipFileName>$(MSBuildProjectName)-$(_ZipEnvironmentTag)-publish-$(_ZipStamp).zip <_ZipPath>$(_ZipOutputDir)$(_ZipFileName) diff --git a/Fuchs/Properties/PublishProfiles/FolderProfile-Dev.pubxml b/Fuchs/Properties/PublishProfiles/FolderProfile-Dev.pubxml new file mode 100644 index 0000000..c4dd693 --- /dev/null +++ b/Fuchs/Properties/PublishProfiles/FolderProfile-Dev.pubxml @@ -0,0 +1,21 @@ + + + + + true + false + true + Debug + x64 + FileSystem + Q:\PWProjects\Fuchs_Intranet_Dev + FileSystem + <_TargetId>Folder + + net10.0 + win-x64 + 2856176d-cda6-1be2-0ce0-d72c26fb4f35 + false + Development + + diff --git a/Fuchs/Properties/PublishProfiles/FolderProfile.pubxml b/Fuchs/Properties/PublishProfiles/FolderProfile.pubxml index 57fab78..6c25e27 100644 --- a/Fuchs/Properties/PublishProfiles/FolderProfile.pubxml +++ b/Fuchs/Properties/PublishProfiles/FolderProfile.pubxml @@ -16,5 +16,6 @@ win-x64 2856176d-cda6-1be2-0ce0-d72c26fb4f35 false + Production \ No newline at end of file diff --git a/Fuchs/appsettings.Development.json b/Fuchs/appsettings.Development.json index 1966d3a..1c91077 100644 --- a/Fuchs/appsettings.Development.json +++ b/Fuchs/appsettings.Development.json @@ -1,8 +1,8 @@ { "ConnectionStrings": { "fuchs_fds_ConnectionString": "Data Source=MSSQL4.NBG4.DOMAINXYZ.DE,10439;Initial Catalog=site_fuchs_dev;Persist Security Info=False;TrustServerCertificate=true;Encrypt=true;User ID={username};password='{password}';Connect Timeout=60;Load Balance Timeout=240;Max Pool Size=500;", - "fuchs_fds_username_Dev": "fuchs_dev", - "fuchs_fds_password_Dev": "!Po@cGZ5bUn37khO" + "fuchs_fds_username": "fuchs_dev", + "fuchs_fds_password": "!Po@cGZ5bUn37khO" }, "Logging": { "LogLevel": { @@ -16,6 +16,7 @@ } }, "Fuchs": { + "IsTestDeployment": true, "FDS_Intranet_DebugState": true, "DevAutoLogin": true, "DevAutoLoginEmail": "info@processweb.de", diff --git a/Fuchs/appsettings.json b/Fuchs/appsettings.json index 430b8e4..c4c9ff6 100644 --- a/Fuchs/appsettings.json +++ b/Fuchs/appsettings.json @@ -26,13 +26,13 @@ "AllowedHosts": "*", "SpirePdf_License": "MANAGED_BY_KEYVAULT", "ConnectionStrings": { - "fuchs_fds_ConnectionString": "Data Source=MSSQL4.NBG4.DOMAINXYZ.DE,10439;Initial Catalog=site_fuchs_dev;Persist Security Info=False;TrustServerCertificate=true;Encrypt=true;User ID={username};password='{password}';Connect Timeout=60;Load Balance Timeout=240;Max Pool Size=500;", + "fuchs_fds_ConnectionString": "Data Source=MSSQL4.NBG4.DOMAINXYZ.DE,10439;Initial Catalog=site_fuchs;Persist Security Info=False;TrustServerCertificate=true;Encrypt=true;User ID={username};password='{password}';Connect Timeout=60;Load Balance Timeout=240;Max Pool Size=500;", "fuchs_fds_username": "MANAGED_BY_KEYVAULT", "fuchs_fds_password": "MANAGED_BY_KEYVAULT", "AzureBlobStorage_ConnectionString": "MANAGED_BY_KEYVAULT" }, "Fuchs": { - "IsTestDeployment": true, + "IsTestDeployment": false, "ocms_guid": "00094b8f-a822-4e9c-b627-87802f93fca8", "ocms_valid_locales_csv": "de,en", "ocms_default_locale": "de", @@ -62,8 +62,8 @@ }, "AzureStorage": { "Enabled": true, - "InvoiceContainer": "dev-fuchs-invoices", - "ReminderContainer": "dev-fuchs-reminders", + "InvoiceContainer": "fuchs-invoices", + "ReminderContainer": "fuchs-reminders", "MetadataFields": [ "Id", "Version", "InvoiceId", "InvoiceTitle", "InvId", "DocumentName", "file_guid" ] }, "Telemetry": { diff --git a/MFR_RESTClient/MFR_RESTClient.csproj b/MFR_RESTClient/MFR_RESTClient.csproj index 25cc524..d41eedc 100644 --- a/MFR_RESTClient/MFR_RESTClient.csproj +++ b/MFR_RESTClient/MFR_RESTClient.csproj @@ -33,7 +33,7 @@ - +