Skip to content

Commit 919385e

Browse files
committed
address ContainerBuilder visibility
1 parent ad133d5 commit 919385e

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/Containers/Microsoft.NET.Build.Containers/ContainerBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
namespace Microsoft.NET.Build.Containers;
88

9-
public static class ContainerBuilder
9+
internal static class ContainerBuilder
1010
{
11-
public static async Task<int> ContainerizeAsync(
11+
internal static async Task<int> ContainerizeAsync(
1212
DirectoryInfo publishDirectory,
1313
string workingDir,
1414
string baseRegistry,

src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ Microsoft.NET.Build.Containers.Tasks.ComputeDotnetBaseImageAndTag.TargetRuntimeI
1313
Microsoft.NET.Build.Containers.Tasks.ComputeDotnetBaseImageAndTag.TargetRuntimeIdentifier.set -> void
1414
Microsoft.NET.Build.Containers.Tasks.ComputeDotnetBaseImageAndTag.UsesInvariantGlobalization.get -> bool
1515
Microsoft.NET.Build.Containers.Tasks.ComputeDotnetBaseImageAndTag.UsesInvariantGlobalization.set -> void
16-
static Microsoft.NET.Build.Containers.ContainerBuilder.ContainerizeAsync(System.IO.DirectoryInfo! publishDirectory, string! workingDir, string! baseRegistry, string! baseImageName, string! baseImageTag, string![]! entrypoint, string![]! entrypointArgs, string![]! defaultArgs, string![]! appCommand, string![]! appCommandArgs, string! appCommandInstruction, string! imageName, string![]! imageTags, string? outputRegistry, System.Collections.Generic.Dictionary<string!, string!>! labels, Microsoft.NET.Build.Containers.Port[]? exposedPorts, System.Collections.Generic.Dictionary<string!, string!>! envVars, string! containerRuntimeIdentifier, string! ridGraphPath, string! localRegistry, string? containerUser, string? archiveOutputPath, bool generateLabels, bool generateDigestLabel, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<int>!
1716
static readonly Microsoft.NET.Build.Containers.Constants.Version -> string!
18-
Microsoft.NET.Build.Containers.ContainerBuilder
1917
Microsoft.NET.Build.Containers.ContainerHelpers
2018
Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError
2119
Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortNumber = 1 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError

src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,8 @@ private async Task<ImageBuilder> PickBestImageFromManifestListAsync(
270270
using HttpResponseMessage manifestResponse = await _registryAPI.Manifest.GetAsync(repositoryName, matchingManifest.digest, cancellationToken).ConfigureAwait(false);
271271

272272
cancellationToken.ThrowIfCancellationRequested();
273-
var manifest = await manifestResponse.Content.ReadAsJsonAsync<ManifestV2>(cancellationToken: cancellationToken).ConfigureAwait(false);
273+
var manifest = await manifestResponse.Content.ReadFromJsonAsync<ManifestV2>(cancellationToken: cancellationToken).ConfigureAwait(false);
274+
if (manifest is null) throw new BaseImageNotFoundException(runtimeIdentifier, repositoryName, reference, ridManifestDict.Keys);
274275
manifest.KnownDigest = matchingManifest.digest;
275276
return await ReadSingleImageAsync(
276277
repositoryName,

0 commit comments

Comments
 (0)