diff --git a/NuGet.config b/NuGet.config index 622fc10f6793..5ed304805365 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,8 +30,6 @@ - - diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 06b44de78709..28e20237e5b5 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -306,7 +306,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs index c742c2bbc373..774ce35156c5 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs @@ -20,7 +20,7 @@ public CreateNewImageTests(ITestOutputHelper testOutput) _testOutput = testOutput; } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public void CreateNewImage_Baseline() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); @@ -70,7 +70,7 @@ private static ImageConfig GetImageConfigFromTask(CreateNewImage task) return new(task.GeneratedContainerConfiguration); } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public void ParseContainerProperties_EndToEnd() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); @@ -133,7 +133,8 @@ public void ParseContainerProperties_EndToEnd() /// /// Creates a console app that outputs the environment variable added to the image. /// - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() { DirectoryInfo newProjectDir = new(GetTestDirectoryName()); @@ -218,7 +219,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation() .And.HaveStdOut("Foo"); } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage() { const string RootlessBase = "dotnet/rootlessbase"; diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs index ce0c46a50a87..24bfe1f73a89 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs @@ -17,7 +17,7 @@ public DockerRegistryTests(ITestOutputHelper testOutput) _loggerFactory = new TestLoggerFactory(testOutput); } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")] public async Task GetFromRegistry() { var loggerFactory = new TestLoggerFactory(_testOutput); diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerTestsCollection.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerTestsCollection.cs index 9b3a6e25327c..90d188183a78 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerTestsCollection.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/DockerTestsCollection.cs @@ -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 +// TODO: skipped due to docker infra instability - need to use new ACR. +// See https://github.com/dotnet/sdk/issues/49300 +public class DockerTestsCollection // : ICollectionFixture #pragma warning restore CA1711 // Identifiers should not have incorrect suffix { // This class has no code, and is never created. Its purpose is simply diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index b8d4832e53b8..a9c05a3b247b 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -1385,7 +1385,7 @@ public void EndToEndMultiArch_Labels() [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(Skip = "https://github.com/dotnet/sdk/issues/49502")] + [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)); diff --git a/test/TestAssets/Directory.Build.props b/test/TestAssets/Directory.Build.props index 853d2a1161b8..56061cde06fc 100644 --- a/test/TestAssets/Directory.Build.props +++ b/test/TestAssets/Directory.Build.props @@ -5,6 +5,7 @@ false false $(DefaultItemExcludes);**/*.tmp + false