Skip to content

Commit 6e17a31

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into darc-release/8.0.3xx-96dae53f-688c-4c3d-afb4-cd1d3c2ad472
2 parents 36ad234 + 2348742 commit 6e17a31

File tree

8 files changed

+121
-103
lines changed

8 files changed

+121
-103
lines changed

‎NuGet.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
7+
<add key="darc-pub-dotnet-emsdk-222749b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-222749b4/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-emsdk -->
89
<!-- Begin: Package sources from dotnet-format -->
910
<add key="darc-pub-dotnet-format-c7e5d39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b/nuget/v3/index.json" />
@@ -13,18 +14,21 @@
1314
<add key="darc-pub-dotnet-format-c7e5d39-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-1/nuget/v3/index.json" />
1415
<!-- End: Package sources from dotnet-format -->
1516
<!-- Begin: Package sources from dotnet-aspnetcore -->
17+
<add key="darc-int-dotnet-aspnetcore-c78f4a8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c78f4a81/nuget/v3/index.json" />
1618
<!-- End: Package sources from dotnet-aspnetcore -->
1719
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1820
<add key="darc-pub-DotNet-msbuild-Trusted-e71ee2d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e71ee2d1/nuget/v3/index.json" />
1921
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2022
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2123
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2224
<!-- Begin: Package sources from dotnet-runtime -->
25+
<add key="darc-int-dotnet-runtime-574100b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6/nuget/v3/index.json" />
2326
<!-- End: Package sources from dotnet-runtime -->
2427
<!-- Begin: Package sources from dotnet-templating -->
2528
<add key="darc-pub-dotnet-templating-3822635" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-38226354/nuget/v3/index.json" />
2629
<!-- End: Package sources from dotnet-templating -->
2730
<!-- Begin: Package sources from dotnet-windowsdesktop -->
31+
<add key="darc-int-dotnet-windowsdesktop-2540f0e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7/nuget/v3/index.json" />
2832
<!-- End: Package sources from dotnet-windowsdesktop -->
2933
<!-- Begin: Package sources from dotnet-winforms -->
3034
<!-- End: Package sources from dotnet-winforms -->
@@ -51,6 +55,7 @@
5155
<!-- Begin: Package sources from dotnet-templating -->
5256
<!-- End: Package sources from dotnet-templating -->
5357
<!-- Begin: Package sources from dotnet-aspnetcore -->
58+
<add key="darc-int-dotnet-aspnetcore-c78f4a8" value="true" />
5459
<!-- End: Package sources from dotnet-aspnetcore -->
5560
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
5661
<!-- End: Package sources from DotNet-msbuild-Trusted -->
@@ -60,8 +65,10 @@
6065
<!-- End: Package sources from dotnet-format -->
6166
<!-- End: Package sources from dotnet-aspnetcore -->
6267
<!-- Begin: Package sources from dotnet-runtime -->
68+
<add key="darc-int-dotnet-runtime-574100b" value="true" />
6369
<!-- End: Package sources from dotnet-runtime -->
6470
<!-- Begin: Package sources from dotnet-windowsdesktop -->
71+
<add key="darc-int-dotnet-windowsdesktop-2540f0e" value="true" />
6572
<!-- Begin: Package sources from dotnet-winforms -->
6673
<!-- End: Package sources from dotnet-winforms -->
6774
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,22 @@
5151
</PropertyGroup>
5252
<PropertyGroup>
5353
<!-- Dependencies from https://github.com/dotnet/runtime -->
54-
<MicrosoftNETCoreAppRefPackageVersion>8.0.19</MicrosoftNETCoreAppRefPackageVersion>
55-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.19-servicing.25365.14</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
56-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
54+
<MicrosoftNETCoreAppRefPackageVersion>8.0.20</MicrosoftNETCoreAppRefPackageVersion>
55+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.20-servicing.25419.14</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
56+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.20</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
5757
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
5858
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
59-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.19</MicrosoftNETCoreDotNetHostResolverPackageVersion>
60-
<MicrosoftNETHostModelVersion>8.0.19-servicing.25365.14</MicrosoftNETHostModelVersion>
59+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.20</MicrosoftNETCoreDotNetHostResolverPackageVersion>
60+
<MicrosoftNETHostModelVersion>8.0.20-servicing.25419.14</MicrosoftNETHostModelVersion>
6161
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
6262
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
6363
<MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
6464
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.3</MicrosoftExtensionsLoggingAbstractionsVersion>
6565
<MicrosoftExtensionsLoggingConsoleVersion>8.0.1</MicrosoftExtensionsLoggingConsoleVersion>
66-
<MicrosoftNETILLinkTasksPackageVersion>8.0.19</MicrosoftNETILLinkTasksPackageVersion>
66+
<MicrosoftNETILLinkTasksPackageVersion>8.0.20</MicrosoftNETILLinkTasksPackageVersion>
6767
<MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
6868
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
69-
<MicrosoftExtensionsObjectPoolPackageVersion>8.0.19</MicrosoftExtensionsObjectPoolPackageVersion>
69+
<MicrosoftExtensionsObjectPoolPackageVersion>8.0.20</MicrosoftExtensionsObjectPoolPackageVersion>
7070
<MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion>
7171
<SystemCompositionAttributedModelPackageVersion>8.0.0</SystemCompositionAttributedModelPackageVersion>
7272
<SystemCompositionConventionPackageVersion>8.0.0</SystemCompositionConventionPackageVersion>
@@ -171,13 +171,13 @@
171171
</PropertyGroup>
172172
<PropertyGroup>
173173
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
174-
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.19</MicrosoftAspNetCoreAppRefPackageVersion>
175-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.19-servicing.25372.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
176-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.19-servicing.25372.4</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
177-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.19-servicing.25372.4</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
178-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.19-servicing.25372.4</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
179-
<MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.19-servicing.25372.4</MicrosoftAspNetCoreAnalyzersPackageVersion>
180-
<MicrosoftAspNetCoreTestHostPackageVersion>8.0.19</MicrosoftAspNetCoreTestHostPackageVersion>
174+
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.20</MicrosoftAspNetCoreAppRefPackageVersion>
175+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.20-servicing.25420.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
176+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.20-servicing.25420.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
177+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.20-servicing.25420.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
178+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.20-servicing.25420.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
179+
<MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.20-servicing.25420.2</MicrosoftAspNetCoreAnalyzersPackageVersion>
180+
<MicrosoftAspNetCoreTestHostPackageVersion>8.0.20</MicrosoftAspNetCoreTestHostPackageVersion>
181181
</PropertyGroup>
182182
<!-- Dependencies from https://github.com/dotnet/razor -->
183183
<PropertyGroup>
@@ -187,7 +187,7 @@
187187
</PropertyGroup>
188188
<PropertyGroup>
189189
<!-- Dependencies from https://github.com/dotnet/wpf -->
190-
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.19-servicing.25368.11</MicrosoftNETSdkWindowsDesktopPackageVersion>
190+
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.20-servicing.25420.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
191191
</PropertyGroup>
192192
<PropertyGroup Label="Manually updated">
193193
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -231,7 +231,7 @@
231231
</PropertyGroup>
232232
<PropertyGroup>
233233
<!-- Workloads from dotnet/emsdk -->
234-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.19</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
234+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.20</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
235235
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)</EmscriptenWorkloadManifestVersion>
236236
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
237237
<EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))</EmscriptenWorkloadFeatureBand>

‎src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,24 @@ public static ToolConfiguration Deserialize(string pathToXml)
5252
throw new ToolConfigurationException(CommonLocalizableStrings.ToolSettingsMoreThanOneCommand);
5353
}
5454

55-
if (dotNetCliTool.Commands[0].Runner != "dotnet")
55+
// if there is no runner, this could be an entirely different _kind_ of tool.
56+
if (string.IsNullOrWhiteSpace(dotNetCliTool.Commands[0].Runner))
5657
{
57-
throw new ToolConfigurationException(
58-
string.Format(
59-
CommonLocalizableStrings.ToolSettingsUnsupportedRunner,
60-
dotNetCliTool.Commands[0].Name,
61-
dotNetCliTool.Commands[0].Runner));
58+
if (warnings.Count != 0)
59+
{
60+
throw new ToolConfigurationException(warnings[0]);
61+
}
6262
}
6363

64+
if (dotNetCliTool.Commands[0].Runner != "dotnet")
65+
{
66+
throw new ToolConfigurationException(
67+
string.Format(
68+
CommonLocalizableStrings.ToolSettingsUnsupportedRunner,
69+
dotNetCliTool.Commands[0].Name,
70+
dotNetCliTool.Commands[0].Runner));
71+
}
72+
6473
return new ToolConfiguration(
6574
dotNetCliTool.Commands[0].Name,
6675
dotNetCliTool.Commands[0].EntryPoint,

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

Lines changed: 4 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]
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]
72+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
7373
public void ParseContainerProperties_EndToEnd()
7474
{
7575
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -132,7 +132,7 @@ public void ParseContainerProperties_EndToEnd()
132132
/// <summary>
133133
/// Creates a console app that outputs the environment variable added to the image.
134134
/// </summary>
135-
[DockerAvailableFact]
135+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
136136
public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
137137
{
138138
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -215,7 +215,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
215215
.And.HaveStdOut("Foo");
216216
}
217217

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

‎src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs‎

Lines changed: 2 additions & 2 deletions
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]
20+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
2121
public async Task GetFromRegistry()
2222
{
2323
var loggerFactory = new TestLoggerFactory(_testOutput);
@@ -37,7 +37,7 @@ public async Task GetFromRegistry()
3737
Assert.NotNull(downloadedImage);
3838
}
3939

40-
[DockerAvailableFact]
40+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
4141
public async Task WriteToPrivateBasicRegistry()
4242
{
4343
ILogger logger = _loggerFactory.CreateLogger(nameof(WriteToPrivateBasicRegistry));

‎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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void Dispose()
3838
_loggerFactory.Dispose();
3939
}
4040

41-
[DockerAvailableFact]
41+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
4242
public async Task ApiEndToEndWithRegistryPushAndPull()
4343
{
4444
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithRegistryPushAndPull));
@@ -85,7 +85,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull()
8585
}
8686
}
8787

88-
[DockerAvailableFact]
88+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
8989
public async Task ApiEndToEndWithLocalLoad()
9090
{
9191
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithLocalLoad));
@@ -126,7 +126,7 @@ public async Task ApiEndToEndWithLocalLoad()
126126
}
127127
}
128128

129-
[DockerAvailableFact]
129+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
130130
public async Task ApiEndToEndWithArchiveWritingAndLoad()
131131
{
132132
ILogger logger = _loggerFactory.CreateLogger(nameof(ApiEndToEndWithArchiveWritingAndLoad));
@@ -286,7 +286,7 @@ public async Task EndToEnd_MultiProjectSolution()
286286
commandResult.Should().HaveStdOutContaining("Pushed image 'consoleapp:latest'");
287287
}
288288

289-
[DockerAvailableTheory()]
289+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49300")]
290290
[InlineData("webapi", false)]
291291
[InlineData("webapi", true)]
292292
[InlineData("worker", false)]
@@ -462,7 +462,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage
462462
privateNuGetAssets.Delete(true);
463463
}
464464

465-
[DockerAvailableFact]
465+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
466466
public void EndToEnd_NoAPI_Console()
467467
{
468468
DirectoryInfo newProjectDir = new DirectoryInfo(Path.Combine(TestSettings.TestArtifactsDirectory, "CreateNewImageTest"));
@@ -548,7 +548,7 @@ public void EndToEnd_NoAPI_Console()
548548
[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.")]
549549
[DockerSupportsArchInlineData("windows/amd64", "win-x64", "C:\\app")]
550550
[DockerSupportsArchInlineData("linux/amd64", "linux-x64", "/app")]
551-
[DockerAvailableTheory]
551+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49300")]
552552
public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform, string rid, string workingDir)
553553
{
554554
ILogger logger = _loggerFactory.CreateLogger(nameof(CanPackageForAllSupportedContainerRIDs));

0 commit comments

Comments
 (0)