Applied same IntermediateOutputPath fix for UpdateAssemblyInfo task

Author: Jeff Peirson

src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs

@@ -87,7 +87,85 @@ public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuildInBuildServe
         fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.0.1.0"")]");
     }
 
-    private static void AddUpdateAssemblyInfoTask(ProjectCreator project, string targetToRun, string taskName, string outputProperty)
+    [Test]
+    public void UpdateAssemblyInfoTaskShouldCreateFileWhenIntermediateOutputPathDoesNotExist()
+    {
+        var task = new UpdateAssemblyInfo { IntermediateOutputPath = Guid.NewGuid().ToString("N") };
+
+        using var result = ExecuteMsBuildTask(task);
+
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Task.AssemblyInfoTempFilePath.ShouldNotBeNull();
+
+        var fileContent = File.ReadAllText(result.Task.AssemblyInfoTempFilePath);
+        fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.2.4.0"")]");
+    }
+
+    [Test]
+    public void UpdateAssemblyInfoTaskShouldCreateFileWhenIntermediateOutputPathDoesNotExistInBuildServer()
+    {
+        var task = new UpdateAssemblyInfo { IntermediateOutputPath = Guid.NewGuid().ToString("N") };
+
+        using var result = ExecuteMsBuildTaskInAzurePipeline(task);
+
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Task.AssemblyInfoTempFilePath.ShouldNotBeNull();
+
+        var fileContent = File.ReadAllText(result.Task.AssemblyInfoTempFilePath);
+        fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.0.1.0"")]");
+    }
+
+    [Test]
+    [Category(NoNet48)]
+    [Category(NoMono)]
+    public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuildAndIntermediateOutputPathDoesNotExist()
+    {
+        const string taskName = nameof(UpdateAssemblyInfo);
+        const string outputProperty = nameof(UpdateAssemblyInfo.AssemblyInfoTempFilePath);
+        var randDir = Guid.NewGuid().ToString("N");
+
+        using var result = ExecuteMsBuildExe(project => AddUpdateAssemblyInfoTask(project, taskName, taskName, outputProperty, Path.Combine("$(MSBuildProjectDirectory)", randDir)));
+
+        result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
+        result.MsBuild.Count.ShouldBeGreaterThan(0);
+        result.MsBuild.OverallSuccess.ShouldBe(true);
+        result.MsBuild.ShouldAllBe(x => x.Succeeded);
+        result.Output.ShouldNotBeNullOrWhiteSpace();
+
+        var generatedFilePath = PathHelper.Combine(Path.GetDirectoryName(result.ProjectPath), randDir, "AssemblyInfo.g.cs");
+        result.Output.ShouldContain($"{outputProperty}: {generatedFilePath}");
+
+        var fileContent = File.ReadAllText(generatedFilePath);
+        fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.2.4.0"")]");
+    }
+
+    [Test]
+    [Category(NoNet48)]
+    [Category(NoMono)]
+    public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuildAndIntermediateOutputPathDoesNotExistInBuildServer()
+    {
+        const string taskName = nameof(UpdateAssemblyInfo);
+        const string outputProperty = nameof(UpdateAssemblyInfo.AssemblyInfoTempFilePath);
+        var randDir = Guid.NewGuid().ToString("N");
+
+        using var result = ExecuteMsBuildExeInAzurePipeline(project => AddUpdateAssemblyInfoTask(project, taskName, taskName, outputProperty, Path.Combine("$(MSBuildProjectDirectory)", randDir)));
+
+        result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
+        result.MsBuild.Count.ShouldBeGreaterThan(0);
+        result.MsBuild.OverallSuccess.ShouldBe(true);
+        result.MsBuild.ShouldAllBe(x => x.Succeeded);
+        result.Output.ShouldNotBeNullOrWhiteSpace();
+
+        var generatedFilePath = PathHelper.Combine(Path.GetDirectoryName(result.ProjectPath), randDir, "AssemblyInfo.g.cs");
+        result.Output.ShouldContain($"{outputProperty}: {generatedFilePath}");
+
+        var fileContent = File.ReadAllText(generatedFilePath);
+        fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.0.1.0"")]");
+    }
+
+    private static void AddUpdateAssemblyInfoTask(ProjectCreator project, string targetToRun, string taskName, string outputProperty, string intermediateOutputPath = "$(MSBuildProjectDirectory)")
     {
         var assemblyFileLocation = typeof(GitVersionTaskBase).Assembly.Location;
         project.UsingTaskAssemblyFile(taskName, assemblyFileLocation)
@@ -98,7 +176,7 @@ private static void AddUpdateAssemblyInfoTask(ProjectCreator project, string tar
                 { "SolutionDirectory", "$(MSBuildProjectDirectory)" },
                 { "VersionFile", "$(MSBuildProjectDirectory)/gitversion.json" },
                 { "ProjectFile", "$(MSBuildProjectFullPath)" },
-                { "IntermediateOutputPath", "$(MSBuildProjectDirectory)" },
+                { "IntermediateOutputPath", intermediateOutputPath },
                 { "Language", "$(Language)" },
                 { "CompileFiles", "@(Compile)" }
             })

src/GitVersion.MsBuild/GitVersionTaskExecutor.cs

@@ -34,6 +34,12 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
         var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem);
         FileHelper.DeleteTempFiles();
         FileHelper.CheckForInvalidFiles(task.CompileFiles, task.ProjectFile);
+        
+        if (!string.IsNullOrEmpty(task.IntermediateOutputPath))
+        {
+            // Ensure provided output path exists first. Fixes issue #2815.
+            fileSystem.CreateDirectory(task.IntermediateOutputPath);
+        }
 
         var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "AssemblyInfo");
         task.AssemblyInfoTempFilePath = PathHelper.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
@@ -54,7 +60,7 @@ public void GenerateGitVersionInformation(GenerateGitVersionInformation task)
         if (!string.IsNullOrEmpty(task.IntermediateOutputPath))
         {
             // Ensure provided output path exists first. Fixes issue #2815.
-            this.fileSystem.CreateDirectory(task.IntermediateOutputPath);
+            fileSystem.CreateDirectory(task.IntermediateOutputPath);
         }
 
         var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "GitVersionInformation");