diff --git a/README.md b/README.md index 5d25b87..ccb183b 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,10 @@ dotnet new install UltraModding.Templates ``` This will install the following template: -| Templates | Short Name | Language | Tags | -|-----------------------------------|----------------|----------|--------------------------------------| -| Ultrakill Minimal Plugin Template | `ukplugin-min` | `[C#]` | `BepInEx/BepInEx 5/Plugin/Ultrakill` | +| Templates | Short Name | Language | Tags | +|-----------------------------------|-----------------|----------|--------------------------------------| +| Ultrakill Full Plugin Template | `ukplugin-full` | `[C#]` | `BepInEx/BepInEx 5/Plugin/Ultrakill` | +| Ultrakill Minimal Plugin Template | `ukplugin-min` | `[C#]` | `BepInEx/BepInEx 5/Plugin/Ultrakill` | ## Using a template diff --git a/UltraModding.PluginInfoProps/README.md b/UltraModding.PluginInfoGenerator/README.md similarity index 61% rename from UltraModding.PluginInfoProps/README.md rename to UltraModding.PluginInfoGenerator/README.md index 9030873..31f998a 100644 --- a/UltraModding.PluginInfoProps/README.md +++ b/UltraModding.PluginInfoGenerator/README.md @@ -7,18 +7,20 @@ Generates `MyPluginInfo.cs` based on csproj tags. Define the following properties in your `csproj`: ```xml -Example.Plugin -My first plugin +com.example.plugin +Example Plugin 1.0.0 ``` this will generate the following class: ```cs +namespace Example.Plugin; + internal static class MyPluginInfo { - public const string PLUGIN_GUID = "Example.Plugin"; - public const string PLUGIN_NAME = "My first plugin"; + public const string PLUGIN_GUID = "com.example.plugin"; + public const string PLUGIN_NAME = "Example Plugin"; public const string PLUGIN_VERSION = "1.0.0"; } ``` diff --git a/UltraModding.PluginInfoProps/UltraModding.PluginInfoProps.csproj b/UltraModding.PluginInfoGenerator/UltraModding.PluginInfoGenerator.csproj similarity index 74% rename from UltraModding.PluginInfoProps/UltraModding.PluginInfoProps.csproj rename to UltraModding.PluginInfoGenerator/UltraModding.PluginInfoGenerator.csproj index 27256ca..5b58c1a 100644 --- a/UltraModding.PluginInfoProps/UltraModding.PluginInfoProps.csproj +++ b/UltraModding.PluginInfoGenerator/UltraModding.PluginInfoGenerator.csproj @@ -1,17 +1,19 @@ - UltraModding.PluginInfoProps - 3.0.0 + UltraModding.PluginInfoGenerator + 4.0.0 BepInEx;10_days_till_xmas BepInEx;Ultrakill;Build;Props + UltraModding.PluginInfoProps - Helper build target that generates a MyPluginInfo class based on assembly metadata. + + Helper build target that generates a MyPluginInfo class based on assembly metadata. + - Initial nuget release. Generates a MyPluginInfo class based on assembly metadata. - - Use the GUID, Product, and Version properties to set the values. + Renamed the package and deprecated UltraModding.PluginInfoProps MIT false @@ -19,7 +21,7 @@ - https://github.com/UltraModding/UltraModding.Templates/tree/master/UltraModding.PluginInfoProps + https://github.com/UltraModding/UltraModding.Templates/tree/master/UltraModding.PluginInfoGenerator https://github.com/UltraModding/UltraModding.Templates git @@ -36,7 +38,7 @@ - + diff --git a/UltraModding.PluginInfoGenerator/UltraModding.PluginInfoGenerator.targets b/UltraModding.PluginInfoGenerator/UltraModding.PluginInfoGenerator.targets new file mode 100644 index 0000000..8bf759a --- /dev/null +++ b/UltraModding.PluginInfoGenerator/UltraModding.PluginInfoGenerator.targets @@ -0,0 +1,27 @@ + + + + $(GUID) + $(Product) + $(Version) + + $(IntermediateOutputPath)MyPluginInfo.cs + + + + + + + + + diff --git a/UltraModding.PluginInfoProps/UltraModding.PluginInfoProps.props b/UltraModding.PluginInfoProps/UltraModding.PluginInfoProps.props deleted file mode 100644 index d7e11f9..0000000 --- a/UltraModding.PluginInfoProps/UltraModding.PluginInfoProps.props +++ /dev/null @@ -1,27 +0,0 @@ - - - - $(GUID) - $(Product) - $(Version) - - $(IntermediateOutputPath)MyPluginInfo.cs - - - - - - - - - diff --git a/UltraModding.Templates.Tests/ProjectTemplateTests.cs b/UltraModding.Templates.Tests/ProjectTemplateTests.cs index d46ed5f..8271467 100644 --- a/UltraModding.Templates.Tests/ProjectTemplateTests.cs +++ b/UltraModding.Templates.Tests/ProjectTemplateTests.cs @@ -127,8 +127,10 @@ public async Task FullProjectTemplate_Generated_Project_Builds() const string version = "2.3.4"; const string ultrakillDirectory = "C:/Program Files (x86)/Steam/steamapps/common/ULTRAKILL/"; const string pluginsDirectory = $"{ultrakillDirectory}BepInEx/plugins/"; + Assert.SkipUnless(Directory.Exists(pluginsDirectory), $"Ultrakill plugins directory '{pluginsDirectory}' does not exist. Skipping test."); + var cancellationToken = TestContext.Current.CancellationToken; using TempDir tempDir = new(); diff --git a/UltraModding.Templates.sln b/UltraModding.Templates.sln index 36c1e39..f3aa4bb 100644 --- a/UltraModding.Templates.sln +++ b/UltraModding.Templates.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.13.35931.197 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UltraModding.Templates", "UltraModding.Templates\UltraModding.Templates.csproj", "{C57C43F6-3BCC-42C5-83C3-48DD6CA51245}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UltraModding.PluginInfoProps", "UltraModding.PluginInfoProps\UltraModding.PluginInfoProps.csproj", "{E05232A2-D0AD-435C-8C16-BC954E43E97B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UltraModding.PluginInfoGenerator", "UltraModding.PluginInfoGenerator\UltraModding.PluginInfoGenerator.csproj", "{E05232A2-D0AD-435C-8C16-BC954E43E97B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{BD2D4189-0F06-4F95-9E6A-61B0B6468BCF}" ProjectSection(SolutionItems) = preProject diff --git a/UltraModding.Templates/README.md b/UltraModding.Templates/README.md index 19bf003..15295f1 100644 --- a/UltraModding.Templates/README.md +++ b/UltraModding.Templates/README.md @@ -2,14 +2,15 @@ A collection of .NET project templates for Ultrakill plugins using BepInEx 5. -| Templates | Short Name | Language | Tags | -|-----------------------------------|-----------------|------------|---------------------------------------| -| Ultrakill Minimal Plugin Template | `ukplugin-min` | `[C#]` | `BepInEx/BepInEx 5/Plugin/Ultrakill` | +| Templates | Short Name | Language | Tags | +|-----------------------------------|-----------------|----------|--------------------------------------| +| Ultrakill Full Plugin Template | `ukplugin-full` | `[C#]` | `BepInEx/BepInEx 5/Plugin/Ultrakill` | +| Ultrakill Minimal Plugin Template | `ukplugin-min` | `[C#]` | `BepInEx/BepInEx 5/Plugin/Ultrakill` | ## Using a template -To use a template, you can use the `dotnet new` command. +To use a template, use the `dotnet new` command. If you use Rider or Visual Studio 2022, you will be able to select the templates when creating a new solution. For example, to create an Ultrakill plugin project: diff --git a/UltraModding.Templates/UltraModding.Templates.csproj b/UltraModding.Templates/UltraModding.Templates.csproj index cad0178..1055dbd 100644 --- a/UltraModding.Templates/UltraModding.Templates.csproj +++ b/UltraModding.Templates/UltraModding.Templates.csproj @@ -2,7 +2,7 @@ UltraModding.Templates - 2.0.0 + 2.0.1 BepInEx;10_days_till_xmas BepInEx;Plugin;Template;Ultrakill Template diff --git a/UltraModding.Templates/templates/UltraModding.FullPluginTemplate/UltraModding.FullPluginTemplate.csproj b/UltraModding.Templates/templates/UltraModding.FullPluginTemplate/UltraModding.FullPluginTemplate.csproj index 3dd4b09..0d48842 100644 --- a/UltraModding.Templates/templates/UltraModding.FullPluginTemplate/UltraModding.FullPluginTemplate.csproj +++ b/UltraModding.Templates/templates/UltraModding.FullPluginTemplate/UltraModding.FullPluginTemplate.csproj @@ -25,7 +25,7 @@ - + diff --git a/UltraModding.Templates/templates/UltraModding.MinimalPluginTemplate/UltraModding.MinimalPluginTemplate.csproj b/UltraModding.Templates/templates/UltraModding.MinimalPluginTemplate/UltraModding.MinimalPluginTemplate.csproj index 2053fbb..57f18ff 100644 --- a/UltraModding.Templates/templates/UltraModding.MinimalPluginTemplate/UltraModding.MinimalPluginTemplate.csproj +++ b/UltraModding.Templates/templates/UltraModding.MinimalPluginTemplate/UltraModding.MinimalPluginTemplate.csproj @@ -19,7 +19,7 @@ - +