Use RestoreAdditionalProjectSources for SB tests

Author: mthalman

eng/pipelines/templates/stages/vmr-verticals.yml

@@ -1030,8 +1030,7 @@ stages:
             extraProperties: >
               /p:DotNetSourceOnlyTestOnly=true
               /p:ExtraRestoreSourcePath=$(Pipeline.Workspace)/msft-pkgs
-              /p:SourceBuildTestsCustomSourceBuiltPackagesPath=$(Pipeline.Workspace)/msft-pkgs
-              /p:SourceBuildTestsCustomSourceBuiltPackagesPathIsInclusive=true
+              /p:RestoreAdditionalProjectSources=$(Pipeline.Workspace)/msft-pkgs
             dependsOn:
             - AzureLinux_x64_Cross_x64
             - Browser_Shortstack_wasm

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/Config.cs

@@ -20,13 +20,13 @@ internal static class Config
     public static string LogsDirectory => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(LogsDirectory))! ?? throw new InvalidOperationException("Logs directory must be specified");
 
     public static string? CustomPackagesPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(CustomPackagesPath))!;
-    public static bool CustomPackagesPathIsInclusive => bool.TryParse((string)AppContext.GetData(ConfigSwitchPrefix + nameof(CustomPackagesPathIsInclusive))!, out bool customPackagesPathIsInclusive) && customPackagesPathIsInclusive;
     public static bool ExcludeOmniSharpTests => bool.TryParse((string)AppContext.GetData(ConfigSwitchPrefix + nameof(ExcludeOmniSharpTests))!, out bool excludeOmniSharpTests) && excludeOmniSharpTests;
     public static string? LicenseScanPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(LicenseScanPath))!;
     public static string? MsftSdkTarballPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(MsftSdkTarballPath))!;
     public static string? PoisonReportPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(PoisonReportPath))!;
     public static string? SdkTarballPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(SdkTarballPath))!;
     public static string? SourceBuiltArtifactsPath => (string)AppContext.GetData(ConfigSwitchPrefix + nameof(SourceBuiltArtifactsPath))!;
+    public static string? RestoreAdditionalProjectSources => (string?)AppContext.GetData(ConfigSwitchPrefix + nameof(RestoreAdditionalProjectSources));
 
     // Indicates whether the tests are being run in the context of a CI pipeline
     public static bool RunningInCI => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_CI")) ||

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/DotNetHelper.cs

@@ -49,7 +49,7 @@ public DotNetHelper(ITestOutputHelper outputHelper)
     private static void InitNugetConfig()
     {
         bool useCustomPackages = !string.IsNullOrEmpty(Config.CustomPackagesPath);
-        string nugetConfigPrefix = useCustomPackages && !Config.CustomPackagesPathIsInclusive ? "custom" : "default";
+        string nugetConfigPrefix = useCustomPackages ? "custom" : "default";
         string nugetConfigPath = Path.Combine(ProjectsDirectory, "NuGet.Config");
         File.Copy(
             Path.Combine(BaselineHelper.GetAssetsDirectory(), $"{nugetConfigPrefix}.NuGet.Config"),
@@ -68,13 +68,6 @@ private static void InitNugetConfig()
                 .Replace("CUSTOM_PACKAGE_FEED", Config.CustomPackagesPath);
             File.WriteAllText(nugetConfigPath, nugetConfig);
         }
-        else
-        {
-            // Clear out the unused custom package feed
-             string nugetConfig = File.ReadAllText(nugetConfigPath)
-                .Replace("<add key=\"custom-packages\" value=\"CUSTOM_PACKAGE_FEED\" />", "");
-            File.WriteAllText(nugetConfigPath, nugetConfig);
-        }
     }
 
     public void ExecuteCmd(string args, string? workingDirectory = null, Action<Process>? processConfigCallback = null,
@@ -117,8 +110,11 @@ public static void ConfigureProcess(Process process, string? workingDirectory)
         process.StartInfo.EnvironmentVariables["ImportDirectoryPackagesProps"] = "false";
     }
 
-    public void ExecuteBuild(string projectName) =>
-        ExecuteCmd($"build {GetBinLogOption(projectName, "build")}", GetProjectDirectory(projectName));
+    public void ExecuteBuild(string projectName)
+    {
+        string options = $"/p:RestoreAdditionalProjectSources={Config.RestoreAdditionalProjectSources}";
+        ExecuteCmd($"build {options} {GetBinLogOption(projectName, "build")}", GetProjectDirectory(projectName));
+    }
 
     /// <summary>
     /// Create a new .NET project and return the path to the created project folder.
@@ -143,12 +139,12 @@ public string ExecuteNew(string projectType, string name, string? language = nul
 
     public void ExecutePublish(string projectName, DotNetTemplate template, bool? selfContained = null, string? rid = null, bool trimmed = false, bool readyToRun = false)
     {
-        string options = string.Empty;
+        string options = $"/p:RestoreAdditionalProjectSources={Config.RestoreAdditionalProjectSources}";
         string binlogDifferentiator = string.Empty;
 
         if (selfContained.HasValue)
         {
-            options += $"--self-contained {selfContained.Value.ToString().ToLowerInvariant()}";
+            options += $" --self-contained {selfContained.Value.ToString().ToLowerInvariant()}";
             if (selfContained.Value)
             {
                 binlogDifferentiator += "self-contained";

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/Microsoft.DotNet.SourceBuild.Tests.csproj

@@ -62,9 +62,6 @@
       <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).CustomPackagesPath">
         <Value>$(SourceBuildTestsCustomSourceBuiltPackagesPath)</Value>
       </RuntimeHostConfigurationOption>
-      <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).CustomPackagesPathIsInclusive">
-        <Value>$(SourceBuildTestsCustomSourceBuiltPackagesPathIsInclusive)</Value>
-      </RuntimeHostConfigurationOption>
       <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).ExcludeOmniSharpTests">
         <Value>$(SourceBuildTestsExcludeOmniSharpTests)</Value>
       </RuntimeHostConfigurationOption>
@@ -84,6 +81,9 @@
       <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).SourceBuiltArtifactsPath">
         <Value>$(SourceBuiltArtifactsPath)</Value>
       </RuntimeHostConfigurationOption>
+      <RuntimeHostConfigurationOption Include="$(MSBuildProjectName).RestoreAdditionalProjectSources">
+        <Value>$(RestoreAdditionalProjectSources)</Value>
+      </RuntimeHostConfigurationOption>
     </ItemGroup>
   </Target>
 

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/default.NuGet.Config

@@ -8,6 +8,5 @@
     <add key="darc-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/nuget/v3/index.json" />
     <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
     <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
-    <add key="custom-packages" value="CUSTOM_PACKAGE_FEED" />
   </packageSources>
 </configuration>