Skip to content

Commit bb1c9b5

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-dc0181ec-bf10-495f-ab74-3712bcdc1e03
2 parents 3ac470c + d500760 commit bb1c9b5

File tree

5 files changed

+27
-23
lines changed

5 files changed

+27
-23
lines changed

‎test/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public CreateImageIndexTests(ITestOutputHelper testOutput)
2222
_testOutput = testOutput;
2323
}
2424

25-
[DockerAvailableFact]
25+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
2626
public async Task CreateImageIndex_Baseline()
2727
{
2828
DirectoryInfo newProjectDir = CreateNewProject();

‎test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public CreateNewImageTests(ITestOutputHelper testOutput)
2020
_testOutput = testOutput;
2121
}
2222

23-
[DockerAvailableFact]
23+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
2424
public void CreateNewImage_Baseline()
2525
{
2626
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -70,7 +70,7 @@ private static ImageConfig GetImageConfigFromTask(CreateNewImage task)
7070
return new(task.GeneratedContainerConfiguration);
7171
}
7272

73-
[DockerAvailableFact]
73+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
7474
public void ParseContainerProperties_EndToEnd()
7575
{
7676
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -133,7 +133,7 @@ public void ParseContainerProperties_EndToEnd()
133133
/// <summary>
134134
/// Creates a console app that outputs the environment variable added to the image.
135135
/// </summary>
136-
[DockerAvailableFact()]
136+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
137137
public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
138138
{
139139
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -216,7 +216,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
216216
.And.HaveStdOut("Foo");
217217
}
218218

219-
[DockerAvailableFact]
219+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
220220
public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
221221
{
222222
const string RootlessBase = "dotnet/rootlessbase";
@@ -297,7 +297,7 @@ public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
297297
}
298298

299299

300-
[DockerAvailableFact]
300+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
301301
public void CanOverrideContainerImageFormat()
302302
{
303303
DirectoryInfo newProjectDir = new(GetTestDirectoryName());

‎test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public DockerRegistryTests(ITestOutputHelper testOutput)
1717
_loggerFactory = new TestLoggerFactory(testOutput);
1818
}
1919

20-
[DockerAvailableFact]
20+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
2121
public async Task GetFromRegistry()
2222
{
2323
var loggerFactory = new TestLoggerFactory(_testOutput);

‎test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void Dispose()
4242
_loggerFactory.Dispose();
4343
}
4444

45-
[DockerAvailableFact()]
45+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
4646
public async Task ApiEndToEndWithRegistryPushAndPull()
4747
{
4848
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithRegistryPushAndPull));
@@ -89,7 +89,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull()
8989
}
9090
}
9191

92-
[DockerAvailableFact()]
92+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
9393
public async Task ApiEndToEndWithLocalLoad()
9494
{
9595
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithLocalLoad));
@@ -130,7 +130,7 @@ public async Task ApiEndToEndWithLocalLoad()
130130
}
131131
}
132132

133-
[DockerAvailableFact()]
133+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
134134
public async Task ApiEndToEndWithArchiveWritingAndLoad()
135135
{
136136
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithArchiveWritingAndLoad));
@@ -180,7 +180,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad()
180180
}
181181
}
182182

183-
[DockerAvailableFact]
183+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
184184
public async Task TarballsHaveCorrectStructure()
185185
{
186186
var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory,
@@ -351,7 +351,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
351351
return publishDirectory;
352352
}
353353

354-
[DockerAvailableFact()]
354+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
355355
public async Task EndToEnd_MultiProjectSolution()
356356
{
357357
ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution));
@@ -437,7 +437,7 @@ public async Task EndToEnd_MultiProjectSolution()
437437
/// It's safe to load the target for libraries in a multi-targeted context because libraries don't have EnableSdkContainerSupport
438438
/// enabled by default, so the target will be skipped.
439439
/// </summary>
440-
[DockerAvailableFact]
440+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
441441
public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library()
442442
{
443443
ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library));
@@ -505,7 +505,7 @@ public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library()
505505
commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'");
506506
}
507507

508-
[DockerAvailableTheory()]
508+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
509509
[InlineData("webapi", false)]
510510
[InlineData("webapi", true)]
511511
[InlineData("worker", false)]
@@ -682,7 +682,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage
682682
privateNuGetAssets.Delete(true);
683683
}
684684

685-
[DockerAvailableTheory()]
685+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
686686
[InlineData(DockerRegistryManager.FullyQualifiedBaseImageAspNet)]
687687
[InlineData(DockerRegistryManager.FullyQualifiedBaseImageAspNetDigest)]
688688
public void EndToEnd_NoAPI_Console(string baseImage)
@@ -764,7 +764,7 @@ public void EndToEnd_NoAPI_Console(string baseImage)
764764
privateNuGetAssets.Delete(true);
765765
}
766766

767-
[DockerAvailableFact]
767+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
768768
public void EndToEnd_SingleArch_NoRid()
769769
{
770770
// Create a new console project
@@ -796,9 +796,10 @@ public void EndToEnd_SingleArch_NoRid()
796796
processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
797797
}
798798

799+
/**
799800
[InlineData("endtoendmultiarch-localregisty")]
800801
[InlineData("myteam/endtoendmultiarch-localregisty")]
801-
[DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)]
802+
[DockerIsAvailableAndSupportsArchTheory(Skip = "https://github.com/dotnet/sdk/issues/49502", "linux/arm64", checkContainerdStoreAvailability: true)]
802803
public void EndToEndMultiArch_LocalRegistry(string imageName)
803804
{
804805
string tag = "1.0";
@@ -853,8 +854,9 @@ public void EndToEndMultiArch_LocalRegistry(string imageName)
853854
// Cleanup
854855
newProjectDir.Delete(true);
855856
}
857+
*/
856858

857-
[DockerAvailableFact]
859+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
858860
public void MultiArchStillAllowsSingleRID()
859861
{
860862
string imageName = NewImageName();
@@ -905,7 +907,7 @@ public void MultiArchStillAllowsSingleRID()
905907
newProjectDir.Delete(true);
906908
}
907909

908-
[DockerAvailableFact]
910+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
909911
public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
910912
{
911913
string imageName = NewImageName();
@@ -977,9 +979,10 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin
977979
private string GetPublishArtifactsPath(string projectDir, string rid, string configuration = "Debug")
978980
=> Path.Combine(projectDir, "bin", configuration, ToolsetInfo.CurrentTargetFramework, rid, "publish");
979981

982+
/**
980983
[InlineData("endtoendmultiarch-archivepublishing")]
981984
[InlineData("myteam/endtoendmultiarch-archivepublishing")]
982-
[DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)]
985+
[DockerIsAvailableAndSupportsArchTheory(Skip = "https://github.com/dotnet/sdk/issues/49502", "linux/arm64", checkContainerdStoreAvailability: true)]
983986
public void EndToEndMultiArch_ArchivePublishing(string imageName)
984987
{
985988
string tag = "1.0";
@@ -1045,6 +1048,7 @@ public void EndToEndMultiArch_ArchivePublishing(string imageName)
10451048
// Cleanup
10461049
newProjectDir.Delete(true);
10471050
}
1051+
*/
10481052

10491053
[DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
10501054
public void EndToEndMultiArch_RemoteRegistry()
@@ -1367,7 +1371,7 @@ public void EndToEndMultiArch_Labels()
13671371
[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.")]
13681372
[DockerSupportsArchInlineData("windows/amd64", "win-x64", "C:\\app")]
13691373
[DockerSupportsArchInlineData("linux/amd64", "linux-x64", "/app")]
1370-
[DockerAvailableTheory()]
1374+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
13711375
public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform, string rid, string workingDir)
13721376
{
13731377
ILogger logger = _loggerFactory.CreateLogger(nameof(CanPackageForAllSupportedContainerRIDs));
@@ -1418,7 +1422,7 @@ static string[] DecideEntrypoint(string rid, string appName, string workingDir)
14181422
}
14191423
}
14201424

1421-
[DockerAvailableFact]
1425+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
14221426
public async void CheckDownloadErrorMessageWhenSourceRepositoryThrows()
14231427
{
14241428
var loggerFactory = new TestLoggerFactory(_testOutput);

‎test/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task Can_detect_when_no_daemon_is_running()
4141
}
4242
}
4343

44-
[DockerAvailableFact]
44+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
4545
public async Task Can_detect_when_daemon_is_running()
4646
{
4747
var available = await new DockerCli(_loggerFactory).IsAvailableAsync(default).ConfigureAwait(false);

0 commit comments

Comments
 (0)