Brings the 3.8.0 release line into main, including the package-manifest runtime-kind mechanism (src/PackageManifest.props + src/PackageManifestHints.cs) that main did not have. All 72 manifest-producing packages now declare compatibility.runtimeKinds = ["elsa.server"]; the two Bpmn modules added on main pick this up automatically via their ShellFeatures directory. Conflict resolutions: - .specify/feature.json, CONTEXT.md, ROADMAP.md, build/_build.csproj: took main's, which is newer in every case. Verified byte-identical to main afterwards, so nothing from the release branch was dropped. - NuGet.Config: union of package sources, minus valence-consolelogstream-feedz. main removed that feed deliberately in7389e0a67and now consumes ConsoleLogStreaming 1.1.0 from nuget.org. - Elsa.sln: union of main's Bpmn projects and the release branch's ExternalAuthentication projects; the two sets are disjoint. Reverted an unintended revert: release/3.8.0 had lost commit33181b2c9("test: cover Oracle bulk upsert SQL generation") through an evil merge inc557c455a. That commit is present at the merge base, so git resolved the release branch's older content as an intentional change and would have silently undone it on main. It is three coupled pieces: - test/unit/Elsa.Persistence.EFCore.UnitTests (deleted, plus its Elsa.sln project declaration and NestedProjects entry) - InternalsVisibleTo("Elsa.Persistence.EFCore.UnitTests") - the fix itself in BulkUpsertExtensions.GenerateOracleUpsert: internal visibility, ISqlGenerationHelper.DelimitIdentifier quoting, and explicit CAST(... AS NVARCHAR2(...)) on string columns Dropping the third would have been an Oracle runtime regression: unquoted identifiers lose case, and ODP.NET binds .NET strings as VARCHAR2 while Elsa's Oracle migrations declare NVARCHAR2, causing a datatype mismatch. Merge base and main are identical for that file and every hunk on the release side is a revert plus cosmetics, so main's version was kept in full. Accepted deliberate release-branch changes, verified as real refactors rather than losses: AI EF Core migrations moved into the provider projects (5c0d8b0f4), and AIPersistenceFeature.cs renamed to EFCoreAIPersistenceShellFeatureBase.cs (ShellFeatures/ still present, so manifest generation is unaffected). Verified: dotnet build Elsa.sln succeeds with 0 errors and 2 pre-existing NU1903 warnings; Elsa.Persistence.EFCore.UnitTests passes 1/1; all 72 emitted manifests declare elsa.server and Elsa.Api.Common emits none. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
35 lines
1.5 KiB
XML
35 lines
1.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
<configuration>
|
|
<packageSources>
|
|
<clear />
|
|
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
|
|
<add key="cshells-feedz" value="https://f.feedz.io/sfmskywalker/cshells/nuget/index.json" />
|
|
<add key="elsa-preview-feedz" value="https://f.feedz.io/elsa-workflows/elsa-3/nuget/index.json" />
|
|
<add key="bpmn-feedz" value="https://f.feedz.io/valence-works/bpmn/nuget/index.json" />
|
|
<add key="valence-loom-feedz" value="https://f.feedz.io/valence-works/loom/nuget/index.json" />
|
|
</packageSources>
|
|
<packageSourceMapping>
|
|
<packageSource key="NuGet official package source">
|
|
<package pattern="*" />
|
|
<package pattern="CShells" />
|
|
<package pattern="CShells.*" />
|
|
</packageSource>
|
|
<packageSource key="cshells-feedz">
|
|
<package pattern="CShells" />
|
|
<package pattern="CShells.*" />
|
|
</packageSource>
|
|
<packageSource key="elsa-preview-feedz">
|
|
<package pattern="Elsa.Platform.PackageManifest.Generator" />
|
|
<package pattern="Elsa.Platform.PackageManifest" />
|
|
</packageSource>
|
|
<packageSource key="bpmn-feedz">
|
|
<package pattern="Bpmn.*" />
|
|
</packageSource>
|
|
<packageSource key="valence-loom-feedz">
|
|
<package pattern="Loom" />
|
|
<package pattern="Loom.*" />
|
|
</packageSource>
|
|
</packageSourceMapping>
|
|
</configuration>
|