Skip to content

Commit 6bfc2e4

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into internal-merge-9.0.1xx-2025-06-10-1319
2 parents 6e17b20 + ca918d3 commit 6bfc2e4

27 files changed

+365
-61
lines changed

‎NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<!-- End: Package sources from dotnet-aspnetcore -->
3232
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3333
<add key="darc-int-DotNet-msbuild-Trusted-13c590f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-13c590f8/nuget/v3/index.json" />
34+
<add key="darc-pub-DotNet-msbuild-Trusted-6c6276d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6c6276d5/nuget/v3/index.json" />
3435
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3536
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3637
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -39,6 +40,7 @@
3940
<!-- End: Package sources from dotnet-runtime -->
4041
<!-- Begin: Package sources from dotnet-templating -->
4142
<add key="darc-pub-dotnet-templating-0c96b36" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0c96b36c/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-templating-1a9d00e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-1a9d00e8/nuget/v3/index.json" />
4244
<!-- End: Package sources from dotnet-templating -->
4345
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4446
<add key="darc-int-dotnet-windowsdesktop-c7cc0b3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c7cc0b3d/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 31 additions & 31 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.107">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.108">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>a2da3a8446409db003c2868a6910c0323b113467</Sha>
6+
<Sha>1a9d00e83cf92e2e508a27a899023b04866fc2a8</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.107-servicing.25268.8">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.108-servicing.25304.14">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>a2da3a8446409db003c2868a6910c0323b113467</Sha>
10+
<Sha>1a9d00e83cf92e2e508a27a899023b04866fc2a8</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.107-servicing.25268.8">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.108-servicing.25304.14">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>a2da3a8446409db003c2868a6910c0323b113467</Sha>
15+
<Sha>1a9d00e83cf92e2e508a27a899023b04866fc2a8</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.6">
@@ -73,18 +73,18 @@
7373
<Sha>e3d8e8ea6df192d864698cdd76984d74135d0d13</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.35">
76+
<Dependency Name="Microsoft.Build" Version="17.12.38">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>13c590f8d138d6a30b899a5172cc6ec494db930b</Sha>
78+
<Sha>6c6276d5998f8be9811497003566e5924141d600</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.35-preview-25210-18">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.38-preview-25306-07">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>13c590f8d138d6a30b899a5172cc6ec494db930b</Sha>
82+
<Sha>6c6276d5998f8be9811497003566e5924141d600</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.35-preview-25210-18">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.38-preview-25306-07">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>13c590f8d138d6a30b899a5172cc6ec494db930b</Sha>
87+
<Sha>6c6276d5998f8be9811497003566e5924141d600</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.25070.7">
@@ -97,41 +97,41 @@
9797
<Sha>47d4e3f91e4e5414b6dafbf14288b9c5a798ef99</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25256.6">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25275.3">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102102
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25256.6">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25275.3">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107107
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25256.6">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25275.3">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112112
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25256.6">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25275.3">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116116
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25256.6">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25275.3">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120120
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25256.6">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25275.3">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124124
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25256.6">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25275.3">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128128
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25256.6">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25275.3">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132132
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25256.6">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25275.3">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136136
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
137137
</Dependency>
@@ -325,20 +325,20 @@
325325
<Sha>379bfc7b2559e7cc9f42f997a497b2f2dd8e12d2</Sha>
326326
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
327327
</Dependency>
328-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25256.3">
328+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25275.1">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330330
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25256.3">
332+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25275.1">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334334
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
335335
</Dependency>
336-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25256.3">
336+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25275.1">
337337
<Uri>https://github.com/dotnet/razor</Uri>
338338
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
339339
</Dependency>
340340
<!-- Intermediate is necessary for source build. -->
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25256.3">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25275.1">
342342
<Uri>https://github.com/dotnet/razor</Uri>
343343
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
344344
<SourceBuild RepoName="razor" ManagedOnly="true" />
@@ -451,9 +451,9 @@
451451
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
452452
</Dependency>
453453
<!-- Intermediate is necessary for source build. -->
454-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25266.1">
454+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25272.2">
455455
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
456-
<Sha>2bdf6b694572c45f6249c5406ae2303d678cda3f</Sha>
456+
<Sha>9859d82ffce48f49b5e93fa46a38bdddc4ba26be</Sha>
457457
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
458458
</Dependency>
459459
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25059.4">
@@ -631,14 +631,14 @@
631631
<Uri>https://github.com/dotnet/arcade-services</Uri>
632632
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
633633
</Dependency>
634-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25266.2">
634+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25269.1">
635635
<Uri>https://github.com/dotnet/scenario-tests</Uri>
636-
<Sha>a11e0d6f227feb7d0e2b619b48556d041237e59c</Sha>
636+
<Sha>5c769be3733c4ffa543fc7e7ec5fadd4fa8f8c9e</Sha>
637637
</Dependency>
638638
<!-- Intermediate is necessary for source build. -->
639-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25266.2">
639+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25269.1">
640640
<Uri>https://github.com/dotnet/scenario-tests</Uri>
641-
<Sha>a11e0d6f227feb7d0e2b619b48556d041237e59c</Sha>
641+
<Sha>5c769be3733c4ffa543fc7e7ec5fadd4fa8f8c9e</Sha>
642642
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
643643
</Dependency>
644644
<!--

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,20 @@
180180
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
181181
182182
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
183-
<MicrosoftBuildVersion>17.12.35</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.35-preview-25210-18</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.38</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.38-preview-25306-07</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>
188188
<PropertyGroup>
189189
<!-- Dependencies from https://github.com/dotnet/templating -->
190-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.107</MicrosoftTemplateEngineAbstractionsPackageVersion>
190+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.108</MicrosoftTemplateEngineAbstractionsPackageVersion>
191191
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
192192
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
193193
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
194194
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
195195
<!-- test dependencies -->
196-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.107-servicing.25268.8</MicrosoftTemplateEngineMocksPackageVersion>
196+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.108-servicing.25304.14</MicrosoftTemplateEngineMocksPackageVersion>
197197
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
198198
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
199199
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -204,14 +204,14 @@
204204
</PropertyGroup>
205205
<PropertyGroup>
206206
<!-- Dependencies from https://github.com/dotnet/roslyn -->
207-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25256.6</MicrosoftNetCompilersToolsetVersion>
208-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25256.6</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisPackageVersion>
210-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpPackageVersion>
211-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
207+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25275.3</MicrosoftNetCompilersToolsetVersion>
208+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25275.3</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisPackageVersion>
210+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisCSharpPackageVersion>
211+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
215215
</PropertyGroup>
216216
<PropertyGroup>
217217
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -231,9 +231,9 @@
231231
</PropertyGroup>
232232
<PropertyGroup>
233233
<!-- Dependencies from https://github.com/dotnet/razor -->
234-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25256.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
235-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25256.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
236-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25256.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
234+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25275.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
235+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25275.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
236+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25275.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
237237
</PropertyGroup>
238238
<PropertyGroup>
239239
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -261,7 +261,7 @@
261261
<PropertyGroup Label="Infrastructure and test only dependencies">
262262
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
263263
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
264-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25266.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
264+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25269.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
265265
</PropertyGroup>
266266
<PropertyGroup Label="Manually updated">
267267
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,11 @@ private static async Task<int> PushToLocalRegistryAsync(ILogger logger, BuiltIma
216216
await containerRegistry.LoadAsync(builtImage, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
217217
logger.LogInformation(Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, containerRegistry);
218218
}
219+
catch (UnableToDownloadFromRepositoryException)
220+
{
221+
logger.LogError(Resource.FormatString(nameof(Strings.UnableToDownloadFromRepository)), sourceImageReference);
222+
return 1;
223+
}
219224
catch (Exception ex)
220225
{
221226
logger.LogError(Resource.FormatString(nameof(Strings.RegistryOutputPushFailed), ex.Message));

‎src/Containers/Microsoft.NET.Build.Containers/Exceptions/UnableToDownloadFromRepositoryException.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
namespace Microsoft.NET.Build.Containers;
5+
6+
internal sealed class UnableToDownloadFromRepositoryException : Exception
7+
{
8+
public UnableToDownloadFromRepositoryException(string repository)
9+
: base($"The download of the image from repository { repository } has failed.")
10+
{
11+
}
12+
}

‎src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ private static async Task PushToLocalRegistryAsync<T>(
107107
await loadFunc(image, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
108108
Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
109109
}
110+
catch (UnableToDownloadFromRepositoryException)
111+
{
112+
Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToDownloadFromRepository), sourceImageReference);
113+
}
110114
catch (ContainerHttpException e)
111115
{
112116
Log.LogErrorFromException(e, true);

0 commit comments

Comments
 (0)