Compare commits

..
2 Commits
Author SHA1 Message Date
Stefan 0ab08fd50b -
Playwright Tests / test (push) Canceled after 0s
2026-09-15 18:24:21 +02:00
Stefan 263946d0fc 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)
2026-09-15 18:24:17 +02:00
10 changed files with 43 additions and 16 deletions
+2 -2
View File
@@ -9,8 +9,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageReference Include="xunit.v3" Version="4.0.0" /> <PackageReference Include="xunit.v3" Version="4.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0"> <PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
+8 -4
View File
@@ -32,7 +32,7 @@
<!-- Compatible packages (kept) --> <!-- Compatible packages (kept) -->
<PackageReference Include="BouncyCastle" Version="1.8.9" /> <PackageReference Include="BouncyCastle" Version="1.8.9" />
<PackageReference Include="HtmlAgilityPack" Version="1.13.0" /> <PackageReference Include="HtmlAgilityPack" Version="1.13.0" />
<PackageReference Include="MailKit" Version="4.17.0" /> <PackageReference Include="MailKit" Version="4.18.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" /> <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.18.0" /> <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.18.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.18.0" /> <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.18.0" />
@@ -47,11 +47,11 @@
<PackageReference Include="Spire.PDF" Version="[8.10.5,8.10.5]" allowedVersions="[8.10.5,8.10.5]" /> <PackageReference Include="Spire.PDF" Version="[8.10.5,8.10.5]" allowedVersions="[8.10.5,8.10.5]" />
<!-- Updated packages --> <!-- Updated packages -->
<PackageReference Include="BouncyCastle.Cryptography" Version="2.7.0" /> <PackageReference Include="BouncyCastle.Cryptography" Version="2.7.0" />
<PackageReference Include="MimeKit" Version="4.17.0" /> <PackageReference Include="MimeKit" Version="4.18.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<!-- New packages (needed for .NET 10) --> <!-- New packages (needed for .NET 10) -->
<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.3" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.3" />
<PackageReference Include="SixLabors.ImageSharp" Version="4.1.1" /> <PackageReference Include="SixLabors.ImageSharp" Version="4.1.2" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.12" /> <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.12" />
<PackageReference Include="System.Drawing.Common" Version="10.0.12" /> <PackageReference Include="System.Drawing.Common" Version="10.0.12" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.29.2" /> <PackageReference Include="Azure.Storage.Blobs" Version="12.29.2" />
@@ -90,12 +90,16 @@
<!-- Zeitstempel im UTC Format --> <!-- Zeitstempel im UTC Format -->
<PropertyGroup> <PropertyGroup>
<_ZipStamp>$([System.DateTime]::UtcNow.ToString("yyyyMMdd_HHmmss"))</_ZipStamp> <_ZipStamp>$([System.DateTime]::UtcNow.ToString("yyyyMMdd_HHmmss"))</_ZipStamp>
<!-- Umgebungskennzeichnung fürs Zip: bevorzugt EnvironmentName aus dem Publish-Profil (z.B. "Development"),
sonst Fallback auf die Build-Configuration (z.B. "Debug"/"Release"). -->
<_ZipEnvironmentTag Condition="'$(EnvironmentName)' != ''">$(EnvironmentName)</_ZipEnvironmentTag>
<_ZipEnvironmentTag Condition="'$(_ZipEnvironmentTag)' == ''">$(Configuration)</_ZipEnvironmentTag>
<!-- Immer das aktuelle Publish-Ergebnis zippen (PublishDir/PubTmp\Out), nicht das Zielverzeichnis vom Profil --> <!-- Immer das aktuelle Publish-Ergebnis zippen (PublishDir/PubTmp\Out), nicht das Zielverzeichnis vom Profil -->
<_SourceDir>$([System.IO.Path]::GetFullPath('$(PublishDir)'))</_SourceDir> <_SourceDir>$([System.IO.Path]::GetFullPath('$(PublishDir)'))</_SourceDir>
<!-- ZIP nach Möglichkeit neben dem Zielordner aus dem Publish-Profil ablegen, sonst neben PublishDir --> <!-- ZIP nach Möglichkeit neben dem Zielordner aus dem Publish-Profil ablegen, sonst neben PublishDir -->
<_ZipOutputDir Condition="'$(PublishUrl)' != ''">$([System.IO.Path]::GetFullPath('$(PublishUrl)\..\'))</_ZipOutputDir> <_ZipOutputDir Condition="'$(PublishUrl)' != ''">$([System.IO.Path]::GetFullPath('$(PublishUrl)\..\'))</_ZipOutputDir>
<_ZipOutputDir Condition="'$(_ZipOutputDir)' == ''">$([System.IO.Path]::GetFullPath('$(_SourceDir)\..\'))</_ZipOutputDir> <_ZipOutputDir Condition="'$(_ZipOutputDir)' == ''">$([System.IO.Path]::GetFullPath('$(_SourceDir)\..\'))</_ZipOutputDir>
<_ZipFileName>$(MSBuildProjectName)-publish-$(_ZipStamp).zip</_ZipFileName> <_ZipFileName>$(MSBuildProjectName)-$(_ZipEnvironmentTag)-publish-$(_ZipStamp).zip</_ZipFileName>
<_ZipPath>$(_ZipOutputDir)$(_ZipFileName)</_ZipPath> <_ZipPath>$(_ZipOutputDir)$(_ZipFileName)</_ZipPath>
</PropertyGroup> </PropertyGroup>
<MakeDir Directories="$(_ZipOutputDir)" /> <MakeDir Directories="$(_ZipOutputDir)" />
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://go.microsoft.com/fwlink/?LinkID=208121. -->
<Project>
<PropertyGroup>
<DeleteExistingFiles>true</DeleteExistingFiles>
<ExcludeApp_Data>false</ExcludeApp_Data>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>x64</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>Q:\PWProjects\Fuchs_Intranet_Dev</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId>
<SiteUrlToLaunchAfterPublish />
<TargetFramework>net10.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<ProjectGuid>2856176d-cda6-1be2-0ce0-d72c26fb4f35</ProjectGuid>
<SelfContained>false</SelfContained>
<EnvironmentName>Development</EnvironmentName>
</PropertyGroup>
</Project>
@@ -16,5 +16,6 @@
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<ProjectGuid>2856176d-cda6-1be2-0ce0-d72c26fb4f35</ProjectGuid> <ProjectGuid>2856176d-cda6-1be2-0ce0-d72c26fb4f35</ProjectGuid>
<SelfContained>false</SelfContained> <SelfContained>false</SelfContained>
<EnvironmentName>Production</EnvironmentName>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
+3 -2
View File
@@ -1,8 +1,8 @@
{ {
"ConnectionStrings": { "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_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_username": "fuchs_dev",
"fuchs_fds_password_Dev": "!Po@cGZ5bUn37khO" "fuchs_fds_password": "!Po@cGZ5bUn37khO"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
@@ -16,6 +16,7 @@
} }
}, },
"Fuchs": { "Fuchs": {
"IsTestDeployment": true,
"FDS_Intranet_DebugState": true, "FDS_Intranet_DebugState": true,
"DevAutoLogin": true, "DevAutoLogin": true,
"DevAutoLoginEmail": "info@processweb.de", "DevAutoLoginEmail": "info@processweb.de",
+4 -4
View File
@@ -26,13 +26,13 @@
"AllowedHosts": "*", "AllowedHosts": "*",
"SpirePdf_License": "MANAGED_BY_KEYVAULT", "SpirePdf_License": "MANAGED_BY_KEYVAULT",
"ConnectionStrings": { "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_username": "MANAGED_BY_KEYVAULT",
"fuchs_fds_password": "MANAGED_BY_KEYVAULT", "fuchs_fds_password": "MANAGED_BY_KEYVAULT",
"AzureBlobStorage_ConnectionString": "MANAGED_BY_KEYVAULT" "AzureBlobStorage_ConnectionString": "MANAGED_BY_KEYVAULT"
}, },
"Fuchs": { "Fuchs": {
"IsTestDeployment": true, "IsTestDeployment": false,
"ocms_guid": "00094b8f-a822-4e9c-b627-87802f93fca8", "ocms_guid": "00094b8f-a822-4e9c-b627-87802f93fca8",
"ocms_valid_locales_csv": "de,en", "ocms_valid_locales_csv": "de,en",
"ocms_default_locale": "de", "ocms_default_locale": "de",
@@ -62,8 +62,8 @@
}, },
"AzureStorage": { "AzureStorage": {
"Enabled": true, "Enabled": true,
"InvoiceContainer": "dev-fuchs-invoices", "InvoiceContainer": "fuchs-invoices",
"ReminderContainer": "dev-fuchs-reminders", "ReminderContainer": "fuchs-reminders",
"MetadataFields": [ "Id", "Version", "InvoiceId", "InvoiceTitle", "InvId", "DocumentName", "file_guid" ] "MetadataFields": [ "Id", "Version", "InvoiceId", "InvoiceTitle", "InvId", "DocumentName", "file_guid" ]
}, },
"Telemetry": { "Telemetry": {
+1 -1
View File
@@ -33,7 +33,7 @@
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.22.0" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.22.0" />
<!-- New packages (replacements) --> <!-- New packages (replacements) -->
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.20.2" /> <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.20.2" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.2" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.3" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.12" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.12" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.12" /> <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.12" />
+1 -1
Submodule OCORE updated: 12cb9667ba...895a18e14a