diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 13ff922..54b8006 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,18 +21,6 @@ jobs:
         with:
           dotnet-version: 10.x
 
-      - name: ✏️ Set abstractions version from CHANGELOG.md
-        shell: pwsh
-        run: ./scripts/Set-VersionFromChangelog.ps1 -ChangelogPath XrmPluginCore.Abstractions/CHANGELOG.md -CsprojPath XrmPluginCore.Abstractions/XrmPluginCore.Abstractions.csproj
-
-      - name: ✏️ Set source generator version from CHANGELOG.md
-        shell: pwsh
-        run: ./scripts/Set-VersionFromChangelog.ps1 -ChangelogPath XrmPluginCore/CHANGELOG.md -CsprojPath XrmPluginCore.SourceGenerator/XrmPluginCore.SourceGenerator.csproj
-
-      - name: ✏️ Set implementations version from CHANGELOG.md
-        shell: pwsh
-        run: ./scripts/Set-VersionFromChangelog.ps1 -ChangelogPath XrmPluginCore/CHANGELOG.md -CsprojPath XrmPluginCore/XrmPluginCore.csproj
-
       - name: 📦 Install dependencies
         run: dotnet restore
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7bdd7b7..cbb3d68 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,18 +26,6 @@ jobs:
       with:
         dotnet-version: 10.x
 
-    - name: ✏️ Set abstractions version from CHANGELOG.md
-      shell: pwsh
-      run: ./scripts/Set-VersionFromChangelog.ps1 -ChangelogPath XrmPluginCore.Abstractions/CHANGELOG.md -CsprojPath XrmPluginCore.Abstractions/XrmPluginCore.Abstractions.csproj
-
-    - name: ✏️ Set source generator version from CHANGELOG.md
-      shell: pwsh
-      run: ./scripts/Set-VersionFromChangelog.ps1 -ChangelogPath XrmPluginCore/CHANGELOG.md -CsprojPath XrmPluginCore.SourceGenerator/XrmPluginCore.SourceGenerator.csproj
-
-    - name: ✏️ Set implementations version from CHANGELOG.md
-      shell: pwsh
-      run: ./scripts/Set-VersionFromChangelog.ps1 -ChangelogPath XrmPluginCore/CHANGELOG.md -CsprojPath XrmPluginCore/XrmPluginCore.csproj
-
     - name: 📦 Restore dependencies
       run: dotnet restore
 
diff --git a/CLAUDE.md b/CLAUDE.md
index f866818..04b1b94 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -489,7 +489,7 @@ Version numbers are managed through CHANGELOG.md files:
 - `XrmPluginCore/CHANGELOG.md` for the main library and source generator (both use the same version)
 - `XrmPluginCore.Abstractions/CHANGELOG.md` for abstractions
 
-The `Set-VersionFromChangelog.ps1` script updates .csproj files from CHANGELOG during CI/CD.
+`Directory.Build.targets` derives each project's `<Version>` from the latest `### v...` entry in the relevant CHANGELOG.md at build time — no script or CI step required. Core and the source generator share `XrmPluginCore/CHANGELOG.md`; Abstractions overrides `ChangelogPath` in its .csproj to use its own changelog. An explicit `-p:Version=...` still overrides the derived value.
 
 ## Source Generator Development
 
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 57dc5e3..a54633e 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,10 +1,49 @@
 <Project>
-  <!-- Package metadata for packable projects -->
+  <!-- Derive <Version> from the relevant CHANGELOG.md (keepachangelog format:
+       lines like "### v1.4.1 - 01 July 2026"). The main library and the source
+       generator are released in lockstep, so both share XrmPluginCore/CHANGELOG.md;
+       Abstractions versions independently and overrides ChangelogPath to its own.
+
+       This lives in .targets (not .props) so a csproj-level ChangelogPath override
+       (and IsPackable) is already evaluated. Version is set unconditionally from the
+       changelog (overriding the SDK's 1.0.0 default); an explicit command-line
+       -p:Version=... is a global property and still takes precedence. -->
+  <PropertyGroup Condition="!$(MSBuildProjectName.EndsWith('.Tests'))">
+    <ChangelogPath Condition="'$(ChangelogPath)' == ''">$(MSBuildThisFileDirectory)XrmPluginCore\CHANGELOG.md</ChangelogPath>
+    <_ChangelogVersionLine Condition="Exists('$(ChangelogPath)')">$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(ChangelogPath)')), '(?m)^### v[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9\-\.]+)?'))</_ChangelogVersionLine>
+    <!-- Strip the leading "### v" (5 chars) to leave just the version -->
+    <Version Condition="'$(_ChangelogVersionLine)' != ''">$(_ChangelogVersionLine.Substring(5))</Version>
+    <!-- Fallback when no changelog entry is found (e.g. a missing changelog) -->
+    <Version Condition="'$(_ChangelogVersionLine)' == ''">1.0.0-local</Version>
+  </PropertyGroup>
+
+  <!-- Package metadata shared by all packable projects. -->
   <!-- This is in .targets (not .props) because it must evaluate AFTER project files set IsPackable=true -->
   <PropertyGroup Condition="'$(IsPackable)' != 'false'">
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageProjectUrl>https://github.com/delegateas/XrmPluginCore</PackageProjectUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>contextand.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <Version Condition="'$(Version)' == ''">1.0.0-local</Version>
   </PropertyGroup>
+
+  <!-- LICENSE / README / icon are packed by every packable project -->
+  <ItemGroup Condition="'$(IsPackable)' != 'false'">
+    <None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath="\" Visible="false" />
+    <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" Visible="false" />
+    <None Include="$(MSBuildThisFileDirectory)resources\contextand.png" Pack="true" PackagePath="\" Visible="false" />
+  </ItemGroup>
+
+  <!-- Echo the changelog-derived version during build for visual confirmation
+       (replaces the "Detected version" output the old version script printed).
+       Limited to shipped projects (packable + the bundled source generator) and to
+       inner builds (TargetFramework set) so a multi-targeted project prints once per TF
+       rather than repeating for the cross-targeting outer build. -->
+  <Target Name="ReportChangelogVersion"
+          BeforeTargets="Build"
+          Condition="('$(IsPackable)' != 'false' Or '$(IsRoslynComponent)' == 'true') And '$(TargetFramework)' != '' And '$(ChangelogPath)' != ''">
+    <Message Importance="high" Text="$(MSBuildProjectName) ($(TargetFramework)) version: $(Version) (from $([System.IO.Path]::GetFullPath('$(ChangelogPath)')))" />
+  </Target>
 </Project>
diff --git a/XrmPluginCore.Abstractions/XrmPluginCore.Abstractions.csproj b/XrmPluginCore.Abstractions/XrmPluginCore.Abstractions.csproj
index d6b88e9..06658d3 100644
--- a/XrmPluginCore.Abstractions/XrmPluginCore.Abstractions.csproj
+++ b/XrmPluginCore.Abstractions/XrmPluginCore.Abstractions.csproj
@@ -1,29 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>XrmPluginCore.Abstractions</PackageId>
     <Title>XrmPluginCore.Abstractions</Title>
-    <PackageProjectUrl>https://github.com/delegateas/XrmPluginCore</PackageProjectUrl>
     <Description>Abstractions and shared Enums for the XrmPluginCore package</Description>
     <PackageTags>xrm,crm,dataverse,daxif,delegate,context&amp;,contextand,xrmmockup</PackageTags>
-    <IncludeSymbols>True</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <RootNamespace>XrmPluginCore</RootNamespace>
 		<IsPackable>true</IsPackable>
+    <!-- Abstractions versions independently of the main library -->
+    <ChangelogPath>$(MSBuildProjectDirectory)\CHANGELOG.md</ChangelogPath>
   </PropertyGroup>
-  <ItemGroup>
-    <None Include="..\LICENSE">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-    <None Include="..\README.md">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-    <None Include="..\resources\contextand.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
 </Project>
diff --git a/XrmPluginCore/XrmPluginCore.csproj b/XrmPluginCore/XrmPluginCore.csproj
index 8b4c480..58d5d73 100644
--- a/XrmPluginCore/XrmPluginCore.csproj
+++ b/XrmPluginCore/XrmPluginCore.csproj
@@ -1,32 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net462;net8</TargetFrameworks>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <UseDataverseSdk>true</UseDataverseSdk>
     <PackageId>XrmPluginCore</PackageId>
     <Title>XrmPluginCore</Title>
     <Description>XrmPluginCore provides base functionality for developing plugins and custom APIs in Dynamics 365. It includes context wrappers and registration utilities to streamline the development process.</Description>
-    <PackageProjectUrl>https://github.com/delegateas/XrmPluginCore</PackageProjectUrl>
     <PackageTags>xrm,crm,dataverse,daxif,delegate,context&amp;,contextand,xrmmockup,xrmsync</PackageTags>
-    <IncludeSymbols>True</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<IsPackable>true</IsPackable>
   </PropertyGroup>
-  <ItemGroup>
-    <None Include="..\LICENSE">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-    <None Include="..\README.md">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-    <None Include="..\resources\contextand.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
diff --git a/scripts/Pack-Local.ps1 b/scripts/Pack-Local.ps1
index 4710387..3374d77 100644
--- a/scripts/Pack-Local.ps1
+++ b/scripts/Pack-Local.ps1
@@ -1,6 +1,4 @@
-./scripts/Set-VersionFromChangelog.ps1 -ChangelogPath .\XrmPluginCore\CHANGELOG.md -CsprojPath .\XrmPluginCore\XrmPluginCore.csproj
-./scripts/Set-VersionFromChangelog.ps1 -ChangelogPath .\XrmPluginCore.SourceGenerator\CHANGELOG.md -CsprojPath .\XrmPluginCore.SourceGenerator\XrmPluginCore.SourceGenerator.csproj
-./scripts/Set-VersionFromChangelog.ps1 -ChangelogPath .\XrmPluginCore.Abstractions\CHANGELOG.md -CsprojPath .\XrmPluginCore.Abstractions\XrmPluginCore.Abstractions.csproj
-
+# Versions are derived automatically from each project's CHANGELOG.md by
+# Directory.Build.targets, so no version-setting step is needed here.
 dotnet build --configuration Release
 dotnet pack
diff --git a/scripts/Set-VersionFromChangelog.ps1 b/scripts/Set-VersionFromChangelog.ps1
deleted file mode 100644
index bc205bb..0000000
--- a/scripts/Set-VersionFromChangelog.ps1
+++ /dev/null
@@ -1,36 +0,0 @@
-# Sets the <Version> property in the given .csproj file to the latest version found in CHANGELOG.md (keepachangelog format)
-param(
-    [string]$ChangelogPath,
-    [string]$CsprojPath
-)
-
-$changelog = Get-Content $ChangelogPath
-# Match lines like: ### v1.0.0-rc.1 - xx xxxx 2025
-
-$regex = '^### v([0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9\-\.]+)?)'
-$resolved = Resolve-Path $CsprojPath
-
-$versionLine = $changelog | Where-Object { $_ -match $regex } | Select-Object -First 1
-if ($versionLine -match $regex) {
-    $version = $matches[1]
-    Write-Host "Detected version: $version"
-    [xml]$xml = Get-Content $resolved
-
-    $propertyGroup = $xml.Project.PropertyGroup | Where-Object { $_.Version -or $_.OutputType } | Select-Object -First 1
-    if (-not $propertyGroup) {
-        $propertyGroup = $xml.Project.PropertyGroup | Select-Object -First 1
-    }
-    if (-not $propertyGroup.Version) {
-        $versionElement = $xml.CreateElement('Version')
-        $versionElement.InnerText = $version
-        $propertyGroup.AppendChild($versionElement) | Out-Null
-    } else {
-        $propertyGroup.Version = $version
-    }
-
-    $xml.Save($resolved)
-    Write-Host "Updated $CsprojPath with version $version"
-} else {
-    Write-Error 'No version found in CHANGELOG.md'
-    exit 1
-}