Fix tests errors

dotnet · Dec 9, 2024 · ecd3d95 · ecd3d95
1 parent bf3c488
commit ecd3d95
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/test/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs b/test/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs
@@ -55,7 +55,7 @@ public TestProject([CallerMemberName] string? name = null)
 
         public bool UseArtifactsOutput { get; set; }
 
-        public List<TestProject> ReferencedProjects { get; } = new List<TestProject>();
+        public List<TestProject?> ReferencedProjects { get; } = new List<TestProject?>();
 
         public List<string> References { get; } = new List<string>();
 
@@ -303,7 +303,7 @@ internal void Create(TestAsset targetTestAsset, string testProjectsSourceFolder,
                 foreach (var referencedProject in ReferencedProjects)
                 {
                     projectReferenceItemGroup.Add(new XElement(ns + "ProjectReference",
-                    new XAttribute("Include", $"../{referencedProject.Name}/{referencedProject.Name}.csproj")));
+                    new XAttribute("Include", $"../{referencedProject?.Name}/{referencedProject?.Name}.csproj")));
                 }
             }
 
@@ -419,7 +419,7 @@ static void Main(string[] args)
 
                     foreach (var dependency in ReferencedProjects)
                     {
-                        string? safeDependencyName = dependency.Name?.Replace('.', '_');
+                        string? safeDependencyName = dependency?.Name?.Replace('.', '_');
 
                         source += $"        Console.WriteLine({safeDependencyName}.{safeDependencyName}Class.Name);" + Environment.NewLine;
                         source += $"        Console.WriteLine({safeDependencyName}.{safeDependencyName}Class.List);" + Environment.NewLine;
@@ -448,7 +448,7 @@ public class {safeThisName}Class
 ";
                     foreach (var dependency in ReferencedProjects)
                     {
-                        string? safeDependencyName = dependency.Name?.Replace('.', '_');
+                        string? safeDependencyName = dependency?.Name?.Replace('.', '_');
 
                         source += $"        public string {safeDependencyName}Name {{ get {{ return {safeDependencyName}.{safeDependencyName}Class.Name; }} }}" + Environment.NewLine;
                         source += $"        public List<string> {safeDependencyName}List {{ get {{ return {safeDependencyName}.{safeDependencyName}Class.List; }} }}" + Environment.NewLine;

diff --git a/test/Microsoft.NET.TestFramework/TestAssetsManager.cs b/test/Microsoft.NET.TestFramework/TestAssetsManager.cs
@@ -140,7 +140,10 @@ private TestAsset CreateTestProjectsInDirectory(
 
                     foreach (var referencedProject in project.ReferencedProjects)
                     {
-                        projectStack.Push(referencedProject);
+                        if(referencedProject is not null)
+                        {
+                            projectStack.Push(referencedProject);
+                        }
                     }
                 }
             }

diff --git a/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs b/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs
@@ -422,7 +422,7 @@ private async Task<EvaluationResult> Evaluate(string projectPath)
             return result;
         }
 
-        private static string GetTestProjectPath(TestAsset target) => Path.Combine(GetTestProjectDirectory(target), target.TestProject.Name + ".csproj");
+        private static string GetTestProjectPath(TestAsset target) => Path.Combine(GetTestProjectDirectory(target), target.TestProject?.Name + ".csproj");
 
         private static string WriteFile(TestAsset testAsset, string name, string contents = "")
         {
@@ -443,6 +443,6 @@ private static string WriteFile(TestDirectory testAsset, string name, string con
         }
 
         private static string GetTestProjectDirectory(TestAsset testAsset)
-            => Path.Combine(testAsset.Path, testAsset.TestProject.Name);
+            => Path.Combine(testAsset.Path, testAsset.TestProject?.Name ?? string.Empty);
     }
 }