Skip to content

Commit e48cfce

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into darc-release/9.0.2xx-a198503e-0c18-4745-8dff-ccadd23f7eb4
2 parents c3e6ef1 + 3b24b47 commit e48cfce

File tree

6 files changed

+72
-54
lines changed

6 files changed

+72
-54
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<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" />
3939
<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" />
4040
<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" />
41+
<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" />
4142
<!-- End: Package sources from dotnet-templating -->
4243
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4344
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.201">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.203">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>a2862fdcaf86b098da8025439e8317417290e610</Sha>
6+
<Sha>978233e8a25bfc3b2daa52005724ba470ca771bb</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.201-servicing.25112.5">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.203-servicing.25156.7">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>a2862fdcaf86b098da8025439e8317417290e610</Sha>
10+
<Sha>978233e8a25bfc3b2daa52005724ba470ca771bb</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.201-servicing.25112.5">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.203-servicing.25156.7">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>a2862fdcaf86b098da8025439e8317417290e610</Sha>
15+
<Sha>978233e8a25bfc3b2daa52005724ba470ca771bb</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.2">
@@ -93,43 +93,43 @@
9393
<Sha>3d780e06fbae1bc106cb90088fa9605ea4a42eed</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
96-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25112.7">
96+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25155.17">
9797
<Uri>https://github.com/dotnet/roslyn</Uri>
98-
<Sha>afe5bc4a827030229ab79ec596b3cb91d4e87872</Sha>
98+
<Sha>398aa319196d4684c751a3d7c75c847e519a393c</Sha>
9999
</Dependency>
100100
<!-- Intermediate is necessary for source build. -->
101-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25112.7">
101+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25155.17">
102102
<Uri>https://github.com/dotnet/roslyn</Uri>
103-
<Sha>afe5bc4a827030229ab79ec596b3cb91d4e87872</Sha>
103+
<Sha>398aa319196d4684c751a3d7c75c847e519a393c</Sha>
104104
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
105105
</Dependency>
106-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.25112.7">
106+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.25155.17">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108-
<Sha>afe5bc4a827030229ab79ec596b3cb91d4e87872</Sha>
108+
<Sha>398aa319196d4684c751a3d7c75c847e519a393c</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25112.7">
110+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25155.17">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>afe5bc4a827030229ab79ec596b3cb91d4e87872</Sha>
112+
<Sha>398aa319196d4684c751a3d7c75c847e519a393c</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25112.7">
114+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25155.17">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>afe5bc4a827030229ab79ec596b3cb91d4e87872</Sha>
116+
<Sha>398aa319196d4684c751a3d7c75c847e519a393c</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.25112.7">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.25155.17">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>afe5bc4a827030229ab79ec596b3cb91d4e87872</Sha>
120+
<Sha>398aa319196d4684c751a3d7c75c847e519a393c</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.25112.7">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.25155.17">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>afe5bc4a827030229ab79ec596b3cb91d4e87872</Sha>
124+
<Sha>398aa319196d4684c751a3d7c75c847e519a393c</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.25112.7">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.25155.17">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>afe5bc4a827030229ab79ec596b3cb91d4e87872</Sha>
128+
<Sha>398aa319196d4684c751a3d7c75c847e519a393c</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.25112.7">
130+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.25155.17">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>afe5bc4a827030229ab79ec596b3cb91d4e87872</Sha>
132+
<Sha>398aa319196d4684c751a3d7c75c847e519a393c</Sha>
133133
</Dependency>
134134
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.2-rtm.25067.4">
135135
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -321,22 +321,22 @@
321321
<Sha>704f7cb1d2cea33afb00c2097731216f121c2c73</Sha>
322322
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
323323
</Dependency>
324-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25078.1">
324+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25123.6">
325325
<Uri>https://github.com/dotnet/razor</Uri>
326-
<Sha>90f580c3fa0908ad7d593a4ca7622e78a61aa927</Sha>
326+
<Sha>41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac</Sha>
327327
</Dependency>
328-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25078.1">
328+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25123.6">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330-
<Sha>90f580c3fa0908ad7d593a4ca7622e78a61aa927</Sha>
330+
<Sha>41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25078.1">
332+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25123.6">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334-
<Sha>90f580c3fa0908ad7d593a4ca7622e78a61aa927</Sha>
334+
<Sha>41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac</Sha>
335335
</Dependency>
336336
<!-- Intermediate is necessary for source build. -->
337-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25078.1">
337+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25123.6">
338338
<Uri>https://github.com/dotnet/razor</Uri>
339-
<Sha>90f580c3fa0908ad7d593a4ca7622e78a61aa927</Sha>
339+
<Sha>41f62d0b8021cafc33bdefdb7e0198c8d2eb59ac</Sha>
340340
<SourceBuild RepoName="razor" ManagedOnly="true" />
341341
</Dependency>
342342
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.2">
@@ -374,16 +374,16 @@
374374
<Sha>63ae81154c50a1cf9287cc47d8351d55b4289e6d</Sha>
375375
<SourceBuild RepoName="xdt" ManagedOnly="true" />
376376
</Dependency>
377-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.25076.2">
377+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.25123.1">
378378
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
379379
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
380380
</Dependency>
381-
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.25076.2">
381+
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.25123.1">
382382
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
383383
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
384384
</Dependency>
385385
<!-- Intermediate is necessary for source build. -->
386-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.11.0-beta1.25076.2">
386+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.11.0-beta1.25123.1">
387387
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
388388
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
389389
<SourceBuild RepoName="roslyn-analyzers" ManagedOnly="true" />

‎eng/Versions.props

Lines changed: 17 additions & 17 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>
@@ -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 -->
@@ -185,13 +185,13 @@
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.7</MicrosoftTemplateEngineMocksPackageVersion>
195195
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
196196
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
197197
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -202,14 +202,14 @@
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/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)