Skip to content

Commit 8a5970f

Browse files
authored
Fix "NETSDK1214" referring to existing diagnostic (#44175)
2 parents b29f7ce + 9a1c62a commit 8a5970f

File tree

15 files changed

+276
-274
lines changed

15 files changed

+276
-274
lines changed

src/Tasks/Common/Resources/Strings.resx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -944,10 +944,7 @@ You may need to build the project on another operating system or architecture, o
944944
<value>NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported.</value>
945945
<comment>{StrBegin="NETSDK1213: "}</comment>
946946
</data>
947-
<data name="PreferNativeArm64IgnoredForNetCoreApp" xml:space="preserve">
948-
<value>NETSDK1214: PreferNativeArm64 applies only to .NET Framework targets. It is not supported and has no effect for when targeting .NET Core.</value>
949-
<comment>{StrBegin="NETSDK1214: "}</comment>
950-
</data>
947+
<!-- Skipping NETSDK1214 on purpose, as that is "UsingUnsupportedUseUwpFeature" on .NET 8 (see https://github.com/dotnet/sdk/issues/44006) -->
951948
<data name="TargetFrameworkIsNotRecommended" xml:space="preserve">
952949
<value>NETSDK1215: Targeting .NET Standard prior to 2.0 is no longer recommended. See {0} for more details.</value>
953950
<comment>{StrBegin="NETSDK1215: "}</comment>
@@ -976,5 +973,9 @@ You may need to build the project on another operating system or architecture, o
976973
<value>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</value>
977974
<comment>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</comment>
978975
</data>
979-
<!-- The latest message added is MicrosoftNetSdkCompilersToolsetRootEmpty. Please update this value with each PR to catch parallel PRs both adding a new message -->
976+
<data name="PreferNativeArm64IgnoredForNetCoreApp" xml:space="preserve">
977+
<value>NETSDK1222: PreferNativeArm64 applies only to .NET Framework targets. It is not supported and has no effect for when targeting .NET Core.</value>
978+
<comment>{StrBegin="NETSDK1222: "}</comment>
979+
</data>
980+
<!-- The latest message added is PreferNativeArm64IgnoredForNetCoreApp. Please update this value with each PR to catch parallel PRs both adding a new message -->
980981
</root>

src/Tasks/Common/Resources/xlf/Strings.cs.xlf

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.de.xlf

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.es.xlf

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.fr.xlf

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.it.xlf

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.ja.xlf

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.ko.xlf

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.pl.xlf

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)