Merge pull request #17 from anton-schieber/feature/project-structure

treewide: update project structure

Author: sebastian-ederer

.github/workflows/publish-nuget.yml

@@ -37,8 +37,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     env:
-      CORE_PROJECT_PATH: "CmdScale.EntityFrameworkCore.TimescaleDB/CmdScale.EntityFrameworkCore.TimescaleDB.csproj"
-      DESIGN_PROJECT_PATH: "CmdScale.EntityFrameworkCore.TimescaleDB.Design/CmdScale.EntityFrameworkCore.TimescaleDB.Design.csproj"
+      CORE_PROJECT_PATH: "src/Eftdb/Eftdb.csproj"
+      DESIGN_PROJECT_PATH: "src/Eftdb.Design/Eftdb.Design.csproj"
 
     steps:
       - name: Checkout repository

CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.DbFirst/CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.DbFirst.csproj

@@ -18,13 +18,26 @@ $ErrorActionPreference = 'Stop'
 $LocalNuGetRepo = "C:\_DEV\NuGet Packages"
 $SolutionRoot = (Get-Item $PSScriptRoot).Parent.FullName
 
+# Map PackageId names to actual project paths
+$ProjectPathMap = @{
+    "CmdScale.EntityFrameworkCore.TimescaleDB" = "src\Eftdb"
+    "CmdScale.EntityFrameworkCore.TimescaleDB.Design" = "src\Eftdb.Design"
+}
+
 try {
-    # Find the specified project file
-    $ProjectDirectory = Join-Path $SolutionRoot $ProjectName
+    # Resolve the project path from the package name
+    if ($ProjectPathMap.ContainsKey($ProjectName)) {
+        $RelativePath = $ProjectPathMap[$ProjectName]
+    } else {
+        # Fallback: try using the name directly as a path
+        $RelativePath = $ProjectName
+    }
+
+    $ProjectDirectory = Join-Path $SolutionRoot $RelativePath
     if (-not (Test-Path $ProjectDirectory)) {
-        throw "Project directory not found at '$ProjectDirectory'."
+        throw "Project directory not found at '$ProjectDirectory'. Valid project names are: $($ProjectPathMap.Keys -join ', ')"
     }
-    
+
     $ProjectFile = Get-ChildItem -Path $ProjectDirectory -Filter *.csproj | Select-Object -First 1
     if (-not $ProjectFile) {
         throw "No .csproj file found in '$ProjectDirectory'."

CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess/CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.csproj

@@ -26,11 +26,21 @@ param (
 )
 
 # --- Configuration ---
-$CoreLibraryNames = @(
+# Package IDs (used for PackageReference lookups)
+$CorePackageIds = @(
     "CmdScale.EntityFrameworkCore.TimescaleDB",
     "CmdScale.EntityFrameworkCore.TimescaleDB.Design"
 )
 
+# Map PackageId to actual project file base names (without .csproj)
+$PackageToProjectMap = @{
+    "CmdScale.EntityFrameworkCore.TimescaleDB" = "Eftdb"
+    "CmdScale.EntityFrameworkCore.TimescaleDB.Design" = "Eftdb.Design"
+}
+
+# For backwards compatibility
+$CoreLibraryNames = $CorePackageIds
+
 # --- Script Body ---
 try {
     # Get the script's directory
@@ -41,44 +51,56 @@ try {
     Write-Host "🔍 Finding all projects..."
     $AllProjects = Get-ChildItem -Path $SolutionRoot -Recurse -Filter "*.csproj"
 
-    # Identify the core libraries
+    # Identify the core libraries by matching project file names to package IDs
     $CoreProjectPaths = @{}
     foreach ($project in $AllProjects) {
-        if ($CoreLibraryNames -contains $project.BaseName) {
-            $CoreProjectPaths[$project.BaseName] = $project.FullName
+        foreach ($packageId in $CorePackageIds) {
+            $expectedBaseName = $PackageToProjectMap[$packageId]
+            if ($project.BaseName -eq $expectedBaseName) {
+                $CoreProjectPaths[$packageId] = $project.FullName
+                break
+            }
         }
     }
-    $CoreProjectPaths.GetEnumerator() | ForEach-Object { Write-Host "  - Found core library: $($_.Key)" }
+    $CoreProjectPaths.GetEnumerator() | ForEach-Object { Write-Host "  - Found core library: $($_.Key) -> $($_.Value)" }
 
-    if ($CoreProjectPaths.Count -ne $CoreLibraryNames.Count) {
-        throw "Could not find all core library projects. Please check the names in the script's configuration section."
+    if ($CoreProjectPaths.Count -ne $CorePackageIds.Count) {
+        throw "Could not find all core library projects. Expected: $($CorePackageIds -join ', '). Found: $($CoreProjectPaths.Keys -join ', ')"
+    }
+
+    # Build reverse map: project base name -> package ID
+    $ProjectToPackageMap = @{}
+    foreach ($entry in $PackageToProjectMap.GetEnumerator()) {
+        $ProjectToPackageMap[$entry.Value] = $entry.Key
     }
 
     # Build hash map
     Write-Host "🔎 Analyzing project dependencies..."
     $ConsumerProjectMap = @{}
     foreach ($project in $AllProjects) {
         [xml]$csprojContent = Get-Content $project.FullName -ErrorAction Stop
-        
+
         $foundCoreRefs = [System.Collections.Generic.List[object]]::new()
 
         # Find ProjectReferences
         $projectRefNodes = $csprojContent.SelectNodes("//ProjectReference")
         if ($projectRefNodes) {
             foreach ($refNode in $projectRefNodes) {
-                $refName = [System.IO.Path]::GetFileNameWithoutExtension(($refNode.Include).Trim())
-                if ($CoreLibraryNames -contains $refName) {
-                    $foundCoreRefs.Add([PSCustomObject]@{ Name = $refName; Type = "Project" })
+                $refBaseName = [System.IO.Path]::GetFileNameWithoutExtension(($refNode.Include).Trim())
+                # Check if this project file maps to one of our core packages
+                if ($ProjectToPackageMap.ContainsKey($refBaseName)) {
+                    $packageId = $ProjectToPackageMap[$refBaseName]
+                    $foundCoreRefs.Add([PSCustomObject]@{ Name = $packageId; Type = "Project" })
                 }
             }
         }
 
-        # Find PackageReferences
+        # Find PackageReferences (these use package IDs directly)
         $packageRefNodes = $csprojContent.SelectNodes("//PackageReference")
         if ($packageRefNodes) {
             foreach ($refNode in $packageRefNodes) {
                 $refName = ($refNode.Include).Trim()
-                if ($CoreLibraryNames -contains $refName) {
+                if ($CorePackageIds -contains $refName) {
                     $foundCoreRefs.Add([PSCustomObject]@{ Name = $refName; Type = "Package" })
                 }
             }

CmdScale.EntityFrameworkCore.TimescaleDB.Example/CmdScale.EntityFrameworkCore.TimescaleDB.Example.csproj

@@ -5,6 +5,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <AssemblyName>CmdScale.EntityFrameworkCore.TimescaleDB.Benchmarks</AssemblyName>
+    <RootNamespace>CmdScale.EntityFrameworkCore.TimescaleDB.Benchmarks</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess\CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.csproj" />
+    <ProjectReference Include="..\..\samples\Eftdb.Samples.Shared\Eftdb.Samples.Shared.csproj" />
   </ItemGroup>
 
 </Project>