diff --git a/eng/Versions.props b/eng/Versions.props index eb88714544c9..156f4ed471ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,6 +104,7 @@ 17.8.0-preview-23429-02 + $(MicrosoftBuildPackageVersion) + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} + + diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index 30ab64dbb1ed..16d6c0d38c87 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: Aktuální sada .NET SDK nepodporuje .NET Framework bez použití výchozích nastavení .NET SDK. Pravděpodobně došlo k neshodě mezi vlastnostmi CLRSupport projektu C++/CLI a TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Cílení na .NET 6.0 nebo vyšší ve Visual Studio 2019 se nepodporuje. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Cílení na .NET 7.0 nebo vyšší se ve Visual Studiu 2022 17.3 nepodporuje. - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index cdd3f6f2f7ea..83881293e804 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: Das aktuelle .NET SDK unterstützt das .NET Framework nur, wenn .NET SDK-Standardwerte verwendet werden. Wahrscheinlich liegt ein Konflikt zwischen der CLRSupport-Eigenschaft des C++-/CLI-Projekts und TargetFramework vor. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: .NET 6.0 oder höher wird als Ziel in Visual Studio 2019 nicht unterstützt. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Die Ausrichtung auf .NET 7.0 oder höher in Visual Studio 2022 17.3 wird nicht unterstützt. - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index 0424a36a9b02..c50434e47cfe 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: El SDK de .NET actual no admite .NET Framework sin usar los valores predeterminados de dicho SDK. Posiblemente se deba a la falta de coincidencia entre la propiedad CLRSupport del proyecto de C++/CLI y TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: No se admite el destino de .NET 6.0 o superior en Visual Studio 2019. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: No se admite el destino de .NET 7.0 o superior en Visual Studio 2022 17.3. - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index 1f99d40e3376..81fafd150f1a 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: Le SDK .NET actuel ne prend pas en charge le .NET Framework avec des valeurs du SDK .NET autres que celles par défaut. Cela est probablement dû à une incompatibilité entre la propriété CLRSupport du projet C++/CLI et TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: le ciblage de .NET 6.0 ou plus dans Visual Studio 2019 n’est pas pris en charge. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: le ciblage de .NET 7.0 ou plus dans Visual Studio 2022 17.3 n’est pas pris en charge. - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 8a5be55cc7aa..eaebfec2e58a 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: l'istanza corrente di .NET SDK non supporta .NET Framework senza usare le impostazioni predefinite di .NET SDK. Il problema dipende probabilmente da una mancata corrispondenza tra la proprietà CLRSupport del progetto C++/CLI e TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: la destinazione .NET 6.0 o versione successiva in Visual Studio 2019 non è supportata. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: la destinazione .NET 7.0 o versione successiva in Visual Studio 2022 17.3 non è supportata. - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index 136de253dff2..1086c2ea1689 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: 現在の .NET SDK では、.NET SDK の既定値を使用せずに .NET Framework をサポートすることはできません。これは、C++/CLI プロジェクトの CLRSupport プロパティと TargetFramework の間の不一致が原因と考えられます。 {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Visual Studio 2019 では .NET 6.0 以降をターゲットにすることはできません。 - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Visual Studio 2022 17.3 では .NET 7.0 以上をターゲットにすることはできません。 - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index 4b852d038e50..c30bf37c6780 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -631,15 +631,10 @@ true <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(Targ NETSDK1115: 현재 .NET SDK는 .NET SDK 기본값을 사용하지 않는 .NET Framework를 지원하지 않습니다. C++/CLI 프로젝트 CLRSupport 속성과 TargetFramework 사이의 불일치 때문일 수 있습니다. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Visual Studio 2019에서 .NET 6.0 이상을 대상으로 하는 것은 지원되지 않습니다. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Visual Studio 2022 17.3에서 .NET 7.0 이상을 대상으로 하는 것은 지원되지 않습니다. - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index 4cb9b418ffec..66ab548b4667 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: Bieżący zestaw .NET SDK nie obsługuje programu .NET Framework bez użycia wartości domyślnych zestawu .NET SDK. Prawdopodobna przyczyna to niezgodność między właściwością CLRSupport projektu C++/CLI i elementu TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Platforma docelowa .NET 6.0 lub nowsza w usłudze Visual Studio 2019 nie jest obsługiwana. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Platforma docelowa .NET 7.0 lub nowsza w programie Visual Studio 2022 17.3 nie jest obsługiwana. - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index fd28fb712306..67f30f5f041c 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: o SDK do .NET atual não dá suporte ao .NET Framework sem o uso de Padrões do SDK do .NET. O motivo é provavelmente uma incompatibilidade entre a propriedade CLRSupport do projeto C++/CLI e a TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: o direcionamento do .NET 6.0 ou superior no Visual Studio 2019 não é compatível. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: O direcionamento do .NET 7.0 ou superior no Visual Studio 2022 17.3 não é compatível. - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 229d7bab3d31..4909789eae31 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: текущий пакет SDK для .NET не поддерживает .NET Framework без использования значений SDK для .NET по умолчанию. Причиной, скорее всего, является несоответствие TargetFramework и свойства CLRSupport в проекте C++/CLI. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: выбор .NET 6.0 или более поздней версии в качестве цели в Visual Studio 2019 не поддерживается. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: выбор .NET 7.0 или более поздней версии в качестве цели в Visual Studio 2022 17.3 не поддерживается. - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 72de0b45901e..caf8e85e4a4a 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: Geçerli .NET SDK, .NET SDK Varsayılanlarını kullanmadan .NET Framework'ü desteklemiyor. C++/CLI projesi CLRSupport özelliği ve TargetFramework arasındaki uyuşmazlık bu duruma neden olabilir. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Visual Studio 2019'da .NET 6.0 veya daha üst sürümünü hedefleme desteklenmiyor. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Visual Studio 2022 17.3'da .NET 7.0 veya daha üst sürümünü hedefleme desteklenmiyor. - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index 57ceaa2cb52d..bdc05176c1a3 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: 未使用 .NET SDK 默认设置的情况下,当前 .NET SDK 不支持 .NET Framework。很可能是因为 C++/CLI 项目的 CLRSupport 属性和 TargetFramework 之间存在不匹配情况。 {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: 不支持在 Visual Studio 2019 中以 .NET 6.0 或更高版本为目标。 - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: 不支持在 Visual Studio 2022 17.3 中以 .NET 7.0 或更高版本为目标。 - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index 04cd9b2d6964..1ca6101984a3 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -631,15 +631,10 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: 目前的 .NET SDK 不支援在不使用 .NET SDK 預設的情形下使用 .NET Framework。這可能是因為 C++/CLI 專案 CLRSupport 屬性與 TargetFramework 不相符所致。 {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: 不支援在 Visual Studio 2019 中以 .NET 6.0 或更高版本為目標。 - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: 不支援在 Visual Studio 2022 17.3 中以 .NET 7.0 或更高版本為目標。 - {StrBegin="NETSDK1192: "} + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1213: "} NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'. diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeHaveErrorCodes.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeHaveErrorCodes.cs index dcfa2d297f27..77d59c3066a8 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeHaveErrorCodes.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeHaveErrorCodes.cs @@ -31,8 +31,10 @@ public class GivenThatWeHaveErrorCodes 1101, 1108, 1180, + 1182, 1183, - 1190 + 1190, + 1192 }; //ILLink lives in other repos and violated the _info requirement for no error code diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.targets index 0deeb7944af7..eb16ada800c1 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.targets @@ -129,16 +129,10 @@ Copyright (c) .NET Foundation. All rights reserved. FormatArguments="$(SdkResolverGlobalJsonPath)" /> - - - - - - + Condition="$([MSBuild]::VersionLessThan($(MSBuildVersion), '17.8.0')) and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '8.0'))"> + - - + + diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs index cfa7e32cbe65..d02660379606 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs @@ -9,7 +9,7 @@ public GivenThatWeManifestSupportedFrameworks(ITestOutputHelper log) : base(log) { } - [RequiresMSBuildVersionTheory("17.0")] + [RequiresMSBuildVersionTheory("17.8.0")] [InlineData(".NETCoreApp")] [InlineData(".NETStandard")] public void TheMaximumVersionsAreSupported(string targetFrameworkIdentifier) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs index f6062e312649..5a098b0f970f 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs @@ -371,7 +371,7 @@ static void Main() [InlineData("recommended", "true", new string[] { "CA1310", "CA1068", "CA2200" })] [InlineData("all", "false", new string[] { "CA1031", "CA1310", "CA1068", "CA2200" })] [InlineData("all", "true", new string[] { "CA1031", "CA1310", "CA1068", "CA2200" })] - [RequiresMSBuildVersionTheory("16.8")] + [RequiresMSBuildVersionTheory("17.8.0")] public void It_bulk_configures_rules_with_different_analysis_modes(string analysisMode, string codeAnalysisTreatWarningsAsErrors, string[] expectedViolations) { var testProject = new TestProject diff --git a/src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs b/src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs index c00c2a0edeed..ea806f4f4eb4 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs @@ -112,7 +112,7 @@ public void WithNoGitMetadata() /// /// When creating a new repository locally we want the build to work and not report warnings even before the remote is set. /// - [Fact] + [RequiresMSBuildVersionFact("17.8.0")] public void WithNoRemoteNoCommit() { var testAsset = _testAssetsManager @@ -131,7 +131,7 @@ public void WithNoRemoteNoCommit() /// /// When creating a new repository locally we want the build to work and not report warnings even before the remote is set. /// - [Fact] + [RequiresMSBuildVersionFact("17.8.0")] public void WithNoRemote() { var testAsset = _testAssetsManager diff --git a/src/Tests/Microsoft.NET.Clean.Tests/GivenThatWeWantToCleanAProject.cs b/src/Tests/Microsoft.NET.Clean.Tests/GivenThatWeWantToCleanAProject.cs index 7f1076c12316..c00d909febcd 100644 --- a/src/Tests/Microsoft.NET.Clean.Tests/GivenThatWeWantToCleanAProject.cs +++ b/src/Tests/Microsoft.NET.Clean.Tests/GivenThatWeWantToCleanAProject.cs @@ -12,7 +12,7 @@ public GivenThatWeWantToCleanAHelloWorldProject(ITestOutputHelper log) : base(lo { } - [RequiresMSBuildVersionFact("17.0.0")] + [RequiresMSBuildVersionFact("17.8.0")] public void It_cleans_without_logging_assets_message() { var testAsset = _testAssetsManager diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 41cd06a6aad5..e943643335ac 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -18,7 +18,7 @@ public GivenThatWeWantToPublishAnAotApp(ITestOutputHelper log) : base(log) { } - [RequiresMSBuildVersionTheory("17.0.0.32901")] + [RequiresMSBuildVersionTheory("17.8.0")] [MemberData(nameof(Net7Plus), MemberType = typeof(PublishTestUtils))] public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string targetFramework) { @@ -72,7 +72,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string .And.HaveStdOutContaining("Hello World"); } - [RequiresMSBuildVersionTheory("17.0.0.32901")] + [RequiresMSBuildVersionTheory("17.8.0")] [MemberData(nameof(Net7Plus), MemberType = typeof(PublishTestUtils))] public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_false(string targetFramework) {