Skip to content

Commit 2065258

Browse files
Cat-LipsCat-Lips
committed
Preparing for release
1 parent f7c5593 commit 2065258

10 files changed

Lines changed: 84 additions & 109 deletions

File tree

‎CustomGeneratorTests/CustomGeneratorTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreserveCompilationContext>true</PreserveCompilationContext>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.2.0-230705-1819.Release" />
9+
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.2.0" />
1010
</ItemGroup>
1111
</Project>

‎Godot 3.5 Tests/Godot 3.5 Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<None Include="**\*.tscn" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<PackageReference Include="FluentAssertions" Version="6.11.0" />
13-
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.2.0-230705-1819.Release" />
12+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
13+
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.2.0" />
1414
</ItemGroup>
1515
<ItemGroup>
1616
<ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />

‎Godot 3.5 Tests/Run.cs‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@
55

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

47-
[GodotOverride]
48-
public void OnReady()
49-
=> _.TestRunner.Initialise(Tests);
50-
}
47+
[GodotOverride]
48+
public void OnReady()
49+
=> _.TestRunner.Initialise(Tests);
50+
}
5151
}

‎Godot 3.5 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.0 Tests/Godot 4.0 Tests.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<Project Sdk="Godot.NET.Sdk/4.1.0-rc.2">
1+
<Project Sdk="Godot.NET.Sdk/4.2.0-beta.1">
22
<PropertyGroup>
33
<LangVersion>preview</LangVersion>
44
<ImplicitUsings>enable</ImplicitUsings>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<RootNamespace>GodotTests</RootNamespace>
5+
<TargetFramework>net7.0</TargetFramework>
76
<EnableDynamicLoading>true</EnableDynamicLoading>
87
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
98
</PropertyGroup>
@@ -12,8 +11,8 @@
1211
<None Include="**\*.tscn" />
1312
</ItemGroup>
1413
<ItemGroup>
15-
<PackageReference Include="FluentAssertions" Version="6.11.0" />
16-
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.2.0-230705-1819.Release" />
14+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
15+
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.2.0" />
1716
</ItemGroup>
1817
<ItemGroup>
1918
<ProjectReference Include="..\CustomGeneratorTests\CustomGeneratorTests.csproj" OutputItemType="analyzer" />

‎Godot 4.0 Tests/Godot 4.0 Tests.csproj.old‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Godot 4.0 Tests/Godot 4.0 Tests.sln‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.3.32929.385
4+
VisualStudioVersion = 17.7.34202.233
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Godot 4.0 Tests", "Godot 4.0 Tests.csproj", "{EE9C4133-3367-443F-8ED0-E6BADFD551C5}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Godot 4.0 Tests", "Godot 4.0 Tests.csproj", "{1339B053-8BAD-4CDC-9FC1-D392A0D4F63B}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7FAB41B4-799A-4725-8814-F677F18CB133}"
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{98ED36E1-26F1-4468-9150-FF291FD8D864}"
99
ProjectSection(SolutionItems) = preProject
1010
godot.log = godot.log
1111
project.godot = project.godot
1212
EndProjectSection
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomGeneratorTests", "..\CustomGeneratorTests\CustomGeneratorTests.csproj", "{A2BF457E-9123-4826-9218-781B7816324B}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomGeneratorTests", "..\CustomGeneratorTests\CustomGeneratorTests.csproj", "{4D2F6B00-4656-4217-BCF4-221D2275DB3B}"
1515
EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,23 +20,23 @@ Global
2020
ExportRelease|Any CPU = ExportRelease|Any CPU
2121
EndGlobalSection
2222
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23-
{EE9C4133-3367-443F-8ED0-E6BADFD551C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24-
{EE9C4133-3367-443F-8ED0-E6BADFD551C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
25-
{EE9C4133-3367-443F-8ED0-E6BADFD551C5}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
26-
{EE9C4133-3367-443F-8ED0-E6BADFD551C5}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
27-
{EE9C4133-3367-443F-8ED0-E6BADFD551C5}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
28-
{EE9C4133-3367-443F-8ED0-E6BADFD551C5}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
29-
{A2BF457E-9123-4826-9218-781B7816324B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{A2BF457E-9123-4826-9218-781B7816324B}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{A2BF457E-9123-4826-9218-781B7816324B}.ExportDebug|Any CPU.ActiveCfg = Debug|Any CPU
32-
{A2BF457E-9123-4826-9218-781B7816324B}.ExportDebug|Any CPU.Build.0 = Debug|Any CPU
33-
{A2BF457E-9123-4826-9218-781B7816324B}.ExportRelease|Any CPU.ActiveCfg = Release|Any CPU
34-
{A2BF457E-9123-4826-9218-781B7816324B}.ExportRelease|Any CPU.Build.0 = Release|Any CPU
23+
{1339B053-8BAD-4CDC-9FC1-D392A0D4F63B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{1339B053-8BAD-4CDC-9FC1-D392A0D4F63B}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{1339B053-8BAD-4CDC-9FC1-D392A0D4F63B}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
26+
{1339B053-8BAD-4CDC-9FC1-D392A0D4F63B}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
27+
{1339B053-8BAD-4CDC-9FC1-D392A0D4F63B}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
28+
{1339B053-8BAD-4CDC-9FC1-D392A0D4F63B}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
29+
{4D2F6B00-4656-4217-BCF4-221D2275DB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{4D2F6B00-4656-4217-BCF4-221D2275DB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{4D2F6B00-4656-4217-BCF4-221D2275DB3B}.ExportDebug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{4D2F6B00-4656-4217-BCF4-221D2275DB3B}.ExportDebug|Any CPU.Build.0 = Debug|Any CPU
33+
{4D2F6B00-4656-4217-BCF4-221D2275DB3B}.ExportRelease|Any CPU.ActiveCfg = Release|Any CPU
34+
{4D2F6B00-4656-4217-BCF4-221D2275DB3B}.ExportRelease|Any CPU.Build.0 = Release|Any CPU
3535
EndGlobalSection
3636
GlobalSection(SolutionProperties) = preSolution
3737
HideSolutionNode = FALSE
3838
EndGlobalSection
3939
GlobalSection(ExtensibilityGlobals) = postSolution
40-
SolutionGuid = {4FC72D94-FE04-4A54-9FE4-831911F35672}
40+
SolutionGuid = {CA0BF972-870E-4E83-9CAB-B442F57D98F4}
4141
EndGlobalSection
4242
EndGlobal

‎Godot 4.0 Tests/Properties/launchSettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"profiles": {
33
"Godot 4.0 Tests": {
44
"commandName": "Executable",
5-
"executablePath": "../../.godot/Godot_v4.0/Godot_v4.0.exe",
5+
"executablePath": "../../.godot/Godot_v4.2/Godot_v4.2.exe",
66
"commandLineArgs": "> godot.log 2>&1",
77
"workingDirectory": "."
88
}

‎Godot 4.0 Tests/project.godot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config_version=5
1212

1313
config/name="Godot 4.0 Tests"
1414
run/main_scene="res://Run.tscn"
15-
config/features=PackedStringArray("4.1", "C#")
15+
config/features=PackedStringArray("4.2", "C#")
1616

1717
[dotnet]
1818

‎SourceGenerators/SourceGenerators.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ C# Source Generators for use with the Godot Game Engine (supports Godot 4!)
3838
* Includes base classes/helpers to create project specific source generators
3939
</Description>
4040
<PackageReleaseNotes>
41-
v.2.1.0 (pre-release)
41+
v.2.2.0
4242
- ADDED: OnImport attribute (GD4 only)
4343

4444
v.2.1.0
@@ -80,8 +80,8 @@ C# Source Generators for use with the Godot Game Engine (supports Godot 4!)
8080
<PackageLicenseExpression>MIT</PackageLicenseExpression>
8181
<PackageTags>Godot C# SourceGenerator</PackageTags>
8282
<PackageReadmeFile>README.md</PackageReadmeFile>
83-
<!--<Version>2.2.0</Version>-->
84-
<Version>2.2.0-$([System.DateTime]::Now.ToString(yyMMdd-HHmm)).$(Configuration)</Version>
83+
<Version>2.2.0</Version>
84+
<!--<Version>2.2.0-$([System.DateTime]::Now.ToString(yyMMdd-HHmm)).$(Configuration)</Version>-->
8585
</PropertyGroup>
8686
<ItemGroup>
8787
<None Include="..\README.md" Pack="true" PackagePath="\" Link="Package\docs\README.md" />
@@ -96,9 +96,6 @@ C# Source Generators for use with the Godot Game Engine (supports Godot 4!)
9696
<PropertyGroup>
9797
<PackageScribanIncludeSource>true</PackageScribanIncludeSource>
9898
</PropertyGroup>
99-
<ItemGroup>
100-
<None Remove="OnImportExtensions\OnImportTemplate.sbncs" />
101-
</ItemGroup>
10299

103100
<!-- Package References -->
104101
<ItemGroup>

0 commit comments

Comments
 (0)