Skip to content

Commit 72179b8

Browse files
Cat-LipsCat-Lips
committed
Package Upgrades & Code Cleanup
1 parent 967feb1 commit 72179b8

9 files changed

Lines changed: 71 additions & 71 deletions

File tree

‎CustomGeneratorTests/CustomGeneratorTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.3" PrivateAssets="all" />
10-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
9+
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.4-240423-1409.Release" PrivateAssets="all" />
10+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
1111
</ItemGroup>
1212
</Project>

‎Godot 3 Tests/Godot 3 Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ItemGroup>
1010
<ItemGroup>
1111
<PackageReference Include="FluentAssertions" Version="6.12.0" />
12-
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.3" />
12+
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.4-240423-1409.Release" />
1313
</ItemGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />

‎Godot 3 Tests/Run.cs‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,51 @@
77

88
namespace GodotTests
99
{
10-
[SceneTree]
11-
public abstract partial class Run : Control
12-
{
13-
private static IEnumerable<Func<ITest>> Tests
14-
{
15-
get
16-
{
17-
yield return ITest.GetTest<AmbiguousTypeWithImplicitUsings>;
18-
yield return ITest.GetTest<BuiltInScriptTest>;
19-
yield return ITest.GetTest<CachedNodes>;
20-
yield return ITest.GetTest<EditableChildrenTest>;
21-
yield return ITest.GetTest<EditableChildrenWithTraversalTest>;
22-
yield return ITest.GetTest<EmptyScene>;
23-
yield return ITest.GetTest<EmptySceneWithNoNamespace>;
24-
yield return ITest.GetTest<ExternalGdScriptTest>;
25-
yield return ITest.GetTest<GenericRootTest>;
26-
yield return ITest.GetTest<GodotNotifyTests>;
27-
yield return ITest.GetTest<GodotOverrideInheritanceTest>;
28-
yield return ITest.GetTest<GodotOverrideTest>;
29-
yield return ITest.GetTest<ImplicitConversionTests>;
30-
yield return ITest.GetTest<InheritedScene>;
31-
yield return ITest.GetTest<InheritedSceneWithBaseChanges1>;
32-
yield return ITest.GetTest<InheritedSceneWithBaseChanges2>;
33-
yield return ITest.GetTest<InheritedSceneWithInstancedScene>;
34-
yield return ITest.GetTest<InheritingSceneWithoutScript>;
35-
yield return ITest.GetTest<InstancedScene>;
36-
yield return ITest.GetTest<InstancedSceneFromDifferentNamespace>;
37-
yield return ITest.GetTest<InstancingSceneWithoutScript>;
38-
yield return ITest.GetTest<InstantiateTests>;
39-
yield return ITest.GetTest<LoadAsPlaceholderTest>;
40-
yield return ITest.GetTest<PathTooLongError>;
41-
yield return ITest.GetTest<RootScene>;
42-
yield return ITest.GetTest<RootSceneWithNoNamespace>;
43-
yield return ITest.GetTest<SameNameTest>;
44-
yield return ITest.GetTest<ScriptForSceneWithDifferentName>;
45-
yield return ITest.GetTest<ScriptForSceneWithDifferentPath>;
46-
yield return ITest.GetTest<TraverseInstancedScene>;
47-
yield return ITest.GetTest<UniqueSceneNameAccessTest>;
48-
yield return ITest.GetTest<UnsupportedInheritedOverride>;
49-
yield return ITest.GetTest<UnsupportedInstancedOverride>;
50-
}
51-
}
10+
[SceneTree]
11+
public abstract partial class Run : Control
12+
{
13+
private static IEnumerable<Func<ITest>> Tests
14+
{
15+
get
16+
{
17+
yield return ITest.GetTest<AmbiguousTypeWithImplicitUsings>;
18+
yield return ITest.GetTest<BuiltInScriptTest>;
19+
yield return ITest.GetTest<CachedNodes>;
20+
yield return ITest.GetTest<EditableChildrenTest>;
21+
yield return ITest.GetTest<EditableChildrenWithTraversalTest>;
22+
yield return ITest.GetTest<EmptyScene>;
23+
yield return ITest.GetTest<EmptySceneWithNoNamespace>;
24+
yield return ITest.GetTest<ExternalGdScriptTest>;
25+
yield return ITest.GetTest<GenericRootTest>;
26+
yield return ITest.GetTest<GodotNotifyTests>;
27+
yield return ITest.GetTest<GodotOverrideInheritanceTest>;
28+
yield return ITest.GetTest<GodotOverrideTest>;
29+
yield return ITest.GetTest<ImplicitConversionTests>;
30+
yield return ITest.GetTest<InheritedScene>;
31+
yield return ITest.GetTest<InheritedSceneWithBaseChanges1>;
32+
yield return ITest.GetTest<InheritedSceneWithBaseChanges2>;
33+
yield return ITest.GetTest<InheritedSceneWithInstancedScene>;
34+
yield return ITest.GetTest<InheritingSceneWithoutScript>;
35+
yield return ITest.GetTest<InstancedScene>;
36+
yield return ITest.GetTest<InstancedSceneFromDifferentNamespace>;
37+
yield return ITest.GetTest<InstancingSceneWithoutScript>;
38+
yield return ITest.GetTest<InstantiateTests>;
39+
yield return ITest.GetTest<LoadAsPlaceholderTest>;
40+
yield return ITest.GetTest<PathTooLongError>;
41+
yield return ITest.GetTest<RootScene>;
42+
yield return ITest.GetTest<RootSceneWithNoNamespace>;
43+
yield return ITest.GetTest<SameNameTest>;
44+
yield return ITest.GetTest<ScriptForSceneWithDifferentName>;
45+
yield return ITest.GetTest<ScriptForSceneWithDifferentPath>;
46+
yield return ITest.GetTest<TraverseInstancedScene>;
47+
yield return ITest.GetTest<UniqueSceneNameAccessTest>;
48+
yield return ITest.GetTest<UnsupportedInheritedOverride>;
49+
yield return ITest.GetTest<UnsupportedInstancedOverride>;
50+
}
51+
}
5252

53-
[GodotOverride]
54-
public void OnReady()
55-
=> _.TestRunner.Initialise(Tests);
56-
}
53+
[GodotOverride]
54+
public void OnReady()
55+
=> _.TestRunner.Initialise(Tests);
56+
}
5757
}

‎Godot 3 Tests/TestScenes/Issue14.SameNameTest/SameNameTest.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44

55
namespace GodotTests.TestScenes
66
{
7-
[SceneTree]
8-
internal abstract partial class SameNameTest : Control, ITest
9-
{
10-
void ITest.InitTests()
11-
{
12-
_.SameName_GlobalNamespace.Should().BeOfType<global::SameName>();
13-
_.SameName_SameNamespace.Should().BeOfType<SameName>();
14-
_.SameName_ChildNamespace.Should().BeOfType<ChildNamespace.SameName>();
7+
[SceneTree]
8+
internal abstract partial class SameNameTest : Control, ITest
9+
{
10+
void ITest.InitTests()
11+
{
12+
_.SameName_GlobalNamespace.Should().BeOfType<global::SameName>();
13+
_.SameName_SameNamespace.Should().BeOfType<SameName>();
14+
_.SameName_ChildNamespace.Should().BeOfType<ChildNamespace.SameName>();
1515

16-
SameName_GlobalNamespace.Should().BeOfType<global::SameName>();
17-
SameName_SameNamespace.Should().BeOfType<SameName>();
18-
SameName_ChildNamespace.Should().BeOfType<ChildNamespace.SameName>();
19-
}
20-
}
16+
SameName_GlobalNamespace.Should().BeOfType<global::SameName>();
17+
SameName_SameNamespace.Should().BeOfType<SameName>();
18+
SameName_ChildNamespace.Should().BeOfType<ChildNamespace.SameName>();
19+
}
20+
}
2121
}

‎Godot 4 Tests/Godot 4 Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212
<ItemGroup>
1313
<PackageReference Include="FluentAssertions" Version="6.12.0" />
14-
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.3" />
14+
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.3.4-240423-1409.Release" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />

‎Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.tscn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=4 format=3 uid="uid://beryxh3sw6624"]
22

3-
[ext_resource type="PackedScene" uid="uid://b2eoocswr2m6o" path="res://TestScenes/Issue50.UnsupportedOverrides/Test.glb" id="1"]
3+
[ext_resource type="PackedScene" uid="uid://bu3qh8kl82p8i" path="res://TestScenes/Issue50.UnsupportedOverrides/Test.glb" id="1"]
44
[ext_resource type="Script" path="res://TestScenes/Issue50.UnsupportedOverrides/UnsupportedInheritedOverride.cs" id="2"]
55
[ext_resource type="Script" path="res://TestScenes/Issue50.UnsupportedOverrides/TestScript.cs" id="3"]
66

‎Godot 4 Tests/TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.tscn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[gd_scene load_steps=4 format=3 uid="uid://c5rmhgdvxoosm"]
22

33
[ext_resource type="Script" path="res://TestScenes/Issue50.UnsupportedOverrides/UnsupportedInstancedOverride.cs" id="1"]
4-
[ext_resource type="PackedScene" uid="uid://b2eoocswr2m6o" path="res://TestScenes/Issue50.UnsupportedOverrides/Test.glb" id="2"]
4+
[ext_resource type="PackedScene" uid="uid://bu3qh8kl82p8i" path="res://TestScenes/Issue50.UnsupportedOverrides/Test.glb" id="2"]
55
[ext_resource type="Script" path="res://TestScenes/Issue50.UnsupportedOverrides/TestScript.cs" id="3"]
66

77
[node name="Root" type="Node3D"]

‎SourceGenerators/SourceGenerators.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* Includes base classes/helpers to create project specific source generators
4545
</Description>
4646
<PackageReleaseNotes>
47-
v.2.3.3
47+
v.2.3.4 (pre-release)
4848
- ADDED: Support for .NET 8.0
4949
- ADDED: Nested InputMap entries
5050
- ADDED: OnImport attribute for editor only builds (GD4 only)
@@ -88,8 +88,8 @@
8888
<PackageLicenseExpression>MIT</PackageLicenseExpression>
8989
<PackageTags>Godot C# SourceGenerator</PackageTags>
9090
<PackageReadmeFile>README.md</PackageReadmeFile>
91-
<Version>2.3.3</Version>
92-
<!--<Version>2.3.3-$([System.DateTime]::Now.ToString(yyMMdd-HHmm)).$(Configuration)</Version>-->
91+
<!--<Version>2.3.4</Version>-->
92+
<Version>2.3.4-$([System.DateTime]::Now.ToString(yyMMdd-HHmm)).$(Configuration)</Version>
9393
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
9494
</PropertyGroup>
9595
<ItemGroup>
@@ -110,9 +110,9 @@
110110
<ItemGroup>
111111
<PackageReference Include="IndexRange" Version="1.0.3" PrivateAssets="all" />
112112
<PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
113-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
113+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
114114
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="all" />
115-
<PackageReference Include="Scriban" Version="5.9.1" IncludeAssets="build" PrivateAssets="all" />
115+
<PackageReference Include="Scriban" Version="5.10.0" IncludeAssets="build" PrivateAssets="all" />
116116
</ItemGroup>
117117

118118
</Project>

‎SourceGenerators/Utilities/Log.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ internal static class Log
1111
public static bool EnableFileName { get; set; } = true;
1212
public static bool EnableMemberName { get; set; } = false;
1313

14-
[Conditional("DEBUG")]
14+
//[Conditional("DEBUG")]
1515
public static void Debug(object msg = null, [CallerFilePath] string filePath = null, [CallerMemberName] string memberName = null) => Print(Format(filePath, memberName, msg));
1616
public static void Info(object msg = null, [CallerFilePath] string filePath = null, [CallerMemberName] string memberName = null) => Print(Format(filePath, memberName, $"[INFO] {msg}"));
1717
public static void Warn(object msg = null, [CallerFilePath] string filePath = null, [CallerMemberName] string memberName = null) => Print(Format(filePath, memberName, $"[WARN] {msg}"));

0 commit comments

Comments
 (0)