Bundle Source Link packages

tmat · tmat · commit 77f96080c559 · 2023-04-05T18:17:40.000-07:00
diff --git a/src/Assets/TestProjects/SourceLinkTestApp/Directory.Build.props b/src/Assets/TestProjects/SourceLinkTestApp/Directory.Build.props
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/src/Assets/TestProjects/SourceLinkTestApp/Directory.Build.targets b/src/Assets/TestProjects/SourceLinkTestApp/Directory.Build.targets
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/src/Assets/TestProjects/SourceLinkTestApp/Program.cs b/src/Assets/TestProjects/SourceLinkTestApp/Program.cs
@@ -0,0 +1,6 @@
+﻿// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+Console.WriteLine("Hello World!");
diff --git a/src/Assets/TestProjects/SourceLinkTestApp/SourceLinkTestApp.csproj b/src/Assets/TestProjects/SourceLinkTestApp/SourceLinkTestApp.csproj
@@ -0,0 +1,8 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RestorePackagesPath Condition=" '$(RestorePackagesPath)' == '' ">$(MSBuildThisFileDirectory)..\..\..\artifacts\.nuget\packages</RestorePackagesPath>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+</Project>
diff --git a/src/Layout/redist/targets/BundledSdks.targets b/src/Layout/redist/targets/BundledSdks.targets
@@ -4,5 +4,13 @@
     <BundledSdk Include="Microsoft.NET.Sdk.WindowsDesktop" Version="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     <BundledSdk Include="FSharp.NET.Sdk" Version="1.0.4-bundled-0100" />
     <BundledSdk Include="Microsoft.Docker.Sdk" Version="1.1.0" />
+
+    <!-- Use the same version for all Source Link packages -->
+    <BundledSdk Include="Microsoft.Build.Tasks.Git" Version="$(MicrosoftSourceLinkGitHubVersion)" />
+    <BundledSdk Include="Microsoft.SourceLink.Common" Version="$(MicrosoftSourceLinkGitHubVersion)" />
+    <BundledSdk Include="Microsoft.SourceLink.AzureRepos.Git" Version="$(MicrosoftSourceLinkGitHubVersion)" />
+    <BundledSdk Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" />
+    <BundledSdk Include="Microsoft.SourceLink.GitLab" Version="$(MicrosoftSourceLinkGitHubVersion)" />
+    <BundledSdk Include="Microsoft.SourceLink.Bitbucket.Git" Version="$(MicrosoftSourceLinkGitHubVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/Layout/redist/targets/RestoreDependency.proj b/src/Layout/redist/targets/RestoreDependency.proj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" DefaultTargets="EnsureDependencyRestored;CopySdkToOutput">
+﻿<Project ToolsVersion="15.0" DefaultTargets="PrepareBundledDependencyProps;EnsureDependencyRestored;CopySdkToOutput">
 <!--
 
   Note that the CopySdkToOutput target explicitly does NOT have Inputs and Outputs declared.
@@ -24,24 +24,29 @@
 
   <Target Name="GetSdkItemsToCopy">
     <ItemGroup>
-      <SdkContent Include="$(DependencyNuPkgPath)/**/*"
-                  Exclude="$(DependencyNuPkgPath)/$(DependencyPackageName).nuspec;
-                           $(DependencyNuPkgPath)/$(DependencyPackageName).$(DependencyPackageVersion).nupkg;
-                           $(DependencyNuPkgPath)/$(DependencyPackageName).$(DependencyPackageVersion).nupkg.sha512" />
+      <SdkContent Include="$(DependencyNuPkgPath)**\*"
+                  Exclude="$(DependencyNuPkgPath)Icon.png;
+                           $(DependencyNuPkgPath)$(DependencyPackageName).nuspec;
+                           $(DependencyNuPkgPath)$(DependencyPackageName).$(DependencyPackageVersion).nupkg;
+                           $(DependencyNuPkgPath)$(DependencyPackageName).$(DependencyPackageVersion).nupkg.sha512" />
     </ItemGroup>
   </Target>
 
   <Target Name="EnsureDependencyRestored"
-          Condition="!Exists('$(DependencyNuPkgPath)/$(DependencyPackageName.ToLower()).nuspec')">
+          DependsOnTargets="PrepareBundledDependencyProps"
+          Condition="!Exists('$(DependencyNuPkgPath)$(DependencyPackageName.ToLower()).nuspec')">
+
+    <Message Text="Dependency has not been restored yet: '$(DependencyNuPkgPath)$(DependencyPackageName.ToLower()).nuspec'"/>
+
     <MSbuild
-      Projects="$(MSBuildThisFileDirectory)/sdks/sdks.csproj"
+      Projects="$(MSBuildThisFileDirectory)sdks\sdks.csproj"
       Properties="DependencyPackageName=$(DependencyPackageName);DependencyPackageVersion=$(DependencyPackageVersion)"
       Targets="Restore" />
   </Target>
 
   <Target Name="PrepareBundledDependencyProps">
     <PropertyGroup>
-      <DependencyNuPkgPath>$(NuGetPackageRoot)/$(DependencyPackageName.ToLower())/$(DependencyPackageVersion.ToLower())</DependencyNuPkgPath>
+      <DependencyNuPkgPath>$(NuGetPackageRoot)$(DependencyPackageName.ToLower())\$(DependencyPackageVersion.ToLower())\</DependencyNuPkgPath>
     </PropertyGroup>
   </Target>
 </Project>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Common.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Common.targets
@@ -13,6 +13,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <!-- This file is imported by both cross-targeting and inner builds. Set properties that need to be available to both here. -->
 
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.SourceLink.targets" />
+
   <PropertyGroup>
     <MicrosoftNETBuildTasksDirectoryRoot>$(MSBuildThisFileDirectory)..\tools\</MicrosoftNETBuildTasksDirectoryRoot>
     <MicrosoftNETBuildTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net8.0</MicrosoftNETBuildTasksTFM>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.SourceLink.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.SourceLink.props
@@ -0,0 +1,30 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.FSharp.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <_SourceLinkSdkSubDir>build</_SourceLinkSdkSubDir>
+    <_SourceLinkSdkSubDir Condition="'$(IsCrossTargetingBuild)' == 'true'">buildMultiTargeting</_SourceLinkSdkSubDir>
+
+    <!-- Suppress implicit SourceLink inclusion if any Microsoft.SourceLink package is referenced. -->
+    <SuppressImplicitGitSourceLink Condition="'$(SuppressImplicitGitSourceLink)' == '' and '$(PkgMicrosoft_SourceLink_Common)' != ''">true</SuppressImplicitGitSourceLink>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.Build.Tasks.Git\$(_SourceLinkSdkSubDir)\Microsoft.Build.Tasks.Git.props" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.SourceLink.Common\$(_SourceLinkSdkSubDir)\Microsoft.SourceLink.Common.props" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.SourceLink.GitHub\$(_SourceLinkSdkSubDir)\Microsoft.SourceLink.GitHub.props" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.SourceLink.GitLab\$(_SourceLinkSdkSubDir)\Microsoft.SourceLink.GitLab.props" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.SourceLink.AzureRepos.Git\$(_SourceLinkSdkSubDir)\Microsoft.SourceLink.AzureRepos.Git.props" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.SourceLink.Bitbucket.Git\$(_SourceLinkSdkSubDir)\Microsoft.SourceLink.Bitbucket.Git.props" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+
+</Project>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.SourceLink.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.SourceLink.targets
@@ -0,0 +1,26 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.FSharp.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup Condition="'$(SuppressImplicitGitSourceLink)' != 'true'">
+    <EmbedUntrackedSources Condition="'$(EmbedUntrackedSources)' == ''">true</EmbedUntrackedSources>
+  </PropertyGroup>
+  
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.Build.Tasks.Git\$(_SourceLinkSdkSubDir)\Microsoft.Build.Tasks.Git.targets" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.SourceLink.Common\$(_SourceLinkSdkSubDir)\Microsoft.SourceLink.Common.targets" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.SourceLink.GitHub\$(_SourceLinkSdkSubDir)\Microsoft.SourceLink.GitHub.targets" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.SourceLink.GitLab\$(_SourceLinkSdkSubDir)\Microsoft.SourceLink.GitLab.targets" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.SourceLink.AzureRepos.Git\$(_SourceLinkSdkSubDir)\Microsoft.SourceLink.AzureRepos.Git.targets" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\Microsoft.SourceLink.Bitbucket.Git\$(_SourceLinkSdkSubDir)\Microsoft.SourceLink.Bitbucket.Git.targets" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
+
+</Project>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
@@ -157,6 +157,8 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!-- List of supported .NET windows target platform versions -->
   <Import Project="Microsoft.NET.WindowsSdkSupportedTargetPlatforms.props" />
 
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.SourceLink.props" />
+
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.CSharp.props" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.VisualBasic.props" Condition="'$(MSBuildProjectExtension)' == '.vbproj'" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.FSharp.props" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
diff --git a/src/Tests/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj b/src/Tests/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <EnableDefaultItems>false</EnableDefaultItems>
     <OutDirName>Tests\$(MSBuildProjectName)</OutDirName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
diff --git a/src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs b/src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs
@@ -0,0 +1,212 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection.Metadata;
+using System.Text;
+using System.Xml.Linq;
+using FluentAssertions;
+using Microsoft.NET.TestFramework;
+using Microsoft.NET.TestFramework.Assertions;
+using Microsoft.NET.TestFramework.Commands;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.NET.Build.Tests
+{
+    public class SourceLinkTests : SdkTest
+    {
+        private static readonly Guid s_embeddedSourceKindGuid = new("0E8A571B-6926-466E-B4AD-8AB04611F5FE");
+
+        public SourceLinkTests(ITestOutputHelper log)
+            : base(log)
+        {
+        }
+
+        private void CreateGitFiles(string repoDir, string originUrl)
+        {
+            var gitDir = Path.Combine(repoDir, ".git");
+            var headsDir = Path.Combine(gitDir, "refs", "heads");
+
+            Directory.CreateDirectory(gitDir);
+            File.WriteAllText(Path.Combine(gitDir, "HEAD"), "ref: refs/heads/master");
+            Directory.CreateDirectory(headsDir);
+            File.WriteAllText(Path.Combine(headsDir, "master"), "1200000000000000000000000000000000000000");
+
+            if (originUrl != null)
+            {
+                File.WriteAllText(Path.Combine(gitDir, "config"), $"""
+                [remote "origin"]
+                    url = {originUrl}
+                """);
+            }
+
+            File.WriteAllText(Path.Combine(repoDir, ".gitignore"), """
+                [Bb]in/
+                [Oo]bj/
+                """);
+        }
+
+        private unsafe void ValidatePdb(string pdbPath, bool expectedEmbeddedSources)
+        {
+            // Validates that *.AssemblyAttributes.cs file is embedded in the PDB.
+
+            var pdb = File.ReadAllBytes(pdbPath);
+            fixed (byte* pdbPtr = pdb)
+            {
+                var mdReader = new MetadataReader(pdbPtr, pdb.Length);
+                var attrDocHandle = mdReader.Documents.Single(h => mdReader.GetString(mdReader.GetDocument(h).Name).EndsWith(".AssemblyAttributes.cs"));
+                var cdis = mdReader.GetCustomDebugInformation(attrDocHandle);
+
+                Assert.Equal(expectedEmbeddedSources, cdis.Any(h => mdReader.GetGuid(mdReader.GetCustomDebugInformation(h).Kind) == s_embeddedSourceKindGuid));
+            }
+        }
+
+        [Fact]
+        public void WithNoGitMetadata()
+        {
+            // We need to copy the test project to a directory outside of the SDK repo,
+            // otherwise we would find .git directory in the SDK repo root.
+
+            var testAsset = _testAssetsManager
+                .CopyTestAsset("SourceLinkTestApp", testDestinationDirectory: Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()))
+                .WithSource();
+
+            var buildCommand = new BuildCommand(testAsset);
+            buildCommand.Execute().Should().Pass();
+
+            var intermediateDir = buildCommand.GetIntermediateDirectory();
+            intermediateDir.Should().NotHaveFile("SourceLinkTestApp.sourcelink.json");
+        }
+
+        [Fact]
+        public void WithNoRemote()
+        {
+            var testAsset = _testAssetsManager
+                .CopyTestAsset("SourceLinkTestApp")
+                .WithSource();
+
+            CreateGitFiles(testAsset.Path, originUrl: null);
+
+            var buildCommand = new BuildCommand(testAsset);
+            buildCommand.Execute().Should().HaveStdOutContaining($"warning : Repository '{testAsset.Path}' has no remote.");
+
+            var intermediateDir = buildCommand.GetIntermediateDirectory();
+            intermediateDir.Should().NotHaveFile("SourceLinkTestApp.sourcelink.json");
+        }
+
+        [Fact]
+        public void WithRemoteOrigin_UnknownDomain()
+        {
+            var testAsset = _testAssetsManager
+                .CopyTestAsset("SourceLinkTestApp")
+                .WithSource();
+
+            CreateGitFiles(testAsset.Path, originUrl: "https://contoso.com");
+
+            var buildCommand = new BuildCommand(testAsset)
+            {
+                WorkingDirectory = testAsset.Path
+            };
+
+            var result = buildCommand.Execute().Should().Pass();
+
+            var intermediateDir = buildCommand.GetIntermediateDirectory();
+            intermediateDir.Should().NotHaveFile("SourceLinkTestApp.sourcelink.json");
+        }
+
+        [Theory]
+        [InlineData("https://github.com/org/repo", "https://raw.githubusercontent.com/org/repo/1200000000000000000000000000000000000000/*")]
+        [InlineData("https://gitlab.com/org/repo", "https://gitlab.com/org/repo/-/raw/1200000000000000000000000000000000000000/*")]
+        [InlineData("https://bitbucket.org/org/repo", "https://api.bitbucket.org/2.0/repositories/org/repo/src/1200000000000000000000000000000000000000/*")]
+        [InlineData("https://test.visualstudio.com/org/_git/repo", "https://test.visualstudio.com/org/_apis/git/repositories/repo/items?api-version=1.0&versionType=commit&version=1200000000000000000000000000000000000000&path=/*")]
+        public void WithRemoteOrigin_KnownDomain(string origin, string expectedLink)
+        {
+            var testAsset = _testAssetsManager
+                .CopyTestAsset("SourceLinkTestApp", identifier: origin)
+                .WithSource();
+
+            CreateGitFiles(testAsset.Path, origin);
+
+            var buildCommand = new BuildCommand(testAsset)
+            {
+                WorkingDirectory = testAsset.Path
+            };
+
+            var result = buildCommand.Execute().Should().Pass();
+
+            var intermediateDir = buildCommand.GetIntermediateDirectory();
+            var sourceLinkFilePath = Path.Combine(intermediateDir.FullName, "SourceLinkTestApp.sourcelink.json");
+            var actualContent = File.ReadAllText(sourceLinkFilePath, Encoding.UTF8);
+            var expectedPattern = Path.Combine(testAsset.Path, "*").Replace("\\", "\\\\");
+
+            Assert.Equal($$$"""{"documents":{"{{{expectedPattern}}}":"{{{expectedLink}}}"}}""", actualContent);
+
+            ValidatePdb(Path.Combine(intermediateDir.FullName, "SourceLinkTestApp.pdb"), expectedEmbeddedSources: true);
+        }
+
+        [Fact]
+        public void SuppressImplicitGitSourceLink_SetExplicitly()
+        {
+            var testAsset = _testAssetsManager
+                .CopyTestAsset("SourceLinkTestApp")
+                .WithSource().WithProjectChanges(p =>
+                {
+                    var ns = p.Root.Name.Namespace;
+
+                    var propertyGroup = new XElement(ns + "PropertyGroup");
+                    p.Root.Add(propertyGroup);
+
+                    propertyGroup.Add(new XElement(ns + "SuppressImplicitGitSourceLink", "true"));
+                });
+
+            CreateGitFiles(testAsset.Path, "https://github.com/org/repo");
+
+            var buildCommand = new BuildCommand(testAsset)
+            {
+                WorkingDirectory = testAsset.Path
+            };
+
+            var result = buildCommand.Execute().Should().Pass();
+
+            var intermediateDir = buildCommand.GetIntermediateDirectory();
+            intermediateDir.Should().NotHaveFile("SourceLinkTestApp.sourcelink.json");
+        }
+
+        [Fact]
+        public void SuppressImplicitGitSourceLink_ExplicitPackage()
+        {
+            var testAsset = _testAssetsManager
+                .CopyTestAsset("SourceLinkTestApp")
+                .WithSource()
+                .WithProjectChanges(p =>
+                {
+                    var ns = p.Root.Name.Namespace;
+
+                    var itemGroup = new XElement(ns + "ItemGroup");
+                    p.Root.Add(itemGroup);
+
+                    itemGroup.Add(new XElement(ns + "PackageReference",
+                                    new XAttribute("Include", "Microsoft.SourceLink.GitHub"),
+                                    new XAttribute("Version", "1.0.0")));
+                });
+
+            CreateGitFiles(testAsset.Path, "https://github.com/org/repo");
+
+            var buildCommand = new BuildCommand(testAsset)
+            {
+                WorkingDirectory = testAsset.Path
+            };
+
+            var result = buildCommand.Execute().Should().Pass();
+
+            var intermediateDir = buildCommand.GetIntermediateDirectory();
+            intermediateDir.Should().HaveFile("SourceLinkTestApp.sourcelink.json");
+
+            // EmbedUntrackedSources is not set by default by SourceLink v1.0.0 package:
+            ValidatePdb(Path.Combine(intermediateDir.FullName, "SourceLinkTestApp.pdb"), expectedEmbeddedSources: false);
+        }
+    }
+}
diff --git a/src/Tests/Microsoft.NET.TestFramework/TestAssetsManager.cs b/src/Tests/Microsoft.NET.TestFramework/TestAssetsManager.cs
@@ -43,13 +43,13 @@ public TestAsset CopyTestAsset(
             [CallerFilePath] string callerFilePath = null,
             string identifier = "",
             string testAssetSubdirectory = "",
+            string testDestinationDirectory = null,
             bool allowCopyIfPresent = false)
         {
             var testProjectDirectory = GetAndValidateTestProjectDirectory(testProjectName, testAssetSubdirectory);
 
             var fileName = Path.GetFileNameWithoutExtension(callerFilePath);
-            var testDestinationDirectory =
-                GetTestDestinationDirectoryPath(testProjectName, callingMethod + "_" + fileName, identifier, allowCopyIfPresent);
+            testDestinationDirectory ??= GetTestDestinationDirectoryPath(testProjectName, callingMethod + "_" + fileName, identifier, allowCopyIfPresent);
             TestDestinationDirectories.Add(testDestinationDirectory);
 
             var testAsset = new TestAsset(testProjectDirectory, testDestinationDirectory, TestContext.Current.SdkVersion, Log);
