#36 Removing implicit usings from all tests

Cat-Lips · Cat-Lips · commit 9b9f4b273031 · 2023-10-21T18:43:19.000+11:00
diff --git a/CustomGeneratorTests/CustomGeneratorTests.csproj b/CustomGeneratorTests/CustomGeneratorTests.csproj
@@ -1,7 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <LangVersion>preview</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
diff --git a/CustomGeneratorTests/MyClassAttribute.cs b/CustomGeneratorTests/MyClassAttribute.cs
@@ -1,4 +1,6 @@
-﻿namespace CustomGeneratorTests
+﻿using System;
+
+namespace CustomGeneratorTests
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class MyClassAttribute : Attribute { }
diff --git a/CustomGeneratorTests/MyClassAttributeGenerator.cs b/CustomGeneratorTests/MyClassAttributeGenerator.cs
@@ -1,4 +1,5 @@
-﻿using GodotSharp.SourceGenerators;
+﻿using System.Collections.Generic;
+using GodotSharp.SourceGenerators;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 
diff --git a/CustomGeneratorTests/MyMethodAttribute.cs b/CustomGeneratorTests/MyMethodAttribute.cs
@@ -1,4 +1,6 @@
-﻿namespace CustomGeneratorTests
+﻿using System;
+
+namespace CustomGeneratorTests
 {
     [AttributeUsage(AttributeTargets.Method)]
     public class MyMethodAttribute : Attribute { }
diff --git a/CustomGeneratorTests/MyMethodAttributeGenerator.cs b/CustomGeneratorTests/MyMethodAttributeGenerator.cs
@@ -1,4 +1,5 @@
-﻿using GodotSharp.SourceGenerators;
+﻿using System.Collections.Generic;
+using GodotSharp.SourceGenerators;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 
diff --git a/Godot 3.5 Tests/CustomGeneratorTests/MyTestClass.cs b/Godot 3.5 Tests/CustomGeneratorTests/MyTestClass.cs
@@ -1,4 +1,5 @@
-﻿using CustomGeneratorTests;
+﻿using System.Collections.Generic;
+using CustomGeneratorTests;
 
 namespace GodotTests.CustomGeneratorTests
 {
diff --git a/Godot 3.5 Tests/CustomGeneratorTests/MyTestClassWithNoNamespaceAndSameName.cs b/Godot 3.5 Tests/CustomGeneratorTests/MyTestClassWithNoNamespaceAndSameName.cs
@@ -1,4 +1,5 @@
-﻿using CustomGeneratorTests;
+﻿using System.Collections.Generic;
+using CustomGeneratorTests;
 
 [MyClass]
 public partial class MyTestClass<T1>
diff --git a/Godot 3.5 Tests/Godot 3.5 Tests.csproj b/Godot 3.5 Tests/Godot 3.5 Tests.csproj
@@ -1,7 +1,6 @@
 ﻿<Project Sdk="Godot.NET.Sdk/3.3.0">
   <PropertyGroup>
     <LangVersion>preview</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
     <TargetFramework>netstandard2.1</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
diff --git a/Godot 3.5 Tests/RootScene.cs b/Godot 3.5 Tests/RootScene.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 3.5 Tests/Run.cs b/Godot 3.5 Tests/Run.cs
@@ -1,51 +1,53 @@
+using System;
+using System.Collections.Generic;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
 using GodotTests.TestScenes;
 using GodotTests.TestScenes.SeparateScriptNamespace;
 
 namespace GodotTests
 {
-	[SceneTree]
-	public abstract partial class Run : Control
-	{
-		private static IEnumerable<Func<ITest>> Tests
-		{
-			get
-			{
-				yield return ITest.GetTest<AmbiguousTypeWithImplicitUsings>;
-				yield return ITest.GetTest<CachedNodes>;
-				yield return ITest.GetTest<EditableChildrenTest>;
-				yield return ITest.GetTest<EditableChildrenWithTraversalTest>;
-				yield return ITest.GetTest<EmptyScene>;
-				yield return ITest.GetTest<EmptySceneWithNoNamespace>;
-				yield return ITest.GetTest<GenericRootTest>;
-				yield return ITest.GetTest<GodotNotifyTests>;
-				yield return ITest.GetTest<GodotOverrideInheritanceTest>;
-				yield return ITest.GetTest<GodotOverrideTest>;
-				yield return ITest.GetTest<ImplicitConversionTests>;
-				yield return ITest.GetTest<InheritedScene>;
-				yield return ITest.GetTest<InheritedSceneWithBaseChanges1>;
-				yield return ITest.GetTest<InheritedSceneWithBaseChanges2>;
-				yield return ITest.GetTest<InheritedSceneWithInstancedScene>;
-				yield return ITest.GetTest<InheritingSceneWithoutScript>;
-				yield return ITest.GetTest<InstancedScene>;
-				yield return ITest.GetTest<InstancedSceneFromDifferentNamespace>;
-				yield return ITest.GetTest<InstancingSceneWithoutScript>;
-				yield return ITest.GetTest<InstantiateTests>;
-				yield return ITest.GetTest<LoadAsPlaceholderTest>;
-				yield return ITest.GetTest<PathTooLongError>;
-				yield return ITest.GetTest<RootScene>;
-				yield return ITest.GetTest<RootSceneWithNoNamespace>;
-				yield return ITest.GetTest<SameNameTest>;
-				yield return ITest.GetTest<ScriptForSceneWithDifferentName>;
-				yield return ITest.GetTest<ScriptForSceneWithDifferentPath>;
-				yield return ITest.GetTest<TraverseInstancedScene>;
-				yield return ITest.GetTest<UniqueSceneNameAccessTest>;
-			}
-		}
+    [SceneTree]
+    public abstract partial class Run : Control
+    {
+        private static IEnumerable<Func<ITest>> Tests
+        {
+            get
+            {
+                yield return ITest.GetTest<AmbiguousTypeWithImplicitUsings>;
+                yield return ITest.GetTest<CachedNodes>;
+                yield return ITest.GetTest<EditableChildrenTest>;
+                yield return ITest.GetTest<EditableChildrenWithTraversalTest>;
+                yield return ITest.GetTest<EmptyScene>;
+                yield return ITest.GetTest<EmptySceneWithNoNamespace>;
+                yield return ITest.GetTest<GenericRootTest>;
+                yield return ITest.GetTest<GodotNotifyTests>;
+                yield return ITest.GetTest<GodotOverrideInheritanceTest>;
+                yield return ITest.GetTest<GodotOverrideTest>;
+                yield return ITest.GetTest<ImplicitConversionTests>;
+                yield return ITest.GetTest<InheritedScene>;
+                yield return ITest.GetTest<InheritedSceneWithBaseChanges1>;
+                yield return ITest.GetTest<InheritedSceneWithBaseChanges2>;
+                yield return ITest.GetTest<InheritedSceneWithInstancedScene>;
+                yield return ITest.GetTest<InheritingSceneWithoutScript>;
+                yield return ITest.GetTest<InstancedScene>;
+                yield return ITest.GetTest<InstancedSceneFromDifferentNamespace>;
+                yield return ITest.GetTest<InstancingSceneWithoutScript>;
+                yield return ITest.GetTest<InstantiateTests>;
+                yield return ITest.GetTest<LoadAsPlaceholderTest>;
+                yield return ITest.GetTest<PathTooLongError>;
+                yield return ITest.GetTest<RootScene>;
+                yield return ITest.GetTest<RootSceneWithNoNamespace>;
+                yield return ITest.GetTest<SameNameTest>;
+                yield return ITest.GetTest<ScriptForSceneWithDifferentName>;
+                yield return ITest.GetTest<ScriptForSceneWithDifferentPath>;
+                yield return ITest.GetTest<TraverseInstancedScene>;
+                yield return ITest.GetTest<UniqueSceneNameAccessTest>;
+            }
+        }
 
-		[GodotOverride]
-		public void OnReady()
-			=> _.TestRunner.Initialise(Tests);
-	}
+        [GodotOverride]
+        public void OnReady()
+            => _.TestRunner.Initialise(Tests);
+    }
 }
diff --git a/Godot 3.5 Tests/TestScenes/Feature26.InstantiateTests/InstantiateTests.cs b/Godot 3.5 Tests/TestScenes/Feature26.InstantiateTests/InstantiateTests.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Reflection;
 using FluentAssertions;
 using Godot;
diff --git a/Godot 3.5 Tests/TestScenes/InheritedScene.cs b/Godot 3.5 Tests/TestScenes/InheritedScene.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 3.5 Tests/TestScenes/InheritedSceneWithBaseChanges1.cs b/Godot 3.5 Tests/TestScenes/InheritedSceneWithBaseChanges1.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 3.5 Tests/TestScenes/InheritedSceneWithBaseChanges2.cs b/Godot 3.5 Tests/TestScenes/InheritedSceneWithBaseChanges2.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 3.5 Tests/TestScenes/InheritedSceneWithInstancedScene.cs b/Godot 3.5 Tests/TestScenes/InheritedSceneWithInstancedScene.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 3.5 Tests/TestScenes/TraverseInstancedScene.cs b/Godot 3.5 Tests/TestScenes/TraverseInstancedScene.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 3.5 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/Callable.Extensions.cs b/Godot 3.5 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/Callable.Extensions.cs
@@ -1,4 +1,5 @@
-﻿using Object = Godot.Object;
+﻿using System;
+using Object = Godot.Object;
 
 namespace GodotSharp.BuildingBlocks
 {
diff --git a/Godot 3.5 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/Callable.cs b/Godot 3.5 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/Callable.cs
@@ -1,4 +1,6 @@
-﻿namespace GodotSharp.BuildingBlocks
+﻿using System;
+
+namespace GodotSharp.BuildingBlocks
 {
     public class Callable : Godot.Object
     {
diff --git a/Godot 3.5 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/ITest.cs b/Godot 3.5 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/ITest.cs
@@ -1,4 +1,6 @@
-﻿using System.Reflection;
+﻿using System;
+using System.Collections.Generic;
+using System.Reflection;
 using FluentAssertions.Execution;
 using Godot;
 
diff --git a/Godot 3.5 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/TestRunner.cs b/Godot 3.5 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/TestRunner.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using Godot;
 using static Godot.SplitContainer;
 
diff --git a/Godot 4.0 Tests/CustomGeneratorTests/MyTestClass.cs b/Godot 4.0 Tests/CustomGeneratorTests/MyTestClass.cs
@@ -1,4 +1,5 @@
-﻿using CustomGeneratorTests;
+﻿using System.Collections.Generic;
+using CustomGeneratorTests;
 
 namespace GodotTests.CustomGeneratorTests
 {
diff --git a/Godot 4.0 Tests/CustomGeneratorTests/MyTestClassWithNoNamespaceAndSameName.cs b/Godot 4.0 Tests/CustomGeneratorTests/MyTestClassWithNoNamespaceAndSameName.cs
@@ -1,4 +1,5 @@
-﻿using CustomGeneratorTests;
+﻿using System.Collections.Generic;
+using CustomGeneratorTests;
 
 [MyClass]
 public partial class MyTestClass<T1>
diff --git a/Godot 4.0 Tests/Godot 4.0 Tests.csproj b/Godot 4.0 Tests/Godot 4.0 Tests.csproj
@@ -1,7 +1,6 @@
 ﻿<Project Sdk="Godot.NET.Sdk/4.2.0-beta.1">
   <PropertyGroup>
     <LangVersion>preview</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
     <TargetFramework>net7.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Godot 4.0 Tests/RootScene.cs b/Godot 4.0 Tests/RootScene.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 4.0 Tests/Run.cs b/Godot 4.0 Tests/Run.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
 using GodotTests.TestScenes;
diff --git a/Godot 4.0 Tests/TestScenes/Feature26.InstantiateTests/InstantiateTests.cs b/Godot 4.0 Tests/TestScenes/Feature26.InstantiateTests/InstantiateTests.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Reflection;
 using FluentAssertions;
 using Godot;
diff --git a/Godot 4.0 Tests/TestScenes/Feature31.OnImportAttribute/OnImportTests.cs b/Godot 4.0 Tests/TestScenes/Feature31.OnImportAttribute/OnImportTests.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using Godot.Collections;
diff --git a/Godot 4.0 Tests/TestScenes/InheritedScene.cs b/Godot 4.0 Tests/TestScenes/InheritedScene.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 4.0 Tests/TestScenes/InheritedSceneWithBaseChanges1.cs b/Godot 4.0 Tests/TestScenes/InheritedSceneWithBaseChanges1.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 4.0 Tests/TestScenes/InheritedSceneWithBaseChanges2.cs b/Godot 4.0 Tests/TestScenes/InheritedSceneWithBaseChanges2.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 4.0 Tests/TestScenes/InheritedSceneWithInstancedScene.cs b/Godot 4.0 Tests/TestScenes/InheritedSceneWithInstancedScene.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 4.0 Tests/TestScenes/TraverseInstancedScene.cs b/Godot 4.0 Tests/TestScenes/TraverseInstancedScene.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using FluentAssertions;
 using Godot;
 using GodotSharp.BuildingBlocks.TestRunner;
diff --git a/Godot 4.0 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/ITest.cs b/Godot 4.0 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/ITest.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using System.Reflection;
 using FluentAssertions.Execution;
 using Godot;
diff --git a/Godot 4.0 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/TestRunner.cs b/Godot 4.0 Tests/addons/GodotSharp.BuildingBlocks.TestRunner/TestRunner.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using Godot;
 using static Godot.SplitContainer;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace CustomGeneratorTests`
	`1`	`+using System;`
	`2`	`+`
	`3`	`+namespace CustomGeneratorTests`
`2`	`4`	`{`
`3`	`5`	`[AttributeUsage(AttributeTargets.Class)]`
`4`	`6`	`public class MyClassAttribute : Attribute { }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using CustomGeneratorTests;`
	`1`	`+using System.Collections.Generic;`
	`2`	`+using CustomGeneratorTests;`
`2`	`3`
`3`	`4`	`namespace GodotTests.CustomGeneratorTests`
`4`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System.Linq;`
`1`	`2`	`using FluentAssertions;`
`2`	`3`	`using Godot;`
`3`	`4`	`using GodotSharp.BuildingBlocks.TestRunner;`