Skip to content

Commit 96cc60f

Browse files
authored
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#50847)
2 parents cf2c77b + aadebc5 commit 96cc60f

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535

3636
<!-- (Don't include these for 9.0) Allow 8.0.2xx and higher to use any version of these packages since source build
3737
is only applicable to 8.0.1xx. -->
38+
<UsagePattern IdentityGlob="Microsoft.DotNet.Arcade.Sdk/*8.0.0*" />
3839
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/*8.0.0*" />
3940
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/8.0.*" />
41+
<UsagePattern IdentityGlob="Microsoft.DotNet.SourceBuild.Tasks/*8.0.0*" />
4042
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Abstractions/8.0.*" />
4143
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core/8.0.*" />
4244
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core.Contracts/8.0.*" />

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs

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

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

72-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
72+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
7373
public void ParseContainerProperties_EndToEnd()
7474
{
7575
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -132,7 +132,8 @@ public void ParseContainerProperties_EndToEnd()
132132
/// <summary>
133133
/// Creates a console app that outputs the environment variable added to the image.
134134
/// </summary>
135-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
135+
136+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
136137
public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
137138
{
138139
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -215,7 +216,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
215216
.And.HaveStdOut("Foo");
216217
}
217218

218-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
219+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
219220
public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
220221
{
221222
const string RootlessBase ="dotnet/rootlessbase";

src/Tests/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(Skip = "https://github.com/dotnet/sdk/issues/49502")]
20+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
2121
public async Task GetFromRegistry()
2222
{
2323
var loggerFactory = new TestLoggerFactory(_testOutput);

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerTestsCollection.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ namespace Microsoft.NET.Build.Containers.IntegrationTests;
55

66
[CollectionDefinition("Docker tests")]
77
#pragma warning disable CA1711 // Identifiers should not have incorrect suffix
8-
public class DockerTestsCollection : ICollectionFixture<DockerTestsFixture>
8+
// TODO: skipped due to docker infra instability - need to use new ACR.
9+
// See https://github.com/dotnet/sdk/issues/49300
10+
public class DockerTestsCollection // : ICollectionFixture<DockerTestsFixture>
911
#pragma warning restore CA1711 // Identifiers should not have incorrect suffix
1012
{
1113
// This class has no code, and is never created. Its purpose is simply

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,7 @@ public void EndToEndMultiArch_Labels()
13791379
[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.")]
13801380
[DockerSupportsArchInlineData("windows/amd64", "win-x64", "C:\\app")]
13811381
[DockerSupportsArchInlineData("linux/amd64", "linux-x64", "/app")]
1382-
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
1382+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49300")]
13831383
public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform, string rid, string workingDir)
13841384
{
13851385
ILogger logger = _loggerFactory.CreateLogger(nameof(CanPackageForAllSupportedContainerRIDs));

0 commit comments

Comments
 (0)