Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,24 @@ public static ToolConfiguration Deserialize(string pathToXml)
throw new ToolConfigurationException(CommonLocalizableStrings.ToolSettingsMoreThanOneCommand);
}

if (dotNetCliTool.Commands[0].Runner != "dotnet")
// if there is no runner, this could be an entirely different _kind_ of tool.
if (string.IsNullOrWhiteSpace(dotNetCliTool.Commands[0].Runner))
{
throw new ToolConfigurationException(
string.Format(
CommonLocalizableStrings.ToolSettingsUnsupportedRunner,
dotNetCliTool.Commands[0].Name,
dotNetCliTool.Commands[0].Runner));
if (warnings.Count != 0)
{
throw new ToolConfigurationException(warnings[0]);
}
}

if (dotNetCliTool.Commands[0].Runner != "dotnet")
{
throw new ToolConfigurationException(
string.Format(
CommonLocalizableStrings.ToolSettingsUnsupportedRunner,
dotNetCliTool.Commands[0].Name,
dotNetCliTool.Commands[0].Runner));
}

return new ToolConfiguration(
dotNetCliTool.Commands[0].Name,
dotNetCliTool.Commands[0].EntryPoint,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public CreateNewImageTests(ITestOutputHelper testOutput)
_testOutput = testOutput;
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public void CreateNewImage_Baseline()
{
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
Expand Down Expand Up @@ -69,7 +69,7 @@ private static ImageConfig GetImageConfigFromTask(CreateNewImage task) {
return new(task.GeneratedContainerConfiguration);
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public void ParseContainerProperties_EndToEnd()
{
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
Expand Down Expand Up @@ -132,7 +132,7 @@ public void ParseContainerProperties_EndToEnd()
/// <summary>
/// Creates a console app that outputs the environment variable added to the image.
/// </summary>
[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
{
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
Expand Down Expand Up @@ -215,7 +215,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
.And.HaveStdOut("Foo");
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
{
const string RootlessBase ="dotnet/rootlessbase";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public DockerRegistryTests(ITestOutputHelper testOutput)
_loggerFactory = new TestLoggerFactory(testOutput);
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public async Task GetFromRegistry()
{
var loggerFactory = new TestLoggerFactory(_testOutput);
Expand All @@ -37,7 +37,7 @@ public async Task GetFromRegistry()
Assert.NotNull(downloadedImage);
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public async Task WriteToPrivateBasicRegistry()
{
ILogger logger = _loggerFactory.CreateLogger(nameof(WriteToPrivateBasicRegistry));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ namespace Microsoft.NET.Build.Containers.IntegrationTests;

[CollectionDefinition("Docker tests")]
#pragma warning disable CA1711 // Identifiers should not have incorrect suffix
public class DockerTestsCollection : ICollectionFixture<DockerTestsFixture>
// TODO: skipped due to docker infra instability - need to use new ACR.
// See https://github.com/dotnet/sdk/issues/49300
public class DockerTestsCollection // : ICollectionFixture<DockerTestsFixture>
#pragma warning restore CA1711 // Identifiers should not have incorrect suffix
{
// This class has no code, and is never created. Its purpose is simply
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void Dispose()
_loggerFactory.Dispose();
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public async Task ApiEndToEndWithRegistryPushAndPull()
{
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithRegistryPushAndPull));
Expand Down Expand Up @@ -85,7 +85,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull()
}
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public async Task ApiEndToEndWithLocalLoad()
{
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithLocalLoad));
Expand Down Expand Up @@ -126,7 +126,7 @@ public async Task ApiEndToEndWithLocalLoad()
}
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public async Task ApiEndToEndWithArchiveWritingAndLoad()
{
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithArchiveWritingAndLoad));
Expand Down Expand Up @@ -210,7 +210,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
}


[DockerAvailableTheory()]
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49300")]
[InlineData("webapi", false)]
[InlineData("webapi", true)]
[InlineData("worker", false)]
Expand Down Expand Up @@ -386,7 +386,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage
privateNuGetAssets.Delete(true);
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public void EndToEnd_NoAPI_Console()
{
DirectoryInfo newProjectDir = new DirectoryInfo(Path.Combine(TestSettings.TestArtifactsDirectory, "CreateNewImageTest"));
Expand Down Expand Up @@ -473,7 +473,7 @@ public void EndToEnd_NoAPI_Console()
[DockerSupportsArchInlineData("linux/386", "linux-x86", "/app", Skip = "There's no apphost for linux-x86 so we can't execute self-contained, and there's no .NET runtime base image for linux-x86 so we can't execute framework-dependent.")]
[DockerSupportsArchInlineData("windows/amd64", "win-x64", "C:\\app")]
[DockerSupportsArchInlineData("linux/amd64", "linux-x64", "/app")]
[DockerAvailableTheory]
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49300")]
public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform, string rid, string workingDir)
{
ILogger logger = _loggerFactory.CreateLogger(nameof(CanPackageForAllSupportedContainerRIDs));
Expand Down
Loading