Preparing for release

Cat-Lips · Cat-Lips · commit b045f0887a00 · 2023-12-11T12:29:47.000+11:00
diff --git a/CustomGeneratorTests/CustomGeneratorTests.csproj b/CustomGeneratorTests/CustomGeneratorTests.csproj
@@ -6,6 +6,6 @@
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.1-231211-0953.Release" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.1" />
   </ItemGroup>
 </Project>
diff --git a/Godot 3 Tests/Godot 3 Tests.csproj b/Godot 3 Tests/Godot 3 Tests.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.1-231211-0953.Release" />
+    <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />
diff --git a/Godot 4 Tests/Godot 4 Tests.csproj b/Godot 4 Tests/Godot 4 Tests.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Godot.NET.Sdk/4.2.0-rc.1">
+﻿<Project Sdk="Godot.NET.Sdk/4.2.0">
   <PropertyGroup>
     <LangVersion>preview</LangVersion>
     <TargetFramework>net8.0</TargetFramework>
@@ -11,7 +11,7 @@
   </ItemGroup>
   <ItemGroup>
 	  <PackageReference Include="FluentAssertions" Version="6.12.0" />
-	  <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.1-231211-0953.Release" />
+	  <PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />
diff --git a/Godot 4 Tests/Run.cs b/Godot 4 Tests/Run.cs
@@ -35,7 +35,9 @@ private static IEnumerable<Func<ITest>> Tests
                 yield return ITest.GetTest<InstancingSceneWithoutScript>;
                 yield return ITest.GetTest<InstantiateTests>;
                 yield return ITest.GetTest<LoadAsPlaceholderTest>;
+#if TOOLS
                 yield return ITest.GetTest<OnImportTests>;
+#endif
                 yield return ITest.GetTest<PathTooLongError>;
                 yield return ITest.GetTest<RootScene>;
                 yield return ITest.GetTest<RootSceneWithNoNamespace>;
diff --git a/Godot 4 Tests/TestScenes/Feature31.OnImportAttribute/OnImportTests.cs b/Godot 4 Tests/TestScenes/Feature31.OnImportAttribute/OnImportTests.cs
@@ -1,12 +1,17 @@
+#if TOOLS
+using System.ComponentModel;
+using System.Linq;
+using FluentAssertions;
 using Godot;
+using Godot.Collections;
 using GodotSharp.BuildingBlocks.TestRunner;
+using static GodotTests.TestScenes.OnImportTests;
 
 namespace GodotTests.TestScenes
 {
     [SceneTree]
     public partial class OnImportTests : Node, ITest
     {
-#if TOOLS
         public enum IntEnum : int { a, b, c }
         public enum LongEnum : long { a, b, c }
 
@@ -56,7 +61,7 @@ static void CallImportWithOptions(EditorImportPlugin plugin)
                 foreach (var item in plugin._GetImportOptions(default, default))
                     options.Add(item["name"], item["default_value"]);
 
-                plugin._Import("res://somepath/MySourceFile.obj", ".import/somepath/MySavePath", options, new(), new());
+                plugin._Import("res://somepath/MySourceFile.obj", ".import/somepath/MySavePath", options, [], []);
             }
 
             static void CheckCommon(EditorImportPlugin plugin, string importerName, string displayName, string[] recognizedExtensions, string[] presets)
@@ -144,9 +149,8 @@ public static Error SaveTestScene(string savePath)
             // ok
             return Error.Ok;
         }
-#endif
     }
-#if TOOLS
+
     [Tool]
     internal partial class OnImportWithAllArgs : OnImportEditorPlugin
     {
@@ -277,5 +281,5 @@ private string DefaultDfltStrNull(string path, int preset)
             return Error.Ok;
         }
     }
-#endif
 }
+#endif
diff --git a/SourceGenerators/SourceGenerators.csproj b/SourceGenerators/SourceGenerators.csproj
@@ -16,27 +16,27 @@
     <Description>
 C# Source Generators for use with the Godot Game Engine (supports Godot 4 and .NET 8!)
 * `SceneTree` class attribute:
-  * Generates class property for uniquely named nodes
-  * Provides strongly typed access to the scene hierarchy (via `_` operator)
+  -- Generates class property for uniquely named nodes
+  -- Provides strongly typed access to the scene hierarchy (via `_` operator)
 * `GodotOverride` method attribute:
-  * Allows use of On*, instead of virtual _* overrides
-  * (Requires partial method declaration for use with Godot 4.0)
+  -- Allows use of On*, instead of virtual _* overrides
+  -- (Requires partial method declaration for use with Godot 4.0)
 * `Notify` property attribute:
-  * Generates boiler plate code, triggering only when values differ
-  * (Automagically triggers nested changes for Resource and Resource[])
+  -- Generates boiler plate code, triggering only when values differ
+  -- (Automagically triggers nested changes for Resource and Resource[])
 * `InputMap` class attribute:
-  * Provides strongly typed access to project input actions
+  -- Provides strongly typed access to project input actions
 * `CodeComments` class attribute:
-  * Provides a nested static class to access property comments from code (useful for in-game tooltips, etc)
+  -- Provides a nested static class to access property comments from code (useful for in-game tooltips, etc)
 * `OnInstantiate` method attribute:
-  * Generates a static Instantiate method with matching args that calls attributed method as part of the instantiation process
-  * (Also generates a protected constructor to ensure proper initialisation - can be deactivated via attribute)
+  -- Generates a static Instantiate method with matching args that calls attributed method as part of the instantiation process
+  -- (Also generates a protected constructor to ensure proper initialisation - can be deactivated via attribute)
 * `OnImport` method attribute (GD4 only):
-  * Generates default plugin overrides and options to make plugin class cleaner (inherit from OnImportEditorPlugin)
+  -- Generates default plugin overrides and options to make plugin class cleaner (inherit from OnImportEditorPlugin)
 * Includes base classes/helpers to create project specific source generators
     </Description>
     <PackageReleaseNotes>
-      v.2.3.1 (prerelease)
+      v.2.3.1
       - ADDED: Support for .NET 8.0
       - ADDED: OnImport attribute for editor only builds (GD4 only)
 
@@ -79,8 +79,8 @@ C# Source Generators for use with the Godot Game Engine (supports Godot 4 and .N
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>Godot C# SourceGenerator</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <!--<Version>2.3.0</Version>-->
-    <Version>2.3.1-$([System.DateTime]::Now.ToString(yyMMdd-HHmm)).$(Configuration)</Version>
+    <Version>2.3.1</Version>
+    <!--<Version>2.3.1-$([System.DateTime]::Now.ToString(yyMMdd-HHmm)).$(Configuration)</Version>-->
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,17 @@`
	`1`	`+#if TOOLS`
	`2`	`+using System.ComponentModel;`
	`3`	`+using System.Linq;`
	`4`	`+using FluentAssertions;`
`1`	`5`	`using Godot;`
	`6`	`+using Godot.Collections;`
`2`	`7`	`using GodotSharp.BuildingBlocks.TestRunner;`
	`8`	`+using static GodotTests.TestScenes.OnImportTests;`
`3`	`9`
`4`	`10`	`namespace GodotTests.TestScenes`
`5`	`11`	`{`
`6`	`12`	`[SceneTree]`
`7`	`13`	`public partial class OnImportTests : Node, ITest`
`8`	`14`	`{`
`9`		`-#if TOOLS`
`10`	`15`	`public enum IntEnum : int { a, b, c }`
`11`	`16`	`public enum LongEnum : long { a, b, c }`
`12`	`17`
`@@ -56,7 +61,7 @@ static void CallImportWithOptions(EditorImportPlugin plugin)`
`56`	`61`	`foreach (var item in plugin._GetImportOptions(default, default))`
`57`	`62`	`options.Add(item["name"], item["default_value"]);`
`58`	`63`
`59`		`- plugin._Import("res://somepath/MySourceFile.obj", ".import/somepath/MySavePath", options, new(), new());`
	`64`	`+ plugin._Import("res://somepath/MySourceFile.obj", ".import/somepath/MySavePath", options, [], []);`
`60`	`65`	`}`
`61`	`66`
`62`	`67`	`static void CheckCommon(EditorImportPlugin plugin, string importerName, string displayName, string[] recognizedExtensions, string[] presets)`
`@@ -144,9 +149,8 @@ public static Error SaveTestScene(string savePath)`
`144`	`149`	`// ok`
`145`	`150`	`return Error.Ok;`
`146`	`151`	`}`
`147`		`-#endif`
`148`	`152`	`}`
`149`		`-#if TOOLS`
	`153`	`+`
`150`	`154`	`[Tool]`
`151`	`155`	`internal partial class OnImportWithAllArgs : OnImportEditorPlugin`
`152`	`156`	`{`
`@@ -277,5 +281,5 @@ private string DefaultDfltStrNull(string path, int preset)`
`277`	`281`	`return Error.Ok;`
`278`	`282`	`}`
`279`	`283`	`}`
`280`		`-#endif`
`281`	`284`	`}`
	`285`	`+#endif`