feat: Convert JD.Efcpt.Build to use JD.MSBuild.Fluent

.gitignore

@@ -10,4 +10,16 @@ docs/_site
 coverage.cobertura.xml
 pkg/
 artifacts/
-*.bak
+*.bak
+tmpclaude-*
+tests/**/TestResults/
+
+# Auto-generated SQL files in samples
+# These are generated during build and should not be tracked
+samples/**/DatabaseProject/**/Tables/*.sql
+samples/**/DatabaseProject/**/Views/*.sql
+samples/**/DatabaseProject/**/StoredProcedures/*.sql
+samples/**/DatabaseProject/**/*.sql
+!samples/**/DatabaseProject/**/*.sqlproj
+!samples/**/DatabaseProject/**/*.csproj
+packages/

JD.Efcpt.Build.sln

@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59

samples/NuGet.config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="local-packages" value="../packages" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>

samples/build.cmd

@@ -0,0 +1,7 @@
+:; set -eo pipefail
+:; SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+:; ${SCRIPT_DIR}/build.sh "$@"
+:; exit $?
+
+@ECHO OFF
+powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %*

samples/build.ps1

@@ -0,0 +1,106 @@
+#!/usr/bin/env pwsh
+<#
+.SYNOPSIS
+    Build script for samples solution with proper dependency management
+.DESCRIPTION
+    This script ensures the main JD.Efcpt.Build packages are built first,
+    then builds the samples solution.
+.PARAMETER Configuration
+    Build configuration (Debug or Release). Default is Debug.
+.PARAMETER SkipMainBuild
+    Skip building the main solution packages
+#>
+
+param(
+    [ValidateSet('Debug', 'Release')]
+    [string]$Configuration = 'Debug',
+    [switch]$SkipMainBuild
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version Latest
+
+$samplesRoot = $PSScriptRoot
+$repoRoot = Split-Path $samplesRoot -Parent
+$mainSolution = Join-Path $repoRoot "JD.Efcpt.Build.sln"
+$packagesDir = Join-Path $repoRoot "packages"
+$samplesSolution = Join-Path $samplesRoot "Samples.sln"
+
+Write-Host "========================================" -ForegroundColor Cyan
+Write-Host "JD.Efcpt.Build Samples Build Script" -ForegroundColor Cyan
+Write-Host "========================================" -ForegroundColor Cyan
+Write-Host ""
+
+# Step 1: Build main solution packages
+if (-not $SkipMainBuild) {
+    Write-Host "Step 1: Building main solution..." -ForegroundColor Yellow
+    Push-Location $repoRoot
+    try {
+        dotnet build $mainSolution --configuration $Configuration
+        if ($LASTEXITCODE -ne 0) {
+            throw "Failed to build main solution"
+        }
+        Write-Host "✓ Main solution built successfully" -ForegroundColor Green
+        Write-Host ""
+
+        Write-Host "Step 2: Packing main solution..." -ForegroundColor Yellow
+        dotnet pack $mainSolution --configuration $Configuration --output $packagesDir --no-build
+        if ($LASTEXITCODE -ne 0) {
+            throw "Failed to pack main solution"
+        }
+        Write-Host "✓ Main solution packed successfully" -ForegroundColor Green
+        Write-Host ""
+
+        Write-Host "Step 3: Fixing sample project issues..." -ForegroundColor Yellow
+        & "$samplesRoot\fix-samples.ps1" -Quiet
+        Write-Host "  ✓ Sample fixes applied" -ForegroundColor Green
+        Write-Host ""
+    }
+    finally {
+        Pop-Location
+    }
+}
+else {
+    Write-Host "Skipping main solution build" -ForegroundColor Gray
+    Write-Host ""
+}
+
+# Step 2: Restore and build samples solution
+Write-Host "Step 4: Restoring sample solution..." -ForegroundColor Yellow
+Write-Host "Note: Using NuGet.config for package sources (local packages + nuget.org)" -ForegroundColor Gray
+dotnet restore $samplesSolution
+$restoreExitCode = $LASTEXITCODE
+
+if ($restoreExitCode -ne 0) {
+    Write-Host "⚠ Restore completed with errors" -ForegroundColor Yellow
+    Write-Host ""
+    Write-Host "Known issues:" -ForegroundColor Yellow
+    Write-Host "  - sdk-zero-config: Requires SDK version in global.json" -ForegroundColor Gray
+    Write-Host "  - Some samples: Target framework may not match EF Core package version" -ForegroundColor Gray
+    Write-Host ""
+}
+else {
+    Write-Host "✓ Sample solution restored" -ForegroundColor Green
+    Write-Host ""
+}
+
+Write-Host "Step 5: Building sample solution..." -ForegroundColor Yellow
+dotnet build $samplesSolution --configuration $Configuration --no-restore
+$buildExitCode = $LASTEXITCODE
+
+if ($buildExitCode -ne 0) {
+    Write-Host "⚠ Build completed with errors" -ForegroundColor Yellow
+    Write-Host ""
+    Write-Host "Some samples may have pre-existing issues." -ForegroundColor Gray
+    Write-Host "Check individual sample README files for requirements." -ForegroundColor Gray
+    Write-Host ""
+    exit 1
+}
+else {
+    Write-Host "✓ Sample solution built successfully" -ForegroundColor Green
+    Write-Host ""
+}
+
+Write-Host "========================================" -ForegroundColor Cyan
+Write-Host "Build completed! 🎉" -ForegroundColor Green
+Write-Host "========================================" -ForegroundColor Cyan

samples/build.sh

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+bash --version 2>&1 | head -n 1
+
+set -eo pipefail
+SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+
+###########################################################################
+# CONFIGURATION
+###########################################################################
+
+BUILD_PROJECT_FILE="$SCRIPT_DIR/build/_build.csproj"
+TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp"
+
+DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
+DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
+DOTNET_CHANNEL="STS"
+
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export DOTNET_NOLOGO=1
+
+###########################################################################
+# EXECUTION
+###########################################################################
+
+function FirstJsonValue {
+    perl -nle 'print $1 if m{"'"$1"'": "([^"]+)",?}' <<< "${@:2}"
+}
+
+# If dotnet CLI is installed globally and it matches requested version, use for execution
+if [ -x "$(command -v dotnet)" ] && dotnet --version &>/dev/null; then
+    export DOTNET_EXE="$(command -v dotnet)"
+else
+    # Download install script
+    DOTNET_INSTALL_FILE="$TEMP_DIRECTORY/dotnet-install.sh"
+    mkdir -p "$TEMP_DIRECTORY"
+    curl -Lsfo "$DOTNET_INSTALL_FILE" "$DOTNET_INSTALL_URL"
+    chmod +x "$DOTNET_INSTALL_FILE"
+
+    # If global.json exists, load expected version
+    if [[ -f "$DOTNET_GLOBAL_FILE" ]]; then
+        DOTNET_VERSION=$(FirstJsonValue "version" "$(cat "$DOTNET_GLOBAL_FILE")")
+        if [[ "$DOTNET_VERSION" == ""  ]]; then
+            unset DOTNET_VERSION
+        fi
+    fi
+
+    # Install by channel or version
+    DOTNET_DIRECTORY="$TEMP_DIRECTORY/dotnet-unix"
+    if [[ -z ${DOTNET_VERSION+x} ]]; then
+        "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --channel "$DOTNET_CHANNEL" --no-path
+    else
+        "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
+    fi
+    export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
+    export PATH="$DOTNET_DIRECTORY:$PATH"
+fi
+
+echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"
+
+if [[ ! -z ${NUKE_ENTERPRISE_TOKEN+x} && "$NUKE_ENTERPRISE_TOKEN" != "" ]]; then
+    "$DOTNET_EXE" nuget remove source "nuke-enterprise" &>/dev/null || true
+    "$DOTNET_EXE" nuget add source "https://f.feedz.io/nuke/enterprise/nuget" --name "nuke-enterprise" --username "PAT" --password "$NUKE_ENTERPRISE_TOKEN" --store-password-in-clear-text &>/dev/null || true
+fi
+
+"$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet
+"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"

src/JD.Efcpt.Build.Definitions/BuildPropsFactory.cs

@@ -0,0 +1,30 @@
+using JD.MSBuild.Fluent;
+using JD.MSBuild.Fluent.Fluent;
+using JD.MSBuild.Fluent.Typed;
+
+namespace JD.Efcpt.Build.Definitions;
+
+/// <summary>
+/// MSBuild package definition scaffolded from JD.Efcpt.Build.xml
+/// </summary>
+public static class BuildPropsFactory
+{
+    public static PackageDefinition Create()
+    {
+        return Package.Define("JD.Efcpt.Build")
+            .Props(p =>
+            {
+                p.Property<EfcptIsDirectReference>("true");
+                p.Import("..\\buildTransitive\\JD.Efcpt.Build.props");
+            })
+            .Build();
+    }
+
+    // Strongly-typed property names
+    public readonly struct EfcptIsDirectReference : IMsBuildPropertyName
+    {
+        public string Name => "_EfcptIsDirectReference";
+    }
+}
+
+

src/JD.Efcpt.Build.Definitions/BuildTargetsFactory.cs

@@ -0,0 +1,20 @@
+using JD.MSBuild.Fluent;
+using JD.MSBuild.Fluent.Fluent;
+
+namespace JD.Efcpt.Build.Definitions;
+
+/// <summary>
+/// MSBuild package definition scaffolded from JD.Efcpt.Build.xml
+/// </summary>
+public static class BuildTargetsFactory
+{
+    public static PackageDefinition Create()
+    {
+        return Package.Define("JD.Efcpt.Build")
+            .Targets(t =>
+            {
+                t.Import("..\\buildTransitive\\JD.Efcpt.Build.targets");
+            })
+            .Build();
+    }
+}