Skip to content

Commit aeb099c

Browse files
committed
fix the things
1 parent da69e11 commit aeb099c

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Microsoft.NET.Build.Containers/CreateNewImage.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ private void SafeLog(string message, params object[] formatParams) {
8888

8989
public override bool Execute()
9090
{
91-
System.Diagnostics.Debugger.Launch();
9291
if (!Directory.Exists(PublishDirectory))
9392
{
9493
Log.LogError("{0} '{1}' does not exist", nameof(PublishDirectory), PublishDirectory);

Test.Microsoft.NET.Build.Containers.Filesystem/CreateNewImageTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ namespace Test.Microsoft.NET.Build.Containers.Tasks;
99
[TestClass]
1010
public class CreateNewImageTests
1111
{
12+
public static string RuntimeGraphFilePath() =>
13+
// TODO: The DOTNET_ROOT comes from the test host, but we have no idea what the SDK version is.
14+
Path.Combine(Environment.GetEnvironmentVariable("DOTNET_ROOT"), "sdk", "7.0.100", "RuntimeIdentifierGraph.json");
15+
1216
[TestMethod]
1317
public void CreateNewImage_Baseline()
1418
{
@@ -53,6 +57,7 @@ public void CreateNewImage_Baseline()
5357
task.WorkingDirectory = "app/";
5458
task.ContainerRuntimeIdentifier = "linux-arm64";
5559
task.Entrypoint = new TaskItem[] { new("dotnet"), new("build") };
60+
task.RuntimeIdentifierGraphPath = RuntimeGraphFilePath();
5661

5762
Assert.IsTrue(task.Execute());
5863
newProjectDir.Delete(true);
@@ -116,6 +121,7 @@ public void ParseContainerProperties_EndToEnd()
116121
cni.Entrypoint = new TaskItem[] { new("ParseContainerProperties_EndToEnd") };
117122
cni.ImageTags = pcp.NewContainerTags;
118123
cni.ContainerRuntimeIdentifier = "linux-x64";
124+
cni.RuntimeIdentifierGraphPath = RuntimeGraphFilePath();
119125

120126
Assert.IsTrue(cni.Execute());
121127
newProjectDir.Delete(true);
@@ -193,6 +199,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
193199
cni.ImageTags = pcp.NewContainerTags;
194200
cni.ContainerEnvironmentVariables = pcp.NewContainerEnvironmentVariables;
195201
cni.ContainerRuntimeIdentifier = "linux-x64";
202+
cni.RuntimeIdentifierGraphPath = RuntimeGraphFilePath();
196203

197204
Assert.IsTrue(cni.Execute());
198205

0 commit comments

Comments
 (0)