From 0a9113b77d548defe5e9e89f405efa09d3a99b77 Mon Sep 17 00:00:00 2001
From: Nils-Paul Korte <nkorte@one-ware.com>
Date: Thu, 7 May 2026 17:46:29 +0200
Subject: [PATCH] Move configuration to Sdk.

---
 OneWare.Plugin.Sdk/OneWare.Plugin.Sdk.csproj  | 22 +++++++++++++++++++
 .../build/OneWare.Plugin.Sdk.targets          | 19 ++++++++++++++++
 OneWare.Templates.csproj                      | 11 ++++++++++
 install-dev-templates.ps1                     |  6 +++--
 install-dev-templates.sh                      |  5 +++--
 .../OneWareExtensionTemplate.csproj           |  7 +++---
 6 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 OneWare.Plugin.Sdk/OneWare.Plugin.Sdk.csproj
 create mode 100644 OneWare.Plugin.Sdk/build/OneWare.Plugin.Sdk.targets

diff --git a/OneWare.Plugin.Sdk/OneWare.Plugin.Sdk.csproj b/OneWare.Plugin.Sdk/OneWare.Plugin.Sdk.csproj
new file mode 100644
index 0000000..adba51c
--- /dev/null
+++ b/OneWare.Plugin.Sdk/OneWare.Plugin.Sdk.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <PackageId>OneWare.Plugin.Sdk</PackageId>
+    <Version Condition="'$(Version)' == ''">1.0.0</Version>
+    <Authors>OneWare</Authors>
+    <Description>MSBuild debug launch integration for OneWare plugin development.</Description>
+    <PackageProjectUrl>https://github.com/one-ware/OneWare.Templates</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/one-ware/OneWare.Templates.git</RepositoryUrl>
+    <PackageTags>oneware;plugin;sdk;msbuild</PackageTags>
+    <PackageType>Dependency</PackageType>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NoBuild>true</NoBuild>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="build\**\*" Pack="true" PackagePath="build\" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/OneWare.Plugin.Sdk/build/OneWare.Plugin.Sdk.targets b/OneWare.Plugin.Sdk/build/OneWare.Plugin.Sdk.targets
new file mode 100644
index 0000000..c606daf
--- /dev/null
+++ b/OneWare.Plugin.Sdk/build/OneWare.Plugin.Sdk.targets
@@ -0,0 +1,19 @@
+<Project>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug' and '$(TargetPath)' != ''">
+    <OneWareCommand Condition="'$(OneWareCommand)' == '' and '$(ONEWARE_RUN_COMMAND)' != ''">$(ONEWARE_RUN_COMMAND)</OneWareCommand>
+    <OneWareCommand Condition="'$(OneWareCommand)' == ''">oneware</OneWareCommand>
+    <OneWarePluginDebugPath>$([System.IO.Path]::GetDirectoryName('$(TargetPath)'))</OneWarePluginDebugPath>
+    <OneWareRunArguments>--modules &quot;$(OneWarePluginDebugPath)&quot;</OneWareRunArguments>
+    <StartAction Condition="'$(StartAction)' == ''">Program</StartAction>
+    <StartProgram Condition="'$(StartProgram)' == '' and '$(OS)' == 'Windows_NT'">$([System.Environment]::GetEnvironmentVariable('ComSpec'))</StartProgram>
+    <StartProgram Condition="'$(StartProgram)' == '' and '$(OS)' != 'Windows_NT'">/bin/sh</StartProgram>
+    <StartArguments Condition="'$(StartArguments)' == '' and '$(OS)' == 'Windows_NT'">/c &quot;&quot;$(OneWareCommand)&quot; $(OneWareRunArguments)&quot;</StartArguments>
+    <StartArguments Condition="'$(StartArguments)' == '' and '$(OS)' != 'Windows_NT'">-lc '&quot;$(OneWareCommand)&quot; $(OneWareRunArguments)'</StartArguments>
+    <StartWorkingDirectory Condition="'$(StartWorkingDirectory)' == ''">$(OneWarePluginDebugPath)</StartWorkingDirectory>
+    <RunCommand Condition="'$(RunCommand)' == ''">$(OneWareCommand)</RunCommand>
+    <RunArguments Condition="'$(RunArguments)' == ''">$(OneWareRunArguments)</RunArguments>
+    <RunWorkingDirectory Condition="'$(RunWorkingDirectory)' == ''">$(OneWarePluginDebugPath)</RunWorkingDirectory>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/OneWare.Templates.csproj b/OneWare.Templates.csproj
index ad6a367..a8b78a0 100644
--- a/OneWare.Templates.csproj
+++ b/OneWare.Templates.csproj
@@ -4,6 +4,7 @@
     <PackageType>Template</PackageType>
     <PackageVersion>1.0.0</PackageVersion>
     <PackageId>OneWare.Templates</PackageId>
+    <PluginSdkPackageVersion>1.0.0</PluginSdkPackageVersion>
     <Title>OneWare Templates</Title>
     <Description>Templates for creating OneWare extensions and libraries.</Description>
     <PackageTags>dotnet-new;templates;oneware</PackageTags>
@@ -27,4 +28,14 @@
     <None Include="package-icon.png" Pack="true" PackagePath="/" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AdditionalPackProjects Include="OneWare.Plugin.Sdk\OneWare.Plugin.Sdk.csproj" />
+  </ItemGroup>
+
+  <Target Name="PackAdditionalProjects" AfterTargets="Pack">
+    <MSBuild Projects="@(AdditionalPackProjects)"
+      Targets="Restore;Pack"
+      Properties="Configuration=$(Configuration);PackageOutputPath=$(PackageOutputPath);Version=$(PluginSdkPackageVersion)" />
+  </Target>
+
 </Project>
diff --git a/install-dev-templates.ps1 b/install-dev-templates.ps1
index 75599d1..fcc4e58 100644
--- a/install-dev-templates.ps1
+++ b/install-dev-templates.ps1
@@ -1,5 +1,7 @@
 dotnet new uninstall OneWare.Templates
 Remove-Item bin/**/*.nupkg
-$result = dotnet pack | select-string "Successfully created package '(.*)'" -AllMatches
-$package = $result.Matches.Groups[1]
+$null = dotnet pack
+$package = Get-ChildItem .\bin -Filter 'OneWare.Templates*.nupkg' -Recurse |
+	Sort-Object LastWriteTime -Descending |
+	Select-Object -First 1 -ExpandProperty FullName
 dotnet new install $package
\ No newline at end of file
diff --git a/install-dev-templates.sh b/install-dev-templates.sh
index 8f55d61..a4060c8 100755
--- a/install-dev-templates.sh
+++ b/install-dev-templates.sh
@@ -4,8 +4,9 @@ dotnet new uninstall OneWare.Templates
 # Remove .nupkg files from bin directory and its subdirectories
 rm bin/**/*.nupkg
 
-# Pack and capture the output to find the package name
-result=$(dotnet pack | grep -oP "Successfully created package '\K(.*)(?=')")
+# Pack and pick the template package from the output directory
+dotnet pack > /dev/null
+result=$(find bin -name 'OneWare.Templates*.nupkg' -print | sort | tail -n 1)
 
 # Install the package
 dotnet new install "$result"
diff --git a/templates/OneWareExtensionTemplate/src/OneWareExtensionTemplate/OneWareExtensionTemplate.csproj b/templates/OneWareExtensionTemplate/src/OneWareExtensionTemplate/OneWareExtensionTemplate.csproj
index c0bf55a..8bc3c13 100644
--- a/templates/OneWareExtensionTemplate/src/OneWareExtensionTemplate/OneWareExtensionTemplate.csproj
+++ b/templates/OneWareExtensionTemplate/src/OneWareExtensionTemplate/OneWareExtensionTemplate.csproj
@@ -16,13 +16,14 @@
 
     <ItemGroup>
         <PackageReference Include="OneWare.Essentials" Version="1.0.0" Private="false" ExcludeAssets="runtime;Native" />
+        <PackageReference Include="OneWare.Plugin.Sdk" Version="1.0.0" PrivateAssets="all" />
     </ItemGroup>
 
     <Target Name="GenerateCompatibilityFile" AfterTargets="Build">
         <ItemGroup>
-<!--/-:msbuild-conditional:noEmit -->
-            <FilteredDependencies Include="@(PackageReference)" Condition="'%(Private)' == 'false'"/>
-<!--/+:msbuild-conditional:noEmit -->
+    <!--/-:msbuild-conditional:noEmit -->
+            <FilteredDependencies Include="@(PackageReference)" Condition="'%(PackageReference.Private)' == 'false'"/>
+    <!--/+:msbuild-conditional:noEmit -->
         </ItemGroup>
         
         <WriteLinesToFile