From 666d5997fc360ab037ac639cdbf1c500c1d639c3 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 13 Jun 2023 20:06:31 -0700 Subject: [PATCH 1/2] Fix duplicate NETSDK1183 --- src/Tasks/Common/Resources/Strings.resx | 8 ++++---- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.de.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.es.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.it.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 6 +++--- 14 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx index 0d11811dee13..59c1c838a817 100644 --- a/src/Tasks/Common/Resources/Strings.resx +++ b/src/Tasks/Common/Resources/Strings.resx @@ -835,10 +835,6 @@ You may need to build the project on another operating system or architecture, o NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. {StrBegin="NETSDK1182: "} - - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} - NETSDK1184: The Targeting Pack for FrameworkReference '{0}' was not available. This may be because DisableTransitiveFrameworkReferenceDownloads was set to true. {StrBegin="NETSDK1184: "} @@ -928,4 +924,8 @@ You may need to build the project on another operating system or architecture, o NETSDK1206: Found version-specific or distribution-specific runtime identifier(s): {0}. Affected libraries: {1}. In .NET 8.0 and higher, assets for version-specific and distribution-specific runtime identifiers will not be found by default. See https://aka.ms/dotnet/rid-usage for details. {StrBegin="NETSDK1206: "} + + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} + diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index b4851753452c..e09c72c09845 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index 6f23c2b9f412..b7c5a8819ffb 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index cee9167cc65f..845c280cb212 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index 4a62f2161dae..9b67d1b7b85f 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 59e53c99cf1c..3c1aa0eb7d33 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index ef6d71c6dc51..3c1301bc78f8 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index 8ffe5c4dee9a..79e91efab8f4 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index c4e51eea0c8c..378ff94484c8 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index 16cd92673b8f..20702b460987 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 87e537786e31..f73985af18ba 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 96d8bb832c14..4558b9db27de 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index dabe24f5cff9..13921fcca57a 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index f3eda8b000c8..85f9f9d6010e 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -18,9 +18,9 @@ {StrBegin="NETSDK1204: "} - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - NETSDK1183: Ahead-of-time compilation is not supported for the target framework. - {StrBegin="NETSDK1183: "} + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + NETSDK1207: Ahead-of-time compilation is not supported for the target framework. + {StrBegin="NETSDK1207: "} NETSDK1203: Ahead-of-time compilation is not supported for the target runtime identifier '{0}'. From 113211f499e65790c13eea699d0f83a8bf2b1705 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 13 Jun 2023 22:35:27 -0700 Subject: [PATCH 2/2] Fix failed tests --- .../GivenThatWeWantToPublishAnAotApp.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index b53e1b31bf61..a2cda1c69c42 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -482,7 +482,7 @@ public void NativeAot_hw_fails_with_sdk6_PublishAot_is_enabled() publishCommand .Execute($"/p:UseCurrentRuntimeIdentifier=true") .Should().Fail() - .And.HaveStdOutContaining("error NETSDK1183:"); + .And.HaveStdOutContaining("error NETSDK1207:"); } } @@ -506,7 +506,7 @@ public void NativeAot_hw_fails_with_sdk6_PackageReference_PublishAot_is_enabled( publishCommand .Execute($"/p:UseCurrentRuntimeIdentifier=true") .Should().Fail() - .And.HaveStdOutContaining("error NETSDK1183:"); + .And.HaveStdOutContaining("error NETSDK1207:"); } }