From 5dd9d0efe462d27c72f372f0df7621c816e6f140 Mon Sep 17 00:00:00 2001
From: Alexander Zekelin <aleksander.zekelin@networg.com>
Date: Tue, 25 Nov 2025 07:45:44 +0100
Subject: [PATCH 1/6] Solution and pdpackage targets overrode. ScriptLibrary
 targets added

---
 TALXIS.DevKit.Build.slnx                      |  3 +
 src/Dataverse/PDPackage/README.md             |  3 +
 ...IS.DevKit.Build.Dataverse.PdPackage.csproj | 13 ++++
 ...IS.DevKit.Build.Dataverse.PdPackage.nuspec | 27 +++++++
 ...S.DevKit.Build.Dataverse.PdPackage.targets |  4 ++
 ...S.DevKit.Build.Dataverse.PdPackage.targets | 19 +++++
 src/Dataverse/ScriptLibrary/README.md         |  3 +
 ...evKit.Build.Dataverse.ScriptLibrary.csproj | 13 ++++
 ...evKit.Build.Dataverse.ScriptLibrary.nuspec | 27 +++++++
 ...DevKit.Build.Dataverse.ScriptLibrary.props |  6 ++
 ...vKit.Build.Dataverse.ScriptLibrary.targets |  5 ++
 ...DevKit.Build.Dataverse.ScriptLibrary.props |  8 +++
 ...vKit.Build.Dataverse.ScriptLibrary.targets | 26 +++++++
 ...ild.Dataverse.Solution.OverridePAC.targets |  4 ++
 ...Dataverse.Solution.ScriptLibraries.targets |  4 ++
 ...ild.Dataverse.Solution.OverridePAC.targets | 43 +++++++++++
 ...Dataverse.Solution.ScriptLibraries.targets | 72 +++++++++++++++++++
 ...LXIS.DevKit.Build.Dataverse.Solution.props |  2 +-
 ...IS.DevKit.Build.Dataverse.Solution.targets | 42 +++++++----
 19 files changed, 310 insertions(+), 14 deletions(-)
 create mode 100644 src/Dataverse/PDPackage/README.md
 create mode 100644 src/Dataverse/PDPackage/TALXIS.DevKit.Build.Dataverse.PdPackage.csproj
 create mode 100644 src/Dataverse/PDPackage/TALXIS.DevKit.Build.Dataverse.PdPackage.nuspec
 create mode 100644 src/Dataverse/PDPackage/msbuild/build/TALXIS.DevKit.Build.Dataverse.PdPackage.targets
 create mode 100644 src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.PdPackage.targets
 create mode 100644 src/Dataverse/ScriptLibrary/README.md
 create mode 100644 src/Dataverse/ScriptLibrary/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.csproj
 create mode 100644 src/Dataverse/ScriptLibrary/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.nuspec
 create mode 100644 src/Dataverse/ScriptLibrary/msbuild/build/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props
 create mode 100644 src/Dataverse/ScriptLibrary/msbuild/build/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
 create mode 100644 src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props
 create mode 100644 src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
 create mode 100644 src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.OverridePAC.targets
 create mode 100644 src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
 create mode 100644 src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.OverridePAC.targets
 create mode 100644 src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets

diff --git a/TALXIS.DevKit.Build.slnx b/TALXIS.DevKit.Build.slnx
index 9c4b1bf..cbd11a5 100644
--- a/TALXIS.DevKit.Build.slnx
+++ b/TALXIS.DevKit.Build.slnx
@@ -6,4 +6,7 @@
   <Project Path="src/Dataverse/Solution/TALXIS.DevKit.Build.Dataverse.Solution.csproj" />
   <Project Path="src/Dataverse/Plugin/TALXIS.DevKit.Build.Dataverse.Plugin.csproj" />
   <Project Path="src/Dataverse/Pcf/TALXIS.DevKit.Build.Dataverse.Pcf.csproj" />
+  <Project Path="src/Dataverse/ScriptLibrary/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.csproj" />
+  <Project Path="src/Dataverse/PDPackage/TALXIS.DevKit.Build.Dataverse.PdPackage.csproj" />
+
 </Solution>
diff --git a/src/Dataverse/PDPackage/README.md b/src/Dataverse/PDPackage/README.md
new file mode 100644
index 0000000..f1608d7
--- /dev/null
+++ b/src/Dataverse/PDPackage/README.md
@@ -0,0 +1,3 @@
+# TALXIS.DevKit.Build.Dataverse.Tasks
+
+See [here](https://github.com/TALXIS/tools-devkit-build) for more information.
\ No newline at end of file
diff --git a/src/Dataverse/PDPackage/TALXIS.DevKit.Build.Dataverse.PdPackage.csproj b/src/Dataverse/PDPackage/TALXIS.DevKit.Build.Dataverse.PdPackage.csproj
new file mode 100644
index 0000000..2cc6eab
--- /dev/null
+++ b/src/Dataverse/PDPackage/TALXIS.DevKit.Build.Dataverse.PdPackage.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Version Condition="'$(Version)'==''">0.0.0.1</Version>
+        <NuspecFile>TALXIS.DevKit.Build.Dataverse.PdPackage.nuspec</NuspecFile>
+        <NuspecProperties>
+            Version=$(Version)
+        </NuspecProperties>
+    </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Dataverse/PDPackage/TALXIS.DevKit.Build.Dataverse.PdPackage.nuspec b/src/Dataverse/PDPackage/TALXIS.DevKit.Build.Dataverse.PdPackage.nuspec
new file mode 100644
index 0000000..1f8a647
--- /dev/null
+++ b/src/Dataverse/PDPackage/TALXIS.DevKit.Build.Dataverse.PdPackage.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>TALXIS.DevKit.Build.Dataverse.PdPackage</id>
+    <version>$Version$</version>
+    <authors>TALXIS</authors>
+    <developmentDependency>true</developmentDependency>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <readme>README.md</readme>
+    <projectUrl>https://github.com/TALXIS/tools-devkit-build</projectUrl>
+    <description>Dataverse MSBuild PDPackage</description>
+    <releaseNotes>https://github.com/TALXIS/tools-devkit-build/releases</releaseNotes>
+    <copyright>2025 NETWORG</copyright>
+    <repository type="git" url="https://github.com/TALXIS/tools-devkit-build"
+      commit="c941d55d453c1c64a1e248a240b0327d2dcd76ee" />
+    <dependencies>
+      <dependency id="Microsoft.PowerApps.MSBuild.PDPackage" version="[1.50.1]" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="msbuild\tasks\*.*" target="tasks" />
+    <file src="msbuild\build\*.*" target="build" />
+    <file src="README.md" target="" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Dataverse/PDPackage/msbuild/build/TALXIS.DevKit.Build.Dataverse.PdPackage.targets b/src/Dataverse/PDPackage/msbuild/build/TALXIS.DevKit.Build.Dataverse.PdPackage.targets
new file mode 100644
index 0000000..658e6ba
--- /dev/null
+++ b/src/Dataverse/PDPackage/msbuild/build/TALXIS.DevKit.Build.Dataverse.PdPackage.targets
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="$(MSBuildThisFileDirectory)..\tasks\$(MSBuildThisFileName).targets" />
+</Project>
\ No newline at end of file
diff --git a/src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.PdPackage.targets b/src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.PdPackage.targets
new file mode 100644
index 0000000..980ee19
--- /dev/null
+++ b/src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.PdPackage.targets
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <Target Name="_GetPdPackageItemsFromPpProjectReferences"
+        Condition="'@(ProjectReference->HasMetadata('PpProjectType'))' != ''">
+        <MSBuild Projects="@(ProjectReference->HasMetadata('PpProjectType'))"
+            Targets="Build;GetOutputsForPdPackage"
+            Properties="Configuration=$(Configuration)"
+            BuildInParallel="true">
+            <Output TaskParameter="TargetOutputs"
+                ItemName="_PdPackageItemFromProjectReference" />
+        </MSBuild>
+        <ItemGroup>
+            <PdSolution Include="@(_PdPackageItemFromProjectReference)"
+                Condition="'%(_PdPackageItemFromProjectReference.PdOutputType)' == 'PdSolution'" />
+        </ItemGroup>
+    </Target>
+
+</Project>
\ No newline at end of file
diff --git a/src/Dataverse/ScriptLibrary/README.md b/src/Dataverse/ScriptLibrary/README.md
new file mode 100644
index 0000000..f1608d7
--- /dev/null
+++ b/src/Dataverse/ScriptLibrary/README.md
@@ -0,0 +1,3 @@
+# TALXIS.DevKit.Build.Dataverse.Tasks
+
+See [here](https://github.com/TALXIS/tools-devkit-build) for more information.
\ No newline at end of file
diff --git a/src/Dataverse/ScriptLibrary/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.csproj b/src/Dataverse/ScriptLibrary/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.csproj
new file mode 100644
index 0000000..6a1c63d
--- /dev/null
+++ b/src/Dataverse/ScriptLibrary/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Version Condition="'$(Version)'==''">0.0.0.1</Version>
+    <NuspecFile>TALXIS.DevKit.Build.Dataverse.ScriptLibrary.nuspec</NuspecFile>
+    <NuspecProperties>
+      Version=$(Version)
+    </NuspecProperties>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Dataverse/ScriptLibrary/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.nuspec b/src/Dataverse/ScriptLibrary/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.nuspec
new file mode 100644
index 0000000..4317d12
--- /dev/null
+++ b/src/Dataverse/ScriptLibrary/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>TALXIS.DevKit.Build.Dataverse.ScriptLibrary</id>
+    <version>$Version$</version>
+    <authors>TALXIS</authors>
+    <developmentDependency>true</developmentDependency>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <readme>README.md</readme>
+    <projectUrl>https://github.com/TALXIS/tools-devkit-build</projectUrl>
+    <description>Dataverse MSBuild ScriptLibrary</description>
+    <releaseNotes>https://github.com/TALXIS/tools-devkit-build/releases</releaseNotes>
+    <copyright>2025 NETWORG</copyright>
+    <repository type="git" url="https://github.com/TALXIS/tools-devkit-build"
+      commit="c941d55d453c1c64a1e248a240b0327d2dcd76ee" />
+    <dependencies>
+      <dependency id="TALXIS.DevKit.Build.Dataverse.Tasks" version="$Version$" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="msbuild\tasks\*.*" target="tasks" />
+    <file src="msbuild\build\*.*" target="build" />
+    <file src="README.md" target="" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/Dataverse/ScriptLibrary/msbuild/build/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props b/src/Dataverse/ScriptLibrary/msbuild/build/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props
new file mode 100644
index 0000000..07cd5de
--- /dev/null
+++ b/src/Dataverse/ScriptLibrary/msbuild/build/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)..\tasks\$(MSBuildThisFile)" />
+</Project>
+  
\ No newline at end of file
diff --git a/src/Dataverse/ScriptLibrary/msbuild/build/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets b/src/Dataverse/ScriptLibrary/msbuild/build/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
new file mode 100644
index 0000000..8a0424d
--- /dev/null
+++ b/src/Dataverse/ScriptLibrary/msbuild/build/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)..\tasks\$(MSBuildThisFile)" />
+</Project>
diff --git a/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props b/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props
new file mode 100644
index 0000000..4645b59
--- /dev/null
+++ b/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props
@@ -0,0 +1,8 @@
+<Project>
+    <PropertyGroup>
+      <ScriptLibraryMainFile Condition="'$(ScriptLibraryMainFile)'==''">
+        $(MSBuildProjectDirectory)\TS\build\main.js
+      </ScriptLibraryMainFile>
+    </PropertyGroup>
+  </Project>
+  
\ No newline at end of file
diff --git a/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets b/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
new file mode 100644
index 0000000..6208d8a
--- /dev/null
+++ b/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="GetIsScriptLibrary" Returns="@(_IsScriptLibrary)">
+    <ItemGroup>
+      <_IsScriptLibrary Include="$(MSBuildProjectFullPath)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="GetScriptLibraryOutputs"
+    DependsOnTargets="Build"
+    Returns="@(_ScriptLibraryOutputs)">
+    <ItemGroup>
+      <_ScriptLibraryOutputs Include="$(MSBuildProjectDirectory)\TS\build\main.js" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="GetProjectOutputPath"
+    DependsOnTargets="Build"
+    Returns="@(_ProjectOutputPath)">
+    <ItemGroup>
+      <_ProjectOutputPath Include="$(TargetPath)" />
+    </ItemGroup>
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.OverridePAC.targets b/src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.OverridePAC.targets
new file mode 100644
index 0000000..658e6ba
--- /dev/null
+++ b/src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.OverridePAC.targets
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="$(MSBuildThisFileDirectory)..\tasks\$(MSBuildThisFileName).targets" />
+</Project>
\ No newline at end of file
diff --git a/src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets b/src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
new file mode 100644
index 0000000..658e6ba
--- /dev/null
+++ b/src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="$(MSBuildThisFileDirectory)..\tasks\$(MSBuildThisFileName).targets" />
+</Project>
\ No newline at end of file
diff --git a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.OverridePAC.targets b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.OverridePAC.targets
new file mode 100644
index 0000000..1b1cccf
--- /dev/null
+++ b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.OverridePAC.targets
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="ProcessCdsProjectReferencesOutputs"
+          BeforeTargets="PowerAppsPackage"
+          DependsOnTargets="ProbeScriptLibraries"
+          Condition="'@(ProjectReference)'!=''">
+
+    <PropertyGroup>
+      <_ScriptLibraryProjectsList>;@(_ScriptLibraryProjects->'%(Identity)');</_ScriptLibraryProjectsList>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <_CdsRefs Include="@(ProjectReference)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <_CdsRefs Remove="@(_CdsRefs)"
+                Condition="$([System.String]::Copy('$(_ScriptLibraryProjectsList)').Contains(';%(FullPath);'))" />
+    </ItemGroup>
+
+    <Message Importance="high"
+             Text="Detected ScriptLibrary projects: @(_ScriptLibraryProjects->'%(Identity)', ', ')"
+             Condition="'@(_ScriptLibraryProjects)'!=''" />
+
+    <Message Importance="high"
+             Text="PAC refs after filtering: @(_CdsRefs->'%(FullPath)', ', ')"
+             Condition="'@(_CdsRefs)'!=''" />
+
+    <MSBuild Projects="@(_CdsRefs)"
+             Targets="GetProjectOutputPath">
+      <Output TaskParameter="TargetOutputs"
+              ItemName="ProjectReferenceCopyLocalPaths" />
+    </MSBuild>
+
+    <ProcessCdsProjectReferencesOutputs
+        WorkingDirectoryPath="$(SolutionPackagerMetadataWorkingDirectory)"
+        SourceFileItems="@(ProjectReferenceCopyLocalPaths)"
+        PcfForceUpdateFlag="$(PcfForceUpdate)" />
+  </Target>
+
+</Project>
diff --git a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
new file mode 100644
index 0000000..dbca952
--- /dev/null
+++ b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="ProbeScriptLibraries"
+          BeforeTargets="BuildScriptLibraries"
+          Condition="'@(ProjectReference)'!=''">
+
+    <MSBuild Projects="@(ProjectReference->'%(FullPath)')"
+             Targets="GetIsScriptLibrary"
+             Properties="Configuration=$(Configuration)"
+             BuildInParallel="true"
+             SkipNonexistentTargets="true">
+      <Output TaskParameter="TargetOutputs" ItemName="_ScriptLibraryProjects" />
+    </MSBuild>
+
+    <Message Importance="high"
+             Text="Detected ScriptLibrary projects: @(_ScriptLibraryProjects)"
+             Condition="'@(_ScriptLibraryProjects)'!=''" />
+  </Target>
+
+  <Target Name="BuildScriptLibraries"
+          BeforeTargets="CoreCompile"
+          DependsOnTargets="ProbeScriptLibraries"
+          Condition="'@(ProjectReference)'!=''">
+
+    <MSBuild Projects="@(ProjectReference->'%(FullPath)')"
+             Targets="GetScriptLibraryOutputs"
+             Properties="Configuration=$(Configuration)"
+             BuildInParallel="true"
+             SkipNonexistentTargets="true">
+      <Output TaskParameter="TargetOutputs" ItemName="_ScriptLibraryOutputs" />
+    </MSBuild>
+
+    <Message Importance="high"
+             Text="Script library outputs: @(_ScriptLibraryOutputs)"
+             Condition="'@(_ScriptLibraryOutputs)'!=''" />
+  </Target>
+
+  <Target Name="FixWebResourcesDir"
+          BeforeTargets="CopyScriptLibrariesToWebResources"
+          Condition="'$(WebResourcesDir)'=='' and '$(SolutionRootPath)'!=''">
+    <PropertyGroup>
+      <WebResourcesDir>$(MSBuildProjectDirectory)\$(SolutionRootPath)\WebResources\</WebResourcesDir>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="CopyScriptLibrariesToWebResources"
+          AfterTargets="BuildScriptLibraries"
+          BeforeTargets="CoreCompile"
+          Condition="'@(_ScriptLibraryOutputs)'!=''">
+
+    <MakeDir Directories="$(WebResourcesDir)" />
+
+    <ItemGroup>
+      <_ScriptFiles Include="@(_ScriptLibraryOutputs)" />
+      <_ScriptFilesToCopy Include="@(_ScriptFiles)">
+        <DestFile>
+          $(WebResourcesDir)$(PublisherPrefix)_$([System.IO.Path]::GetFileName('%(Identity)'))</DestFile>
+      </_ScriptFilesToCopy>
+    </ItemGroup>
+
+    <Message Importance="high"
+             Text="Copy scripts: @(_ScriptFilesToCopy->'%(Identity) -> %(DestFile)', ', ')" />
+
+    <Copy SourceFiles="@(_ScriptFilesToCopy)"
+          DestinationFiles="%(DestFile)"
+          SkipUnchangedFiles="true"
+          OverwriteReadOnlyFiles="true" />
+  </Target>
+
+</Project>
diff --git a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.props b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.props
index a10194c..763fffb 100644
--- a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.props
+++ b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.props
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="$(MSBuildThisFileDirectory)..\tasks\$(MSBuildThisFile)" />
 </Project>
\ No newline at end of file
diff --git a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.targets b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.targets
index 72ecfe8..e049176 100644
--- a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.targets
+++ b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.targets
@@ -1,15 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <!-- This needs to happen after CopyCdsSolutionContent and before ProcessCdsProjectReferencesOutputs, so that .dll mapping inside ProcessCdsProjectReferencesOutputs works -->
-    <Target Name="TalxisBeforeProcessCdsProjectReferencesOutputs" BeforeTargets="ProcessCdsProjectReferencesOutputs" DependsOnTargets="CopyCdsSolutionContent">
-        <CallTarget Targets="ApplyPluginVersionNumberInSolution"/>
-    </Target>
-
-    <!-- Once .dll are copied and we have everything in place, we can update references and solution -->
-    <Target Name="TalxisAfterProcessCdsProjectReferencesOutputs" AfterTargets="ProcessCdsProjectReferencesOutputs">
-        <!-- <CallTarget Targets="ValidateSolutionComponentSchema"/> -->
-        <CallTarget Targets="GenerateVersionNumber"/>
-        <CallTarget Targets="ApplyVersionNumber"/>
-    </Target>
-</Project>
\ No newline at end of file
+
+  <!-- Default no-op implementation.
+       If consumer (or another import) defines this target later, it will override this one. -->
+  <Target Name="ApplyPluginVersionNumberInSolution" />
+
+  <!-- This needs to happen after CopyCdsSolutionContent and before
+       ProcessCdsProjectReferencesOutputs -->
+  <Target Name="TalxisBeforeProcessCdsProjectReferencesOutputs"
+          BeforeTargets="ProcessCdsProjectReferencesOutputs"
+          DependsOnTargets="CopyCdsSolutionContent">
+    <CallTarget Targets="ApplyPluginVersionNumberInSolution" />
+  </Target>
+
+  <!-- Once .dll are copied and we have everything in place -->
+  <Target Name="TalxisAfterProcessCdsProjectReferencesOutputs"
+          AfterTargets="ProcessCdsProjectReferencesOutputs">
+    <CallTarget Targets="GenerateVersionNumber" />
+    <CallTarget Targets="ApplyVersionNumber" />
+  </Target>
+
+  <!--  ScriptLibrary logic (detect, build, copy) -->
+  <Import Project="$(MSBuildThisFileDirectory)TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets"
+          Condition="Exists('$(MSBuildThisFileDirectory)TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets')" />
+
+  <!-- Override PAC / Microsoft targets -->
+  <Import Project="$(MSBuildThisFileDirectory)TALXIS.DevKit.Build.Dataverse.Solution.OverridePAC.targets"
+          Condition="Exists('$(MSBuildThisFileDirectory)TALXIS.DevKit.Build.Dataverse.Solution.OverridePAC.targets')" />
+
+</Project>

From b5d0c576bcb84fd552c52200a35db40304d05db4 Mon Sep 17 00:00:00 2001
From: Alexander Zekelin <aleksander.zekelin@networg.com>
Date: Wed, 26 Nov 2025 10:01:49 +0100
Subject: [PATCH 2/6] Script library build update

---
 ...vKit.Build.Dataverse.ScriptLibrary.targets | 20 +++++++++++++++++++
 ...Dataverse.Solution.ScriptLibraries.targets |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets b/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
index 6208d8a..172d38a 100644
--- a/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
+++ b/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup>
+    <RunNodeBuild Condition="'$(RunNodeBuild)'==''">false</RunNodeBuild>
+
+    <TypeScriptDir Condition="'$(TypeScriptDir)'==''">$(MSBuildProjectDirectory)\TS</TypeScriptDir>
+  </PropertyGroup>
+
+  <Target Name="BuildTypeScript"
+    BeforeTargets="Build"
+    Condition="'$(RunNodeBuild)'=='true'">
+    <Message Text="Building TypeScript in $(TypeScriptDir)" Importance="High" />
+    <Exec WorkingDirectory="$(TypeScriptDir)" Command="npm install" />
+    <Exec WorkingDirectory="$(TypeScriptDir)" Command="npm run build" />
+  </Target>
+
+  <ItemGroup>
+    <None Include="TS\build\**\*.*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <Target Name="GetIsScriptLibrary" Returns="@(_IsScriptLibrary)">
     <ItemGroup>
       <_IsScriptLibrary Include="$(MSBuildProjectFullPath)" />
diff --git a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
index dbca952..daa3570 100644
--- a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
+++ b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
@@ -26,7 +26,7 @@
 
     <MSBuild Projects="@(ProjectReference->'%(FullPath)')"
              Targets="GetScriptLibraryOutputs"
-             Properties="Configuration=$(Configuration)"
+             Properties="Configuration=$(Configuration);RunNodeBuild=true"
              BuildInParallel="true"
              SkipNonexistentTargets="true">
       <Output TaskParameter="TargetOutputs" ItemName="_ScriptLibraryOutputs" />

From a0507f726af6b26704fd5b64f60c6518cfb051b6 Mon Sep 17 00:00:00 2001
From: Alexander Zekelin <aleksander.zekelin@networg.com>
Date: Thu, 4 Dec 2025 16:19:26 +0100
Subject: [PATCH 3/6] sdk base created

---
 ...DevKit.Build.Dataverse.ScriptLibrary.props | 14 +++++-----
 ...vKit.Build.Dataverse.ScriptLibrary.targets |  8 +++---
 src/Dataverse/Sdk/README.md                   |  2 ++
 src/Dataverse/Sdk/Sdk/Sdk.props               | 20 ++++++++++++++
 .../Sdk/TALXIS.DevKit.Build.Sdk.csproj        | 13 ++++++++++
 .../Sdk/TALXIS.DevKit.Build.Sdk.nuspec        | 26 +++++++++++++++++++
 ...Dataverse.Solution.ScriptLibraries.targets | 10 +++++--
 7 files changed, 81 insertions(+), 12 deletions(-)
 create mode 100644 src/Dataverse/Sdk/README.md
 create mode 100644 src/Dataverse/Sdk/Sdk/Sdk.props
 create mode 100644 src/Dataverse/Sdk/TALXIS.DevKit.Build.Sdk.csproj
 create mode 100644 src/Dataverse/Sdk/TALXIS.DevKit.Build.Sdk.nuspec

diff --git a/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props b/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props
index 4645b59..196c76e 100644
--- a/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props
+++ b/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.props
@@ -1,8 +1,8 @@
 <Project>
-    <PropertyGroup>
-      <ScriptLibraryMainFile Condition="'$(ScriptLibraryMainFile)'==''">
-        $(MSBuildProjectDirectory)\TS\build\main.js
-      </ScriptLibraryMainFile>
-    </PropertyGroup>
-  </Project>
-  
\ No newline at end of file
+  <PropertyGroup>
+    <ProjectType Condition="'$(ProjectType)'==''">ScriptLibrary</ProjectType>
+    <ScriptLibraryMainFile Condition="'$(ScriptLibraryMainFile)'==''">
+      $(MSBuildProjectDirectory)\TS\build\main.js
+    </ScriptLibraryMainFile>
+  </PropertyGroup>
+</Project>
diff --git a/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets b/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
index 172d38a..876d5ea 100644
--- a/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
+++ b/src/Dataverse/ScriptLibrary/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.ScriptLibrary.targets
@@ -21,9 +21,11 @@
     </None>
   </ItemGroup>
 
-  <Target Name="GetIsScriptLibrary" Returns="@(_IsScriptLibrary)">
+  <Target Name="GetProjectType" Returns="@(_ProjectType)" Condition="'$(ProjectType)'!=''">
     <ItemGroup>
-      <_IsScriptLibrary Include="$(MSBuildProjectFullPath)" />
+      <_ProjectType Include="$(MSBuildProjectFullPath)">
+        <ProjectType>$(ProjectType)</ProjectType>
+      </_ProjectType>
     </ItemGroup>
   </Target>
 
@@ -43,4 +45,4 @@
     </ItemGroup>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Dataverse/Sdk/README.md b/src/Dataverse/Sdk/README.md
new file mode 100644
index 0000000..5a1ce0a
--- /dev/null
+++ b/src/Dataverse/Sdk/README.md
@@ -0,0 +1,2 @@
+# TALXIS.DevKit.Build.Sdk
+
diff --git a/src/Dataverse/Sdk/Sdk/Sdk.props b/src/Dataverse/Sdk/Sdk/Sdk.props
new file mode 100644
index 0000000..9d20a1e
--- /dev/null
+++ b/src/Dataverse/Sdk/Sdk/Sdk.props
@@ -0,0 +1,20 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+    <PropertyGroup>
+      <TALXISDevKitDataversePackageBase Condition="'$(TALXISDevKitDataversePackageBase)' == ''">TALXIS.DevKit.Build.Dataverse</TALXISDevKitDataversePackageBase>
+      <TALXISDevKitDataversePackageVersion Condition="'$(TALXISDevKitDataversePackageVersion)' == ''">0.0.0.1</TALXISDevKitDataversePackageVersion>
+      <TALXISDevKitDataversePackageName Condition="'$(TALXISDevKitDataversePackageName)' == '' and '$(ProjectType)' != ''">$(TALXISDevKitDataversePackageBase).$(ProjectType)</TALXISDevKitDataversePackageName>
+    </PropertyGroup>
+  
+    <ItemGroup Condition="'$(TALXISDevKitDataversePackageName)' != ''">
+      <PackageReference Include="$(TALXISDevKitDataversePackageName)"
+                        Version="$(TALXISDevKitDataversePackageVersion)"
+                        PrivateAssets="All">
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+    </ItemGroup>
+  
+  
+  </Project>
+  
diff --git a/src/Dataverse/Sdk/TALXIS.DevKit.Build.Sdk.csproj b/src/Dataverse/Sdk/TALXIS.DevKit.Build.Sdk.csproj
new file mode 100644
index 0000000..229c117
--- /dev/null
+++ b/src/Dataverse/Sdk/TALXIS.DevKit.Build.Sdk.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Version Condition="'$(Version)'==''">0.0.0.1</Version>
+    <NuspecFile>TALXIS.DevKit.Build.Sdk.nuspec</NuspecFile>
+    <NuspecProperties>
+      Version=$(Version)
+    </NuspecProperties>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Dataverse/Sdk/TALXIS.DevKit.Build.Sdk.nuspec b/src/Dataverse/Sdk/TALXIS.DevKit.Build.Sdk.nuspec
new file mode 100644
index 0000000..e39f9e7
--- /dev/null
+++ b/src/Dataverse/Sdk/TALXIS.DevKit.Build.Sdk.nuspec
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+    <id>TALXIS.DevKit.Build.Sdk</id>
+    <version>$Version$</version>
+    <authors>TALXIS</authors>
+    <developmentDependency>true</developmentDependency>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <readme>README.md</readme>
+    <projectUrl>https://github.com/TALXIS/tools-devkit-build</projectUrl>
+    <description>Dataverse MSBuild SDK</description>
+    <releaseNotes>https://github.com/TALXIS/tools-devkit-build/releases</releaseNotes>
+    <copyright>2025 NETWORG</copyright>
+    <repository type="git" url="https://github.com/TALXIS/tools-devkit-build"
+      commit="c941d55d453c1c64a1e248a240b0327d2dcd76ee" />
+    <packageTypes>
+      <packageType name="MSBuildSdk" />
+    </packageTypes>
+  </metadata>
+  <files>
+    <file src="README.md" target="" />
+    <file src="Sdk\**\*" target="Sdk" />
+  </files>
+</package>
diff --git a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
index daa3570..2dfd997 100644
--- a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
+++ b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
@@ -7,13 +7,19 @@
           Condition="'@(ProjectReference)'!=''">
 
     <MSBuild Projects="@(ProjectReference->'%(FullPath)')"
-             Targets="GetIsScriptLibrary"
+             Targets="GetProjectType"
              Properties="Configuration=$(Configuration)"
              BuildInParallel="true"
              SkipNonexistentTargets="true">
-      <Output TaskParameter="TargetOutputs" ItemName="_ScriptLibraryProjects" />
+      <Output TaskParameter="TargetOutputs" ItemName="_ProjectTypeFromReferences" />
     </MSBuild>
 
+    <ItemGroup>
+      <_ScriptLibraryProjects Remove="@(_ScriptLibraryProjects)" />
+      <_ScriptLibraryProjects Include="@(_ProjectTypeFromReferences)"
+                              Condition="'%(ProjectType)'=='ScriptLibrary'" />
+    </ItemGroup>
+
     <Message Importance="high"
              Text="Detected ScriptLibrary projects: @(_ScriptLibraryProjects)"
              Condition="'@(_ScriptLibraryProjects)'!=''" />

From 253cb05a85458c7c46df751fc63ed430b1e57b6b Mon Sep 17 00:00:00 2001
From: Alexander Zekelin <aleksander.zekelin@networg.com>
Date: Fri, 5 Dec 2025 13:55:51 +0100
Subject: [PATCH 4/6] sdk complited

---
 src/Dataverse/Sdk/Sdk/Sdk.props   | 3 ++-
 src/Dataverse/Sdk/Sdk/Sdk.targets | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 src/Dataverse/Sdk/Sdk/Sdk.targets

diff --git a/src/Dataverse/Sdk/Sdk/Sdk.props b/src/Dataverse/Sdk/Sdk/Sdk.props
index 9d20a1e..c0e3716 100644
--- a/src/Dataverse/Sdk/Sdk/Sdk.props
+++ b/src/Dataverse/Sdk/Sdk/Sdk.props
@@ -1,6 +1,8 @@
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
+  <Target Name="GetProjectOutputPath" Returns="@(_ProjectOutputPath)" />
+
     <PropertyGroup>
       <TALXISDevKitDataversePackageBase Condition="'$(TALXISDevKitDataversePackageBase)' == ''">TALXIS.DevKit.Build.Dataverse</TALXISDevKitDataversePackageBase>
       <TALXISDevKitDataversePackageVersion Condition="'$(TALXISDevKitDataversePackageVersion)' == ''">0.0.0.1</TALXISDevKitDataversePackageVersion>
@@ -15,6 +17,5 @@
       </PackageReference>
     </ItemGroup>
   
-  
   </Project>
   
diff --git a/src/Dataverse/Sdk/Sdk/Sdk.targets b/src/Dataverse/Sdk/Sdk/Sdk.targets
new file mode 100644
index 0000000..8c119d5
--- /dev/null
+++ b/src/Dataverse/Sdk/Sdk/Sdk.targets
@@ -0,0 +1,2 @@
+<Project>
+</Project>

From 11a48e65dea8e7e5b58c28f68721348f76fa3cc8 Mon Sep 17 00:00:00 2001
From: Alexander Zekelin <aleksander.zekelin@networg.com>
Date: Fri, 5 Dec 2025 14:56:40 +0100
Subject: [PATCH 5/6] sdk complited

---
 src/Dataverse/Sdk/Sdk/Sdk.props   | 22 +++++-----------------
 src/Dataverse/Sdk/Sdk/Sdk.targets | 13 +++++++++++++
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/Dataverse/Sdk/Sdk/Sdk.props b/src/Dataverse/Sdk/Sdk/Sdk.props
index c0e3716..6ac8f96 100644
--- a/src/Dataverse/Sdk/Sdk/Sdk.props
+++ b/src/Dataverse/Sdk/Sdk/Sdk.props
@@ -2,20 +2,8 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <Target Name="GetProjectOutputPath" Returns="@(_ProjectOutputPath)" />
-
-    <PropertyGroup>
-      <TALXISDevKitDataversePackageBase Condition="'$(TALXISDevKitDataversePackageBase)' == ''">TALXIS.DevKit.Build.Dataverse</TALXISDevKitDataversePackageBase>
-      <TALXISDevKitDataversePackageVersion Condition="'$(TALXISDevKitDataversePackageVersion)' == ''">0.0.0.1</TALXISDevKitDataversePackageVersion>
-      <TALXISDevKitDataversePackageName Condition="'$(TALXISDevKitDataversePackageName)' == '' and '$(ProjectType)' != ''">$(TALXISDevKitDataversePackageBase).$(ProjectType)</TALXISDevKitDataversePackageName>
-    </PropertyGroup>
-  
-    <ItemGroup Condition="'$(TALXISDevKitDataversePackageName)' != ''">
-      <PackageReference Include="$(TALXISDevKitDataversePackageName)"
-                        Version="$(TALXISDevKitDataversePackageVersion)"
-                        PrivateAssets="All">
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-    </ItemGroup>
-  
-  </Project>
-  
+  <PropertyGroup>
+    <TALXISDevKitDataversePackageBase Condition="'$(TALXISDevKitDataversePackageBase)' == ''">TALXIS.DevKit.Build.Dataverse</TALXISDevKitDataversePackageBase>
+    <TALXISDevKitDataversePackageVersion Condition="'$(TALXISDevKitDataversePackageVersion)' == ''">0.0.0.1</TALXISDevKitDataversePackageVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/Dataverse/Sdk/Sdk/Sdk.targets b/src/Dataverse/Sdk/Sdk/Sdk.targets
index 8c119d5..8abf675 100644
--- a/src/Dataverse/Sdk/Sdk/Sdk.targets
+++ b/src/Dataverse/Sdk/Sdk/Sdk.targets
@@ -1,2 +1,15 @@
 <Project>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup>
+    <TALXISDevKitDataversePackageName Condition="'$(TALXISDevKitDataversePackageName)' == '' and '$(ProjectType)' != ''">$(TALXISDevKitDataversePackageBase).$(ProjectType)</TALXISDevKitDataversePackageName>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TALXISDevKitDataversePackageName)' != ''">
+    <PackageReference Include="$(TALXISDevKitDataversePackageName)"
+                      Version="$(TALXISDevKitDataversePackageVersion)"
+                      PrivateAssets="All">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>

From 7a0d42cf56c68ee8feb22cc8612407d2bf972348 Mon Sep 17 00:00:00 2001
From: Alexander Zekelin <aleksander.zekelin@networg.com>
Date: Fri, 5 Dec 2025 18:58:49 +0100
Subject: [PATCH 6/6] branches merged

---
 ...S.DevKit.Build.Dataverse.PdPackage.targets |  8 ++-
 ...DevKit.Build.Dataverse.DataPackage.targets | 52 +++++++++++++++++++
 ...Build.Dataverse.PdPackage.ILRepack.targets | 40 ++++++++++++++
 3 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.DataPackage.targets
 create mode 100644 src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.PdPackage.ILRepack.targets

diff --git a/src/Dataverse/PDPackage/msbuild/build/TALXIS.DevKit.Build.Dataverse.PdPackage.targets b/src/Dataverse/PDPackage/msbuild/build/TALXIS.DevKit.Build.Dataverse.PdPackage.targets
index 658e6ba..5569d13 100644
--- a/src/Dataverse/PDPackage/msbuild/build/TALXIS.DevKit.Build.Dataverse.PdPackage.targets
+++ b/src/Dataverse/PDPackage/msbuild/build/TALXIS.DevKit.Build.Dataverse.PdPackage.targets
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$(MSBuildThisFileDirectory)..\tasks\$(MSBuildThisFileName).targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildThisFileDirectory)..\tasks\$(MSBuildThisFileName).targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tasks\TALXIS.DevKit.Build.Dataverse.DataPackage.targets"
+          Condition="Exists('$(MSBuildThisFileDirectory)..\tasks\TALXIS.DevKit.Build.Dataverse.DataPackage.targets')" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tasks\TALXIS.DevKit.Build.Dataverse.PdPackage.ILRepack.targets"
+          Condition="Exists('$(MSBuildThisFileDirectory)..\tasks\TALXIS.DevKit.Build.Dataverse.PdPackage.ILRepack.targets')" />
+</Project>
diff --git a/src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.DataPackage.targets b/src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.DataPackage.targets
new file mode 100644
index 0000000..e7ce5eb
--- /dev/null
+++ b/src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.DataPackage.targets
@@ -0,0 +1,52 @@
+<Project>
+  <PropertyGroup>
+    <DataPackageSearchRoot Condition="'$(DataPackageSearchRoot)'==''">
+      $([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)'))
+    </DataPackageSearchRoot>
+
+    <DataPackageOutputDir Condition="'$(DataPackageOutputDir)'=='' and '$(TargetDir)'!=''">
+      $([System.IO.Path]::Combine('$([System.IO.Path]::GetFullPath('$(TargetDir)'))','DataPackages'))
+    </DataPackageOutputDir>
+    <DataPackageOutputDir Condition="'$(DataPackageOutputDir)'==''">
+      $([System.IO.Path]::Combine('$([System.IO.Path]::GetFullPath('$(OutputPath)'))','DataPackages'))
+    </DataPackageOutputDir>
+
+    <DataPackageOutputDir>$([System.Text.RegularExpressions.Regex]::Replace('$(DataPackageOutputDir)', '[\\/]*$', ''))\</DataPackageOutputDir>
+  </PropertyGroup>
+
+  <Target Name="TalxisDiscoverDataPackages">
+    <ItemGroup>
+      <_DataPackageCandidates Include="$(DataPackageSearchRoot)**\[Content_Types].xml"
+                               Condition="Exists('$([System.IO.Path]::Combine('$([System.IO.Path]::GetDirectoryName('%(FullPath)'))','data_schema.xml'))') and
+                                          Exists('$([System.IO.Path]::Combine('$([System.IO.Path]::GetDirectoryName('%(FullPath)'))','data.xml'))')">
+        <PackageDir>$([System.IO.Path]::GetDirectoryName('%(FullPath)'))</PackageDir>
+      </_DataPackageCandidates>
+    </ItemGroup>
+
+    <ItemGroup>
+      <_DataPackageDirs Include="@(_DataPackageCandidates->'%(PackageDir)')" Distinct="true" />
+    </ItemGroup>
+
+    <Message Text="Detected data packages: @(_DataPackageDirs)" Importance="High" Condition="'@(_DataPackageDirs)'!=''" />
+  </Target>
+
+  <Target Name="TalxisZipDataPackages"
+          AfterTargets="Build"
+          DependsOnTargets="TalxisDiscoverDataPackages"
+          Condition="'@(_DataPackageDirs)'!=''">
+
+    <MakeDir Directories="$(DataPackageOutputDir)" />
+
+    <ItemGroup>
+      <_DataPackageZips Include="@(_DataPackageDirs)">
+        <ZipFile>$(DataPackageOutputDir)$([System.IO.Path]::GetFileName('%(Identity)')).zip</ZipFile>
+      </_DataPackageZips>
+    </ItemGroup>
+
+    <Message Text="Zipping data packages: @(_DataPackageZips->'%(Identity) -> %(ZipFile)', ', ')" Importance="High" />
+
+    <ZipDirectory SourceDirectory="%(Identity)"
+                  DestinationFile="%(ZipFile)"
+                  Overwrite="true" />
+  </Target>
+</Project>
diff --git a/src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.PdPackage.ILRepack.targets b/src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.PdPackage.ILRepack.targets
new file mode 100644
index 0000000..d63fe14
--- /dev/null
+++ b/src/Dataverse/PDPackage/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.PdPackage.ILRepack.targets
@@ -0,0 +1,40 @@
+<Project>
+  <PropertyGroup>
+    <ILRepackVersion Condition="'$(ILRepackVersion)'==''">2.0.18</ILRepackVersion>
+    <ILRepackExe Condition="'$(ILRepackExe)'==''">$(NuGetPackageRoot)ilrepack\$(ILRepackVersion)\tools\ILRepack.exe</ILRepackExe>
+    <DataversePackageRunILRepack Condition="'$(DataversePackageRunILRepack)'==''">true</DataversePackageRunILRepack>
+    <ReferencedAssembliesDir Condition="'$(ReferencedAssembliesDir)'==''">$(TargetDir)</ReferencedAssembliesDir>
+    <ReferencedAssembliesDir>$([System.Text.RegularExpressions.Regex]::Replace('$(ReferencedAssembliesDir)', '[\\/]+$', ''))</ReferencedAssembliesDir>
+  </PropertyGroup>
+
+  <Target Name="DataverseILRepack" AfterTargets="Build" Condition="'$(SkipPackageILRepack)' != 'true' and '$(DataversePackageRunILRepack)'!='false'">
+    <PropertyGroup>
+      <BuildedAssembly>$(TargetPath)</BuildedAssembly>
+      <_KeyFileSwitch Condition="Exists('$(DataversePackageILRepackKeyFile)')">/keyfile:"$(DataversePackageILRepackKeyFile)"</_KeyFileSwitch>
+    </PropertyGroup>
+
+    <Error Condition="'$(BuildedAssembly)'=='' or !Exists('$(BuildedAssembly)')" Text="Build output not found: $(BuildedAssembly)" />
+    <Error Condition="!Exists('$(ILRepackExe)')" Text="ILRepack.exe not found: $(ILRepackExe). Check restore/version." />
+
+    <ItemGroup>
+      <AssembliesToExclude Include="$(BuildedAssembly)" />
+      <AssembliesToExclude Include="$(TargetDir)Microsoft.*.dll"
+                            Exclude="$(TargetDir)Microsoft.Bcl.AsyncInterfaces.dll" />
+
+      <ReferencedAssemblies Include="$(ReferencedAssembliesDir)\*.dll" Condition="Exists('$(ReferencedAssembliesDir)')" />
+      <AssembliesToExclude Include="$(TargetDir)%(ReferencedAssemblies.FileName)%(ReferencedAssemblies.Extension)"
+                           Exclude="$(TargetDir)Newtonsoft.Json.dll"
+                           Condition="@(ReferencedAssemblies)!=''" />
+
+      <OtherAssemblies Include="$(TargetDir)*.dll" Exclude="@(AssembliesToExclude)" />
+    </ItemGroup>
+
+    <Message Text="ILRepackExe = $(ILRepackExe)" Importance="High" />
+    <Message Text="Merging into: $(BuildedAssembly)" Importance="High" />
+    <Message Text="OtherAssemblies: @(OtherAssemblies)" Importance="High" />
+
+    <Message Text="ILRepack skipped: no additional assemblies to merge." Importance="High" Condition="'@(OtherAssemblies)'==''" />
+
+    <Exec Command="&quot;$(ILRepackExe)&quot; /lib:&quot;$(ReferencedAssembliesDir)&quot; /target:library /parallel $(_KeyFileSwitch) /out:&quot;$(BuildedAssembly)&quot; &quot;$(BuildedAssembly)&quot; @(OtherAssemblies,' ')" Condition="'@(OtherAssemblies)'!=''" />
+  </Target>
+</Project>