- remove BepInEx.Core dep, use ThunderDependency instead

- use .tasks file for registering MSBuild tasks
- improve logging of successful plugin restorations

README.md

@@ -30,7 +30,7 @@ $ dotnet new classlib -n {NAME}
 
 In the new `.csproj`, update the `Sdk="Microsoft.NET.Sdk"` attribute at the top of the file to `Sdk="LethalCompany.Plugin.Sdk/{LATEST-VERSION}"`, and replace any existing content with metadata about the plugin:
 ```xml
-<Project Sdk="LethalCompany.Plugin.Sdk/1.1.0">
+<Project Sdk="LethalCompany.Plugin.Sdk/...">
 
   <PropertyGroup>
     <Title>Plugin Example</Title>

src/RestorePluginDependencies.cs

@@ -166,9 +166,12 @@ private bool TryRestore(PluginCache cache, PluginDependencyGraph graph, [NotNull
 
         foreach (var restoration in restorations)
         {
-            if (restoration is PluginRestoration.Skipped)
+            if (restoration is PluginRestoration.Success success)
             {
-                Log.LogMessage($"Skipped restoring '{restoration.Moniker}', it already exists in the cache.");
+                Log.LogMessage(success is PluginRestoration.Skipped
+                    ? $"Skipped restoring '{restoration.Moniker}', it already exists in the cache."
+                    : $"Restored '{success.Moniker}' to '{success.Path}'.");
+
                 continue;
             }
 
@@ -183,11 +186,6 @@ private bool TryRestore(PluginCache cache, PluginDependencyGraph graph, [NotNull
                 restored = false;
                 continue;
             }
-
-            if (restoration is PluginRestoration.Success success)
-            {
-                Log.LogMessage($"Restored '{success.Moniker}' to '{success.Path}'.");
-            }
         }
 
         return restored;

src/Sdk/Sdk.props

@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition=" '$(MicrosoftCommonPropsHasBeenImported)' != 'true' "/>
 
   <ItemDefinitionGroup>
@@ -38,7 +39,6 @@
 
   <ItemGroup>
     <PackageReference Include="BepInEx.Analyzers" Version="1.0.8" PrivateAssets="all" />
-    <PackageReference Include="BepInEx.Core" Version="5.4.21" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="LethalAPI.GameLibs" Version="45.1.0" PrivateAssets="all" ExcludeAssets="all" GeneratePathProperty="true" NoWarn="NU1701" />
     <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
@@ -48,7 +48,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ThunderDependency Include="BepInEx-BepInExPack" Version="5.4.2100" ExcludeAssets="*" />
+    <ThunderDependency Include="BepInEx-BepInExPack" Version="5.4.2100">
+      <ExcludeAssets>**\BepInEx\core\0Harmony20.dll</ExcludeAssets>
+      <IncludeAssets>**\BepInEx\core\*.dll</IncludeAssets>
+    </ThunderDependency>
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(GITHUB_ACTIONS)' == 'true' ">

src/Sdk/Sdk.targets

@@ -1,16 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup Condition=" '$(PluginSdkAssembly)' == '' ">
-    <PluginSdkAssemblyDir Condition=" '$(PluginSdkAssemblyDir)' == '' ">..\build\</PluginSdkAssemblyDir>
-    <PluginSdkAssembly Condition=" '$(MSBuildRuntimeType)' == 'Core' ">$(PluginSdkAssemblyDir)net8.0\LethalCompany.Plugin.Sdk.dll</PluginSdkAssembly>
-    <PluginSdkAssembly Condition=" '$(MSBuildRuntimeType)' != 'Core' ">$(PluginSdkAssemblyDir)net472\LethalCompany.Plugin.Sdk.dll</PluginSdkAssembly>
-  </PropertyGroup>
-
-  <UsingTask TaskName="GeneratePluginInfoCode" AssemblyFile="$(PluginSdkAssembly)" />
-  <UsingTask TaskName="GeneratePluginManifestJson" AssemblyFile="$(PluginSdkAssembly)" />
-  <UsingTask TaskName="ResolvePluginAssemblies" AssemblyFile="$(PluginSdkAssembly)" />
-  <UsingTask TaskName="RestorePluginDependencies" AssemblyFile="$(PluginSdkAssembly)" />
+  <Import Project="Sdk.tasks" Condition=" '$(PluginSdkAssemblyHasBeenImported)' != 'true' " />
 
   <PropertyGroup>
     <PluginManagerDataDir Condition=" '$(PluginManagerDataDir)' == '' AND '$(PluginManager)' == 'r2modman' ">$(AppData)\r2modmanPlus-local\LethalCompany\</PluginManagerDataDir>

src/Sdk/Sdk.tasks

@@ -0,0 +1,18 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup>
+        <PluginSdkAssemblyHasBeenImported>true</PluginSdkAssemblyHasBeenImported>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(PluginSdkAssembly)' == '' ">
+        <PluginSdkAssemblyDir Condition=" '$(PluginSdkAssemblyDir)' == '' ">..\build\</PluginSdkAssemblyDir>
+        <PluginSdkAssembly Condition=" '$(MSBuildRuntimeType)' == 'Core' ">$(PluginSdkAssemblyDir)net8.0\LethalCompany.Plugin.Sdk.dll</PluginSdkAssembly>
+        <PluginSdkAssembly Condition=" '$(MSBuildRuntimeType)' != 'Core' ">$(PluginSdkAssemblyDir)net472\LethalCompany.Plugin.Sdk.dll</PluginSdkAssembly>
+    </PropertyGroup>
+
+    <UsingTask TaskName="LethalCompany.Plugin.Sdk.GeneratePluginInfoCode" AssemblyFile="$(PluginSdkAssembly)" />
+    <UsingTask TaskName="LethalCompany.Plugin.Sdk.GeneratePluginManifestJson" AssemblyFile="$(PluginSdkAssembly)" />
+    <UsingTask TaskName="LethalCompany.Plugin.Sdk.ResolvePluginAssemblies" AssemblyFile="$(PluginSdkAssembly)" />
+    <UsingTask TaskName="LethalCompany.Plugin.Sdk.RestorePluginDependencies" AssemblyFile="$(PluginSdkAssembly)" />
+
+</Project>

test/LethalCompany.SdkSample.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <PluginSdkAssemblyDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\src\bin\Debug\'))</PluginSdkAssemblyDir>
+    <PluginSdkAssemblyDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\src\bin\$(Configuration)\'))</PluginSdkAssemblyDir>
   </PropertyGroup>
 
   <Import Project="..\src\Sdk\Sdk.targets" />