diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs b/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs index 20486f7baa0e..a801de15dfbf 100644 --- a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs +++ b/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs @@ -15,7 +15,6 @@ internal static class FormatCommandCommon internal const int UnhandledExceptionExitCode = 1; internal const int CheckFailedExitCode = 2; internal const int UnableToLocateMSBuildExitCode = 3; - internal const int UnableToLocateDotNetCliExitCode = 4; private static string[] VerbosityLevels => new[] { "q", "quiet", "m", "minimal", "n", "normal", "d", "detailed", "diag", "diagnostic" }; private static string[] SeverityLevels => new[] { "info", "warn", "error" }; @@ -102,14 +101,6 @@ internal static async Task FormatAsync(FormatOptions formatOptions, ILogger var runtimeVersion = GetRuntimeVersion(); logger.LogDebug(Resources.The_dotnet_runtime_version_is_0, runtimeVersion); - if (!TryGetDotNetCliVersion(out var dotnetVersion)) - { - logger.LogError(Resources.Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH); - return UnableToLocateDotNetCliExitCode; - } - - logger.LogTrace(Resources.The_dotnet_CLI_version_is_0, dotnetVersion); - if (!TryLoadMSBuild(out var msBuildPath)) { logger.LogError(Resources.Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer); @@ -354,23 +345,6 @@ private static string EnsureTrailingSlash(string path) ?.InformationalVersion; } - internal static bool TryGetDotNetCliVersion([NotNullWhen(returnValue: true)] out string? dotnetVersion) - { - try - { - var processInfo = ProcessRunner.CreateProcess("dotnet", "--version", captureOutput: true, displayWindow: false); - var versionResult = processInfo.Result.GetAwaiter().GetResult(); - - dotnetVersion = versionResult.OutputLines[0].Trim(); - return true; - } - catch - { - dotnetVersion = null; - return false; - } - } - internal static bool TryLoadMSBuild([NotNullWhen(returnValue: true)] out string? msBuildPath) { try diff --git a/src/BuiltInTools/dotnet-format/Resources.resx b/src/BuiltInTools/dotnet-format/Resources.resx index 999aa66a5a2d..ec627d90ce53 100644 --- a/src/BuiltInTools/dotnet-format/Resources.resx +++ b/src/BuiltInTools/dotnet-format/Resources.resx @@ -225,9 +225,6 @@ Standard input markers ('/dev/stdin', '-') can only be used either with `--include` or `--exclude`, but not both. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - The dotnet CLI version is '{0}'. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.cs.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.cs.xlf index f86d04054ce8..f3a21d499b4d 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.cs.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.cs.xlf @@ -377,11 +377,6 @@ Nepovedlo se najít MSBuild. Ujistěte se, že se sada .NET SDK nainstalovala pomocí oficiálního instalačního programu. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Nepovedlo se najít .NET CLI. Ujistěte se, že se nachází v proměnné PATH. - - Unable to organize imports for '{0}'. The document is too complex. Nepovedlo se uspořádat importy pro {0}. Dokument je příliš složitý. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.de.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.de.xlf index 677400e07673..40a49347e259 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.de.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.de.xlf @@ -377,11 +377,6 @@ MSBuild wurde nicht gefunden. Stellen Sie sicher, dass das .NET SDK mit dem offiziellen Installationsprogramm installiert wurde. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Die dotnet-CLI wurde nicht gefunden. Stellen Sie sicher, dass sie sich im Pfad befindet. - - Unable to organize imports for '{0}'. The document is too complex. Importe für "{0}" können nicht organisiert werden. Das Dokument ist zu komplex. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.es.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.es.xlf index 79008550cfdd..775cdef7cdf3 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.es.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.es.xlf @@ -377,11 +377,6 @@ No se encuentra MSBuild. Asegúrese de que el SDK de .NET se haya instalado con el instalador oficial. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - No se encuentra la CLI de dotnet. Asegúrese de que esté en la ruta de acceso (PATH). - - Unable to organize imports for '{0}'. The document is too complex. No se pueden organizar las importaciones para "{0}". El documento es demasiado complejo. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.fr.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.fr.xlf index 7115ef2dd68a..c29da3ec3b44 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.fr.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.fr.xlf @@ -377,11 +377,6 @@ Impossible de localiser MSBuild. Vérifiez que le SDK .NET a été installé avec le programme d'installation officiel. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Impossible de localiser l'interface CLI dotnet. Vérifiez qu'elle est dans le chemin. - - Unable to organize imports for '{0}'. The document is too complex. Impossible d'organiser les importations pour '{0}'. Le document est trop complexe. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.it.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.it.xlf index 3ffa3a39380f..2aeb29336f18 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.it.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.it.xlf @@ -377,11 +377,6 @@ Non è possibile individuare MSBuild. Assicurarsi che .NET SDK sia stato installato con il programma di installazione ufficiale. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Non è possibile individuare l'interfaccia della riga di comando di dotnet. Assicurarsi che sia indicata in PATH. - - Unable to organize imports for '{0}'. The document is too complex. Non è possibile organizzare le importazioni per '{0}'. Il documento è troppo complesso. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.ja.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.ja.xlf index 11fa905930d7..4cf225955ceb 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.ja.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.ja.xlf @@ -377,11 +377,6 @@ MSBuild が見つかりません。.NET SDK が正式なインストーラーでインストールされたことを確認してください。 - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - dotnet CLI が見つかりません。PATH 上にあることを確認してください。 - - Unable to organize imports for '{0}'. The document is too complex. '{0}' のインポートを整理できません。ドキュメントが複雑すぎます。 diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.ko.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.ko.xlf index e8d31acc2adb..5fe1286052e1 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.ko.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.ko.xlf @@ -377,11 +377,6 @@ MSBuild를 찾을 수 없습니다. 공식 설치 관리자를 사용하여 .NET SDK를 설치했는지 확인하세요. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - dotnet CLI를 찾을 수 없습니다. PATH에 있는지 확인하세요. - - Unable to organize imports for '{0}'. The document is too complex. '{0}'에 대한 가져오기를 구성할 수 없습니다. 문서가 너무 복잡합니다. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.pl.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.pl.xlf index 936d356f2ac0..37b8a4e1f484 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.pl.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.pl.xlf @@ -377,11 +377,6 @@ Nie można zlokalizować programu MSBuild. Upewnij się, że zestaw .NET SDK został zainstalowany przy użyciu oficjalnego instalatora. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Nie można zlokalizować wiersza polecenia dotnet. Upewnij się, że znajduje się on w ścieżce. - - Unable to organize imports for '{0}'. The document is too complex. Nie można zorganizować importów dla elementu „{0}”. Dokument jest zbyt złożony. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.pt-BR.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.pt-BR.xlf index 8061e736ecbe..b57c3e3b44f4 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.pt-BR.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.pt-BR.xlf @@ -377,11 +377,6 @@ Não é possível localizar o MSBuild. Verifique se o SDK do .NET foi instalado com o instalador oficial. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Não é possível localizar a CLI do dotnet. Verifique se está no CAMINHO. - - Unable to organize imports for '{0}'. The document is too complex. Não é possível organizar importações para '{0}'. O documento é muito complexo. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.ru.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.ru.xlf index 738cdc715ecd..876497b11b1e 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.ru.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.ru.xlf @@ -377,11 +377,6 @@ Не удается найти MSBuild. Убедитесь, что пакет SDK для .NET был установлен с официальным установщиком. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - Не удалось найти CLI dotnet. Убедитесь, что путь к нему добавлен в переменную среды PATH. - - Unable to organize imports for '{0}'. The document is too complex. Не удается организовать импорты для "{0}". Слишком сложный документ. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.tr.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.tr.xlf index a2e299a0719d..c20259208904 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.tr.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.tr.xlf @@ -377,11 +377,6 @@ MSBuild bulunamıyor. .NET SDK'nın resmi yükleyici kullanılarak yüklendiğinden emin olun. - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - dotnet CLI bulunamıyor. dotnet CLI'nin PATH üzerinde olduğundan emin olun. - - Unable to organize imports for '{0}'. The document is too complex. '{0}' için içeri aktarmalar düzenlenemiyor. Belge çok karmaşık. diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hans.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hans.xlf index 2159fb65a4d1..88482781e59c 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hans.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hans.xlf @@ -377,11 +377,6 @@ 无法找到 MSBuild。请确保 .NET SDK 是与官方安装程序一起安装的。 - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - 找不到 dotnet CLI。请确保它在路径上。 - - Unable to organize imports for '{0}'. The document is too complex. 无法整理“{0}”的导入项。文档太复杂。 diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hant.xlf b/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hant.xlf index 68ef3223f390..10d7cfa16699 100644 --- a/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hant.xlf +++ b/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hant.xlf @@ -377,11 +377,6 @@ 找不到 MSBuild。請確認已使用正式安裝程式安裝了 .NET SDK。 - - Unable to locate dotnet CLI. Ensure that it is on the PATH. - 找不到 dotnet CLI。請確認其位於 PATH 上。 - - Unable to organize imports for '{0}'. The document is too complex. 無法組織 '{0}' 的匯入。文件太複雜。 diff --git a/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs b/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs index 99f111f3c177..24b8237217b1 100644 --- a/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs +++ b/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs @@ -152,7 +152,7 @@ private async Task> PrepareWorkItem(ITaskItem xunitProject) var testFilter = string.IsNullOrEmpty(assemblyPartitionInfo.ClassListArgumentString) ? "" : $"--filter \"{assemblyPartitionInfo.ClassListArgumentString}\""; command = $"{driver} test {assemblyName} -e HELIX_WORK_ITEM_TIMEOUT={timeout} {testExecutionDirectory} {msbuildAdditionalSdkResolverFolder} " + - $"{(XUnitArguments != null ? " " + XUnitArguments : "")} --results-directory .{Path.DirectorySeparatorChar} --logger trx --blame-hang --blame-hang-timeout 30m {testFilter} -- {arguments}"; + $"{(XUnitArguments != null ? " " + XUnitArguments : "")} --results-directory .{Path.DirectorySeparatorChar} --logger trx --logger \"console;verbosity=detailed\" --blame-hang --blame-hang-timeout 30m {testFilter} -- {arguments}"; Log.LogMessage($"Creating work item with properties Identity: {assemblyName}, PayloadDirectory: {publishDirectory}, Command: {command}"); diff --git a/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs b/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs index 81740674b438..37384ba7c18e 100644 --- a/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs +++ b/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs @@ -395,12 +395,12 @@ public async Task UploadBlobChunkedAsync_Failure() api.Verify(api => api.Blob.Upload.UploadChunkAsync(It.IsIn(absoluteUploadUri, uploadPath), It.IsAny(), It.IsAny()), Times.Exactly(1)); } + [Theory(Skip = "https://github.com/dotnet/sdk/issues/42820")] [InlineData(true, true, true)] [InlineData(false, true, true)] [InlineData(true, false, true)] [InlineData(false, false, true)] [InlineData(false, false, false)] - [Theory] public async Task InsecureRegistry(bool isInsecureRegistry, bool serverIsHttps, bool httpServerCloseAbortive) { ILogger logger = _loggerFactory.CreateLogger(nameof(InsecureRegistry)); diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs index 05a1a3aaec49..4201fa3af6d3 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs @@ -48,7 +48,7 @@ public void It_targets_the_right_shared_framework(string targetFramework, string } // Test behavior when implicit version differs for framework-dependent and self-contained apps - [Theory] + [Theory(Skip = "https://github.com/dotnet/sdk/issues/45417")] [InlineData("netcoreapp1.0", false, true, "1.0.5")] [InlineData("netcoreapp1.0", true, true, "1.0.16")] [InlineData("netcoreapp1.0", false, false, "1.0.5")] diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index b315e318c856..1925af0e32bb 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -121,7 +121,7 @@ public void compose_dependencies_noopt() storeDirectory.Should().OnlyHaveFiles(files_on_disk); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/45417")] public void store_nativeonlyassets() { TestAsset simpleDependenciesAsset = _testAssetsManager diff --git a/test/dotnet-new.Tests/DotnetNewListTests.Approval.cs b/test/dotnet-new.Tests/DotnetNewListTests.Approval.cs index 0c1995a11340..985d1b07932b 100644 --- a/test/dotnet-new.Tests/DotnetNewListTests.Approval.cs +++ b/test/dotnet-new.Tests/DotnetNewListTests.Approval.cs @@ -7,7 +7,8 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests { public partial class DotnetNewListTests { - [Theory] +#pragma warning disable xUnit1004 // Test methods should not be skipped + [Theory(Skip = "https://github.com/dotnet/sdk/issues/45406")] [InlineData("-l")] [InlineData("--list")] public Task BasicTest_WhenLegacyCommandIsUsed(string commandName) @@ -27,7 +28,7 @@ public Task BasicTest_WhenLegacyCommandIsUsed(string commandName) .DisableRequireUniquePrefix(); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/45406")] public Task BasicTest_WhenListCommandIsUsed() { CommandResult commandResult = new DotnetNewCommand(_log, "list") @@ -41,6 +42,7 @@ public Task BasicTest_WhenListCommandIsUsed() return Verify(commandResult.StdOut).UniqueForOSPlatform(); } +#pragma warning restore xUnit1004 [Fact] public Task Constraints_CanShowMessageIfTemplateGroupIsRestricted()