Skip to content

Commit bc0c819

Browse files
author
Mirroring
committed
Merge commit 'd1c4c2a57795e2554dedfb686968fe92a8e3b3e1'
2 parents 9a79ea5 + d1c4c2a commit bc0c819

File tree

12 files changed

+192
-130
lines changed

12 files changed

+192
-130
lines changed

‎.github/workflows/pr-analysis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: PR Analysis
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, labeled, unlabeled]
5+
permissions:
6+
contents: read
7+
pull-requests: read
8+
jobs:
9+
allowed-labels:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Return error if branch is in lockdown or 'do not merge' label is present
13+
run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1
14+
if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }}

‎NuGet.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<add key="darc-pub-dotnet-emsdk-dad5528" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e/nuget/v3/index.json" />
3131
<!-- End: Package sources from dotnet-emsdk -->
3232
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
33-
<add key="darc-pub-DotNet-msbuild-Trusted-1c20264" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-1c202646/nuget/v3/index.json" />
33+
<add key="darc-pub-DotNet-msbuild-Trusted-d87bc64" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d87bc64f/nuget/v3/index.json" />
3434
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3535
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3636
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -39,6 +39,10 @@
3939
<!-- End: Package sources from dotnet-runtime -->
4040
<!-- Begin: Package sources from dotnet-templating -->
4141
<add key="darc-pub-dotnet-templating-a2862fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2862fdc/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-a2862fd-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2862fdc-2/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-templating-a2862fd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a2862fdc-1/nuget/v3/index.json" />
44+
<add key="darc-pub-dotnet-templating-978233e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-978233e8/nuget/v3/index.json" />
45+
<add key="darc-pub-dotnet-templating-38b262d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-38b262d8/nuget/v3/index.json" />
4246
<!-- End: Package sources from dotnet-templating -->
4347
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4448
<add key="darc-int-dotnet-windowsdesktop-1c33258" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1c33258c/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 79 additions & 79 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>2</VersionSDKMinor>
9-
<VersionFeature>01</VersionFeature>
9+
<VersionFeature>03</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -34,7 +34,7 @@
3434
<VersionFeature50>17</VersionFeature50>
3535
<VersionFeature60>36</VersionFeature60>
3636
<VersionFeature70>20</VersionFeature70>
37-
<VersionFeature80>$([MSBuild]::Add($(VersionFeature), 13))</VersionFeature80>
37+
<VersionFeature80>$([MSBuild]::Add($(VersionFeature), 12))</VersionFeature80>
3838
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
3939
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4040
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
@@ -135,18 +135,18 @@
135135
</PropertyGroup>
136136
<PropertyGroup>
137137
<!-- Dependencies from https://github.com/nuget/nuget.client -->
138-
<NuGetBuildTasksPackageVersion>6.13.1-rc.1</NuGetBuildTasksPackageVersion>
139-
<NuGetBuildTasksConsolePackageVersion>6.13.1-rc.1</NuGetBuildTasksConsolePackageVersion>
140-
<NuGetLocalizationPackageVersion>6.13.1-rc.1</NuGetLocalizationPackageVersion>
141-
<NuGetBuildTasksPackPackageVersion>6.13.1-rc.1</NuGetBuildTasksPackPackageVersion>
142-
<NuGetCommandLineXPlatPackageVersion>6.13.1-rc.1</NuGetCommandLineXPlatPackageVersion>
143-
<NuGetProjectModelPackageVersion>6.13.1-rc.1</NuGetProjectModelPackageVersion>
144-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.1-rc.1</MicrosoftBuildNuGetSdkResolverPackageVersion>
145-
<NuGetCommonPackageVersion>6.13.1-rc.1</NuGetCommonPackageVersion>
146-
<NuGetConfigurationPackageVersion>6.13.1-rc.1</NuGetConfigurationPackageVersion>
147-
<NuGetFrameworksPackageVersion>6.13.1-rc.1</NuGetFrameworksPackageVersion>
148-
<NuGetPackagingPackageVersion>6.13.1-rc.1</NuGetPackagingPackageVersion>
149-
<NuGetVersioningPackageVersion>6.13.1-rc.1</NuGetVersioningPackageVersion>
138+
<NuGetBuildTasksPackageVersion>6.13.2-rc.1</NuGetBuildTasksPackageVersion>
139+
<NuGetBuildTasksConsolePackageVersion>6.13.2-rc.1</NuGetBuildTasksConsolePackageVersion>
140+
<NuGetLocalizationPackageVersion>6.13.2-rc.1</NuGetLocalizationPackageVersion>
141+
<NuGetBuildTasksPackPackageVersion>6.13.2-rc.1</NuGetBuildTasksPackPackageVersion>
142+
<NuGetCommandLineXPlatPackageVersion>6.13.2-rc.1</NuGetCommandLineXPlatPackageVersion>
143+
<NuGetProjectModelPackageVersion>6.13.2-rc.1</NuGetProjectModelPackageVersion>
144+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.2-rc.1</MicrosoftBuildNuGetSdkResolverPackageVersion>
145+
<NuGetCommonPackageVersion>6.13.2-rc.1</NuGetCommonPackageVersion>
146+
<NuGetConfigurationPackageVersion>6.13.2-rc.1</NuGetConfigurationPackageVersion>
147+
<NuGetFrameworksPackageVersion>6.13.2-rc.1</NuGetFrameworksPackageVersion>
148+
<NuGetPackagingPackageVersion>6.13.2-rc.1</NuGetPackagingPackageVersion>
149+
<NuGetVersioningPackageVersion>6.13.2-rc.1</NuGetVersioningPackageVersion>
150150
</PropertyGroup>
151151
<PropertyGroup>
152152
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -156,8 +156,8 @@
156156
</PropertyGroup>
157157
<PropertyGroup>
158158
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
159-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25076.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
160-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.25076.2</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
159+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25123.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
160+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.25123.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
161161
</PropertyGroup>
162162
<PropertyGroup>
163163
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -178,38 +178,38 @@
178178
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
179179
180180
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
181-
<MicrosoftBuildVersion>17.13.13</MicrosoftBuildVersion>
182-
<MicrosoftBuildLocalizationVersion>17.13.13-preview-25112-07</MicrosoftBuildLocalizationVersion>
181+
<MicrosoftBuildVersion>17.13.19</MicrosoftBuildVersion>
182+
<MicrosoftBuildLocalizationVersion>17.13.19-preview-25128-01</MicrosoftBuildLocalizationVersion>
183183
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
184184
<MinimumVSVersion>17.12</MinimumVSVersion>
185185
</PropertyGroup>
186186
<PropertyGroup>
187187
<!-- Dependencies from https://github.com/dotnet/templating -->
188-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.201</MicrosoftTemplateEngineAbstractionsPackageVersion>
188+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.203</MicrosoftTemplateEngineAbstractionsPackageVersion>
189189
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
190190
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
191191
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
192192
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
193193
<!-- test dependencies -->
194-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.201-servicing.25112.5</MicrosoftTemplateEngineMocksPackageVersion>
194+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.203-servicing.25156.14</MicrosoftTemplateEngineMocksPackageVersion>
195195
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
196196
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
197197
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
198198
</PropertyGroup>
199199
<PropertyGroup>
200200
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
201-
<MicrosoftFSharpCompilerPackageVersion>13.9.201-beta.25070.3</MicrosoftFSharpCompilerPackageVersion>
201+
<MicrosoftFSharpCompilerPackageVersion>13.9.202-beta.25154.2</MicrosoftFSharpCompilerPackageVersion>
202202
</PropertyGroup>
203203
<PropertyGroup>
204204
<!-- Dependencies from https://github.com/dotnet/roslyn -->
205-
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25112.7</MicrosoftNetCompilersToolsetVersion>
206-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25112.7</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
207-
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25112.7</MicrosoftCodeAnalysisPackageVersion>
208-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25112.7</MicrosoftCodeAnalysisCSharpPackageVersion>
209-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25112.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
210-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25112.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
211-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25112.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
212-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25112.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
205+
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25155.17</MicrosoftNetCompilersToolsetVersion>
206+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25155.17</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
207+
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisPackageVersion>
208+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisCSharpPackageVersion>
209+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
210+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
211+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
212+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
213213
</PropertyGroup>
214214
<PropertyGroup>
215215
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -229,9 +229,9 @@
229229
</PropertyGroup>
230230
<PropertyGroup>
231231
<!-- Dependencies from https://github.com/dotnet/razor -->
232-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25078.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
233-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25078.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
234-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25078.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
232+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25123.6</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
233+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25123.6</MicrosoftCodeAnalysisRazorToolingInternalVersion>
234+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25123.6</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/dotnet/wpf -->

‎src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ internal class NuGetPackageDownloader : INuGetPackageDownloader
3838
private readonly Dictionary<PackageSource, SourceRepository> _sourceRepositories;
3939
private readonly bool _shouldUsePackageSourceMapping;
4040

41+
/// <summary>
42+
/// If true, the package downloader will verify the signatures of the packages it downloads.
43+
/// Temporarily disabled for macOS and Linux.
44+
/// </summary>
4145
private readonly bool _verifySignatures;
4246
private readonly VerbosityOptions _verbosityOptions;
4347
private readonly string _currentWorkingDirectory;
@@ -65,7 +69,9 @@ public NuGetPackageDownloader(
6569
_restoreActionConfig = restoreActionConfig ?? new RestoreActionConfig();
6670
_retryTimer = timer;
6771
_sourceRepositories = new();
68-
_verifySignatures = verifySignatures;
72+
// If windows or env variable is set, verify signatures
73+
_verifySignatures = verifySignatures && (OperatingSystem.IsWindows() ? true
74+
: bool.TryParse(Environment.GetEnvironmentVariable(NuGetSignatureVerificationEnabler.DotNetNuGetSignatureVerification), out var shouldVerifySignature) ? shouldVerifySignature : OperatingSystem.IsLinux());
6975

7076
_cacheSettings = new SourceCacheContext
7177
{
@@ -130,8 +136,17 @@ public async Task<string> DownloadPackageAsync(PackageId packageId,
130136
packageVersion.ToNormalizedString()));
131137
}
132138

133-
await VerifySigning(nupkgPath, repository);
134-
139+
// Delete file if verification fails
140+
try
141+
{
142+
await VerifySigning(nupkgPath, repository);
143+
}
144+
catch (NuGetPackageInstallerException)
145+
{
146+
File.Delete(nupkgPath);
147+
throw;
148+
}
149+
135150
return nupkgPath;
136151
}
137152

‎src/Cli/dotnet/ReleasePropertyProjectLocator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public IEnumerable<string> GetCustomDefaultConfigurationValueIfSpecified()
176176
Parallel.ForEach(sln.SolutionProjects.AsEnumerable(), (project, state) =>
177177
{
178178
#pragma warning disable CS8604 // Possible null reference argument.
179-
string projectFullPath = Path.Combine(Path.GetDirectoryName(slnFullPath), project.FilePath);
179+
string projectFullPath = Path.GetFullPath(project.FilePath, Path.GetDirectoryName(slnFullPath));
180180
#pragma warning restore CS8604 // Possible null reference argument.
181181
if (IsUnanalyzableProjectInSolution(project, projectFullPath))
182182
return;
@@ -220,7 +220,7 @@ public IEnumerable<string> GetCustomDefaultConfigurationValueIfSpecified()
220220
foreach (var project in sln.SolutionProjects.AsEnumerable())
221221
{
222222
#pragma warning disable CS8604 // Possible null reference argument.
223-
string projectFullPath = Path.Combine(Path.GetDirectoryName(slnPath), project.FilePath);
223+
string projectFullPath = Path.GetFullPath(project.FilePath, Path.GetDirectoryName(slnPath));
224224
#pragma warning restore CS8604 // Possible null reference argument.
225225
if (IsUnanalyzableProjectInSolution(project, projectFullPath))
226226
continue;

‎src/Cli/dotnet/commands/dotnet-workload/restore/WorkloadRestoreCommand.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,11 @@ internal static List<string> DiscoverAllProjects(string currentDirectory,
136136
.Select(Path.GetFullPath).ToList();
137137
}
138138

139-
foreach (string file in slnFiles)
139+
foreach (string solutionFilePath in slnFiles)
140140
{
141-
var solutionFile = SlnFileFactory.CreateFromFileOrDirectory(file);
142-
projectFiles.AddRange(solutionFile.SolutionProjects.Select(p => p.FilePath));
141+
var solutionFile = SlnFileFactory.CreateFromFileOrDirectory(solutionFilePath);
142+
projectFiles.AddRange(solutionFile.SolutionProjects.Select(
143+
p => Path.GetFullPath(p.FilePath, Path.GetDirectoryName(solutionFilePath))));
143144
}
144145

145146
if (projectFiles.Count == 0)

‎src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,24 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
143143
}
144144
}
145145

146+
// forcibly change the media type if required
147+
if (ImageFormat is not null)
148+
{
149+
if (Enum.TryParse<KnownImageFormats>(ImageFormat, out var imageFormat))
150+
{
151+
imageBuilder.ManifestMediaType = imageFormat switch
152+
{
153+
KnownImageFormats.Docker => SchemaTypes.DockerManifestV2,
154+
KnownImageFormats.OCI => SchemaTypes.OciManifestV1,
155+
_ => imageBuilder.ManifestMediaType // should be impossible unless we add to the enum
156+
};
157+
}
158+
else
159+
{
160+
Log.LogErrorWithCodeFromResources(nameof(Strings.InvalidContainerImageFormat), ImageFormat, string.Join(",", Enum.GetValues<KnownImageFormats>()));
161+
}
162+
}
163+
146164
Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows, imageBuilder.ManifestMediaType);
147165
imageBuilder.AddLayer(newLayer);
148166
imageBuilder.SetWorkingDirectory(WorkingDirectory);

‎src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@
255255
BaseRegistry="$(ContainerBaseRegistry)"
256256
BaseImageName="$(ContainerBaseName)"
257257
BaseImageTag="$(ContainerBaseTag)"
258-
ImageFormat="$(ContainerImageFormat)"
259258
BaseImageDigest="$(ContainerBaseDigest)"
259+
ImageFormat="$(ContainerImageFormat)"
260260
LocalRegistry="$(LocalRegistry)"
261261
OutputRegistry="$(ContainerRegistry)"
262262
ArchiveOutputPath="$(ContainerArchiveOutputPath)"

0 commit comments

Comments
 (0)