Fix tests

dotnet · Aug 23, 2024 · 017efb9 · 017efb9
1 parent d265037
commit 017efb9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs
@@ -678,6 +678,8 @@ public void ILLink_shows_single_warning_for_packagereferences_only(string target
                 .CopyTestAsset(testAssetName, identifier: targetFramework)
                 .WithSource();
 
+            NuGetConfigWriter.Write(testAsset.Path, TestContext.Current.TestPackages);
+
             var publishCommand = new PublishCommand(testAsset, "App");
             publishCommand.Execute($"/p:RuntimeIdentifier={rid}")
                 .Should().Pass()
@@ -701,6 +703,8 @@ public void ILLink_accepts_option_to_show_all_warnings(string targetFramework)
                 .CopyTestAsset(testAssetName, identifier: targetFramework)
                 .WithSource();
 
+            NuGetConfigWriter.Write(testAsset.Path, TestContext.Current.TestPackages);
+
             var publishCommand = new PublishCommand(testAsset, "App");
             publishCommand.Execute($"/p:RuntimeIdentifier={rid}", "/p:TrimmerSingleWarn=false")
                 .Should().Pass()
@@ -727,6 +731,8 @@ public void ILLink_can_show_single_warning_per_assembly(string targetFramework)
                     SetMetadata(project, "App", "TrimmerSingleWarn", "true");
                 });
 
+            NuGetConfigWriter.Write(testAsset.Path, TestContext.Current.TestPackages);
+
             var publishCommand = new PublishCommand(testAsset, "App");
             publishCommand.Execute($"/p:RuntimeIdentifier={rid}", "/p:TrimmerSingleWarn=false")
                 .Should().Pass()

diff --git a/test/TestAssets/TestProjects/TrimmedAppWithReferences/App/App.csproj b/test/TestAssets/TestProjects/TrimmedAppWithReferences/App/App.csproj
@@ -9,10 +9,9 @@
   </PropertyGroup>
 
   <Target Name="BuildLocalNuget" BeforeTargets="Restore">
-    <MSBuild
-      Projects="../PackageReference/PackageReference.csproj"
-      Targets="Restore;Pack"
-    />
+    <Exec
+      Command="&quot;$(MSBuildBinPath)\msbuild&quot; ..\PackageReference\PackageReference.csproj /t:Pack /restore"
+      WorkingDirectory="$(MSBuildProjectDirectory)" />
   </Target>
 
   <ItemGroup>