Compare commits
4
Commits
a5f497090e
...
ca9a30d512
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ca9a30d512 | ||
|
|
25f9da1ab4 | ||
|
|
91f9524381 | ||
|
|
c730ef6049 |
@@ -40,6 +40,7 @@
|
|||||||
|
|
||||||
## Libraries
|
## Libraries
|
||||||
- Do not upgrade Spire.PDF beyond version 8.10.5.
|
- Do not upgrade Spire.PDF beyond version 8.10.5.
|
||||||
|
- Do not upgrade the vendored TinyMCE (`Fuchs/wwwroot/lib/tinymce/`; legacy copy at `Fuchs/Scripts/tinymce/`) beyond version 6.8.6 — the last MIT-licensed release; 7.0+ is commercially licensed. See `Fuchs/Docs/Decisions/0013-tinymce-pinned-to-6-8-6.md`.
|
||||||
- Make use of OCORE libraries where possible, especially for common tasks such as logging, configuration management, and data access.
|
- Make use of OCORE libraries where possible, especially for common tasks such as logging, configuration management, and data access.
|
||||||
- Whenever possible, prefer OCORE_web_pdf / OCORE PDF functions for PDF-related tasks over rewriting.
|
- Whenever possible, prefer OCORE_web_pdf / OCORE PDF functions for PDF-related tasks over rewriting.
|
||||||
- Do not use OCMS or OCMS_sharp; use only OCORE or OCORE_web.
|
- Do not use OCMS or OCMS_sharp; use only OCORE or OCORE_web.
|
||||||
|
|||||||
Vendored
+8
-1
@@ -5,5 +5,12 @@
|
|||||||
"dotnet build": true,
|
"dotnet build": true,
|
||||||
"npx gulp": true,
|
"npx gulp": true,
|
||||||
"ForEach-Object": true
|
"ForEach-Object": true
|
||||||
}
|
},
|
||||||
|
"vbnetcompanion.enableLanguageClientBridge": true,
|
||||||
|
"vbnetcompanion.enableBridgeForCSharp": true,
|
||||||
|
"vbnetcompanion.enableBridgeForVisualBasic": true,
|
||||||
|
"vbnetcompanion.languageClientServerCommand": "c:\\Users\\StefanOtt\\.vscode\\extensions\\roies.vbnet-companion-0.1.47\\server\\VBNetCompanion.LanguageServer\\publish\\VBNetCompanion.LanguageServer.exe",
|
||||||
|
"vbnetcompanion.languageClientServerArgs": [
|
||||||
|
"--stdio"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
@@ -34,6 +34,7 @@
|
|||||||
|
|
||||||
## Libraries
|
## Libraries
|
||||||
- Do **not** upgrade Spire.PDF beyond 8.10.5. Prefer OCORE / OCORE_web / OCORE_web_pdf helpers over rewriting. Do not use OCMS/OCMS_sharp — OCORE only.
|
- Do **not** upgrade Spire.PDF beyond 8.10.5. Prefer OCORE / OCORE_web / OCORE_web_pdf helpers over rewriting. Do not use OCMS/OCMS_sharp — OCORE only.
|
||||||
|
- Do **not** upgrade the vendored TinyMCE (`Fuchs/wwwroot/lib/tinymce/`; legacy copy at `Fuchs/Scripts/tinymce/`) beyond **6.8.6** — the last MIT-licensed release; 7.0+ is commercially licensed. See `Fuchs/Docs/Decisions/0013-tinymce-pinned-to-6-8-6.md`.
|
||||||
|
|
||||||
## Services & Dependency Injection
|
## Services & Dependency Injection
|
||||||
- Business logic lives in **DI-registered services** under `Fuchs/Services/` behind interfaces, injected into `IntranetController`. Do not reintroduce static God-classes or pass the controller into helpers.
|
- Business logic lives in **DI-registered services** under `Fuchs/Services/` behind interfaces, injected into `IntranetController`. Do not reintroduce static God-classes or pass the controller into helpers.
|
||||||
|
|||||||
@@ -34,6 +34,7 @@
|
|||||||
|
|
||||||
## Libraries
|
## Libraries
|
||||||
- Do **not** upgrade Spire.PDF beyond 8.10.5. Prefer OCORE / OCORE_web / OCORE_web_pdf helpers over rewriting. Do not use OCMS/OCMS_sharp — OCORE only.
|
- Do **not** upgrade Spire.PDF beyond 8.10.5. Prefer OCORE / OCORE_web / OCORE_web_pdf helpers over rewriting. Do not use OCMS/OCMS_sharp — OCORE only.
|
||||||
|
- Do **not** upgrade the vendored TinyMCE (`Fuchs/wwwroot/lib/tinymce/`; legacy copy at `Fuchs/Scripts/tinymce/`) beyond **6.8.6** — the last MIT-licensed release; 7.0+ is commercially licensed. See `Fuchs/Docs/Decisions/0013-tinymce-pinned-to-6-8-6.md`.
|
||||||
|
|
||||||
## Services & Dependency Injection
|
## Services & Dependency Injection
|
||||||
- Business logic lives in **DI-registered services** under `Fuchs/Services/` behind interfaces, injected into `IntranetController`. Do not reintroduce static God-classes or pass the controller into helpers.
|
- Business logic lives in **DI-registered services** under `Fuchs/Services/` behind interfaces, injected into `IntranetController`. Do not reintroduce static God-classes or pass the controller into helpers.
|
||||||
|
|||||||
@@ -9,9 +9,9 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
|
||||||
<PackageReference Include="xunit.v3" Version="3.2.2" />
|
<PackageReference Include="xunit.v3" Version="4.0.0" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
|
<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>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
---
|
||||||
|
status: Accepted
|
||||||
|
date: 2026-09-09
|
||||||
|
applyTo:
|
||||||
|
- "Fuchs/wwwroot/lib/tinymce/**"
|
||||||
|
- "Fuchs/Scripts/tinymce/**"
|
||||||
|
supersededBy: ""
|
||||||
|
---
|
||||||
|
|
||||||
|
# 0013 — TinyMCE pinned to 6.8.6
|
||||||
|
|
||||||
|
## Context
|
||||||
|
TinyMCE releases from 7.0 onward are licensed under a proprietary/commercial
|
||||||
|
license (with a source-available "open core" carve-out that no longer covers
|
||||||
|
the full feature set previously used). TinyMCE 6.8.6 is the last release
|
||||||
|
published under the plain MIT license. The active app vendors TinyMCE
|
||||||
|
directly under `Fuchs/wwwroot/lib/tinymce/` (currently 6.8.6) rather than via
|
||||||
|
a package manager that enforces license terms automatically. A second,
|
||||||
|
older vendor drop lives at `Fuchs/Scripts/tinymce/` (currently 6.3.1) used
|
||||||
|
only by the legacy `Intranet_Legacy` VB.NET app — it is not required to
|
||||||
|
match the active app's version, only to stay under the same ceiling.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
TinyMCE must never be upgraded beyond **6.8.6**, in either vendored copy.
|
||||||
|
Any change that touches `Fuchs/wwwroot/lib/tinymce/` must keep `version` in
|
||||||
|
its `package.json` at `6.8.6` or lower. Do not pull in a newer TinyMCE
|
||||||
|
release, plugin, or skin — including via `npm`/`bower`/`composer` metadata
|
||||||
|
files bundled in the vendor folder — even to pick up a bug fix or new
|
||||||
|
plugin.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
- Security/bug fixes for TinyMCE past 6.8.6 will not be available; any such
|
||||||
|
issue must be worked around locally (patch the vendored copy) rather than
|
||||||
|
by upgrading.
|
||||||
|
- New TinyMCE features/plugins released in 7.x+ are off-limits unless the
|
||||||
|
project separately decides to accept the commercial license (a decision
|
||||||
|
that would supersede this one).
|
||||||
|
- The two vendored copies do not need to share the same version, but neither
|
||||||
|
may exceed 6.8.6.
|
||||||
|
|
||||||
|
## Alternatives considered
|
||||||
|
- **Upgrade to latest TinyMCE and accept the commercial license terms** —
|
||||||
|
rejected: no budget/approval for a commercial license, and the project has
|
||||||
|
no other proprietary runtime dependencies of this kind.
|
||||||
|
- **Switch to a different MIT-licensed rich text editor** — rejected for now
|
||||||
|
as out of scope; would require rewriting the existing draft-editing
|
||||||
|
integration (see `Fuchs/Docs/Concepts/live-draft-editing.md`). Can be
|
||||||
|
revisited later.
|
||||||
+12
-12
@@ -31,30 +31,30 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- 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.12.4" />
|
<PackageReference Include="HtmlAgilityPack" Version="1.13.0" />
|
||||||
<PackageReference Include="MailKit" Version="4.17.0" />
|
<PackageReference Include="MailKit" Version="4.17.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.17.0" />
|
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.18.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.17.0" />
|
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.18.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.16.0" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.18.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.16.0" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.18.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.16.0" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.18.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.16.0" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.18.0" />
|
||||||
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
|
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
|
||||||
<PackageReference Include="QRCoder" Version="1.8.0" />
|
<PackageReference Include="QRCoder" Version="1.8.0" />
|
||||||
<PackageReference Include="PDFsharp" Version="6.2.4" />
|
<PackageReference Include="PDFsharp" Version="6.2.4" />
|
||||||
<PackageReference Include="PDFsharp-MigraDoc" Version="6.2.4" />
|
<PackageReference Include="PDFsharp-MigraDoc" Version="6.2.4" />
|
||||||
<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.6.2" />
|
<PackageReference Include="BouncyCastle.Cryptography" Version="2.7.0" />
|
||||||
<PackageReference Include="MimeKit" Version="4.17.0" />
|
<PackageReference Include="MimeKit" Version="4.17.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.2" />
|
<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.2" />
|
||||||
<PackageReference Include="SixLabors.ImageSharp" Version="4.0.0" />
|
<PackageReference Include="SixLabors.ImageSharp" Version="4.1.1" />
|
||||||
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.10" />
|
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.12" />
|
||||||
<PackageReference Include="System.Drawing.Common" Version="10.0.10" />
|
<PackageReference Include="System.Drawing.Common" Version="10.0.12" />
|
||||||
<PackageReference Include="Azure.Storage.Blobs" Version="12.29.1" />
|
<PackageReference Include="Azure.Storage.Blobs" Version="12.29.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="App_Data\cache\" />
|
<Folder Include="App_Data\cache\" />
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -29,7 +29,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.2" />
|
<PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.2" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" />
|
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.12" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.10" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.12" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -190,6 +190,7 @@
|
|||||||
<Build Include="dbo\Functions\fds__getCompanyName.sql" />
|
<Build Include="dbo\Functions\fds__getCompanyName.sql" />
|
||||||
<Build Include="dbo\Functions\fds__getCompanyEmail.sql" />
|
<Build Include="dbo\Functions\fds__getCompanyEmail.sql" />
|
||||||
<Build Include="dbo\Functions\fds__getCompanyAddress.sql" />
|
<Build Include="dbo\Functions\fds__getCompanyAddress.sql" />
|
||||||
|
<Build Include="dbo\Functions\fds__getCompanyAddressJson.sql" />
|
||||||
<Build Include="dbo\Functions\fds__fn_vatfrombalances.sql" />
|
<Build Include="dbo\Functions\fds__fn_vatfrombalances.sql" />
|
||||||
<Build Include="dbo\Functions\fds__fn_ReminderDocumentName.sql" />
|
<Build Include="dbo\Functions\fds__fn_ReminderDocumentName.sql" />
|
||||||
<Build Include="dbo\Functions\fds__fn_reminder_id.sql" />
|
<Build Include="dbo\Functions\fds__fn_reminder_id.sql" />
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
-- =============================================
|
|
||||||
-- Description: Returns the raw field values of a single manually entered
|
|
||||||
-- banking transaction (TransactionTypeIdCode = 'MAN'), so the
|
|
||||||
-- "manuelle Buchung ändern" dialog can be pre-filled.
|
|
||||||
-- =============================================
|
|
||||||
CREATE PROCEDURE [dbo].[fds__getBankingtransaction_manual]
|
|
||||||
@taID varchar(10),
|
|
||||||
@authuser varchar(100)
|
|
||||||
AS
|
|
||||||
BEGIN
|
|
||||||
SET NOCOUNT ON;
|
|
||||||
IF [dbo].[fis_getModuleAuth]('fds_bam', @authuser) < 1
|
|
||||||
THROW 60000, N'not authorized', 1;
|
|
||||||
|
|
||||||
SELECT
|
|
||||||
[taID]
|
|
||||||
, [ValueDate]
|
|
||||||
, [Amount]
|
|
||||||
, [NameOfPayer]
|
|
||||||
, [SepaRemittanceInformation]
|
|
||||||
FROM [dbo].[fds__bankingtransactions]
|
|
||||||
WHERE [taID] = @taID
|
|
||||||
AND [TransactionTypeIdCode] = 'MAN';
|
|
||||||
END
|
|
||||||
@@ -26,21 +26,21 @@
|
|||||||
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
|
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
|
||||||
<PackageReference Include="System.Spatial" Version="5.8.5" />
|
<PackageReference Include="System.Spatial" Version="5.8.5" />
|
||||||
<!-- Updated packages -->
|
<!-- Updated packages -->
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" />
|
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.12" />
|
||||||
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.19.2" />
|
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.22.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
<PackageReference Include="RestSharp" Version="114.0.0" />
|
<PackageReference Include="RestSharp" Version="114.0.0" />
|
||||||
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.19.2" />
|
<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.2" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.10" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.10" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.12" />
|
||||||
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.10" />
|
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.12" />
|
||||||
<!-- Deprecated but kept for compatibility (review in follow-up) -->
|
<!-- Deprecated but kept for compatibility (review in follow-up) -->
|
||||||
<PackageReference Include="Microsoft.IdentityModel.Abstractions" Version="8.19.2" />
|
<PackageReference Include="Microsoft.IdentityModel.Abstractions" Version="8.22.0" />
|
||||||
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
|
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
|
||||||
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="8.19.2" />
|
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="8.22.0" />
|
||||||
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.19.2" />
|
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.22.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
+1
-1
Submodule OCORE updated: 91eb660610...0e169d269b
+1
-1
Submodule OCORE_Charting updated: 42bfb85b96...6f9ce590ff
+1
-1
Submodule OCORE_web updated: c5bd500388...a15e62ec3e
+1
-1
Submodule OCORE_web_pdf updated: cd8214ed7b...6ac9a3221f
+1
-1
Submodule eRechnungLib updated: 8e5bd53938...7600e00808
Reference in New Issue
Block a user