From f7e24e9ebd281fe3365f01bf968de84e267ec3c4 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 6 Oct 2022 16:58:18 -0700 Subject: [PATCH 1/9] Add RuntimeSpecific --- .../Microsoft.NET.RuntimeIdentifierInference.targets | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets index 84b21ee0dd82..6d1630195c87 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets @@ -61,6 +61,15 @@ Copyright (c) .NET Foundation. All rights reserved. win7-x86 + + true + + + + $(NETCoreSdkPortableRuntimeIdentifier) + <_RuntimeIdentifierInferredFromRuntimeSpecific>true + + true - true + true false <_RuntimeIdentifierUsesAppHost Condition="$(RuntimeIdentifier.StartsWith('ios')) or $(RuntimeIdentifier.StartsWith('tvos')) or $(RuntimeIdentifier.StartsWith('maccatalyst')) or $(RuntimeIdentifier.StartsWith('android')) or $(RuntimeIdentifier.StartsWith('browser'))">false <_RuntimeIdentifierUsesAppHost Condition="'$(_RuntimeIdentifierUsesAppHost)' == ''">true From 27791d24a64fc9fa5e3213205469af103422e5c0 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 7 Oct 2022 09:51:43 -0700 Subject: [PATCH 2/9] Consider that there may not be a target framework --- .../Microsoft.NET.RuntimeIdentifierInference.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets index 6d1630195c87..0d0b5bf66b13 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets @@ -61,7 +61,7 @@ Copyright (c) .NET Foundation. All rights reserved. win7-x86 - + true @@ -133,7 +133,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_SelfContainedWasSpecified Condition="'$(SelfContained)' != ''">true - true + true false <_RuntimeIdentifierUsesAppHost Condition="$(RuntimeIdentifier.StartsWith('ios')) or $(RuntimeIdentifier.StartsWith('tvos')) or $(RuntimeIdentifier.StartsWith('maccatalyst')) or $(RuntimeIdentifier.StartsWith('android')) or $(RuntimeIdentifier.StartsWith('browser'))">false <_RuntimeIdentifierUsesAppHost Condition="'$(_RuntimeIdentifierUsesAppHost)' == ''">true @@ -231,7 +231,7 @@ Copyright (c) .NET Foundation. All rights reserved. ResourceName="Prefer32BitIgnoredForNetCoreApp" /> - false + false @@ -243,7 +243,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + Date: Fri, 7 Oct 2022 14:45:27 -0700 Subject: [PATCH 3/9] Whoops I didn't see the breaking change spec but this should now make SC not default implied --- src/Tasks/Common/Resources/Strings.resx | 4 ++++ .../Microsoft.NET.RuntimeIdentifierInference.targets | 10 +++++++--- .../GivenThatWeWantToUseVB.cs | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx index 1372774cef27..dcfa875db3ed 100644 --- a/src/Tasks/Common/Resources/Strings.resx +++ b/src/Tasks/Common/Resources/Strings.resx @@ -871,4 +871,8 @@ You may need to build the project on another operating system or architecture, o NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets index 0d0b5bf66b13..359a6b5b52ad 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets @@ -61,13 +61,12 @@ Copyright (c) .NET Foundation. All rights reserved. win7-x86 - + true $(NETCoreSdkPortableRuntimeIdentifier) - <_RuntimeIdentifierInferredFromRuntimeSpecific>true true - true + true false <_RuntimeIdentifierUsesAppHost Condition="$(RuntimeIdentifier.StartsWith('ios')) or $(RuntimeIdentifier.StartsWith('tvos')) or $(RuntimeIdentifier.StartsWith('maccatalyst')) or $(RuntimeIdentifier.StartsWith('android')) or $(RuntimeIdentifier.StartsWith('browser'))">false <_RuntimeIdentifierUsesAppHost Condition="'$(_RuntimeIdentifierUsesAppHost)' == ''">true @@ -206,6 +205,11 @@ Copyright (c) .NET Foundation. All rights reserved. + + + diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseVB.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseVB.cs index 4cd4aec6d75c..768c68c764bf 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseVB.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseVB.cs @@ -143,8 +143,8 @@ private static (VBRuntime, string[]) GetExpectedOutputs(string targetFramework, }); case ("netcoreapp3.0", false): - return (VBRuntime.Referenced, new[] - { + return (VBRuntime.Referenced, new[] + { "HelloWorld.dll", "HelloWorld.pdb", "HelloWorld.deps.json", From d182b4573e476fc147b0afd771a17b83b8ea5c34 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 7 Oct 2022 15:06:33 -0700 Subject: [PATCH 4/9] Update xlf --- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.de.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.es.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.it.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 5 +++++ src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 5 +++++ 13 files changed, 65 insertions(+) diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index 2bac98ba8b0c..21109699dfca 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: Zadejte parametr RuntimeIdentifier. {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: Soubor seznamu modulu runtime {0} nebyl nalezen. Tady můžete tuto chybu nahlásit týmu .NET: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index 0ebf4b06648f..3f464ec75e5d 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: Geben Sie einen RuntimeIdentifier an. {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: Die Runtimelistendatei "{0}" wurde nicht gefunden. Melden Sie diesen Fehler hier dem .NET-Team: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index 897554ebb2d2..b28bb82eb522 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: Especificar un valor para RuntimeIdentifier {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: No se encontró el archivo de lista del entorno de ejecución "{0}". Notifique este error al equipo de .NET aquí: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index 4533fda698a9..0458ffa7f49e 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: Spécifiez un RuntimeIdentifier {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: Le fichier de liste de runtime '{0}' est introuvable. Signalez cette erreur à l'équipe .NET ici : https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 687dc87da471..444f78cff0ed 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: specificare un elemento RuntimeIdentifier {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: il file di elenco di runtime '{0}' non è stato trovato. Segnalare questo errore al team di .NET all'indirizzo: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index bddaee936f98..3616c6553309 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: RuntimeIdentifier の指定 {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: ランタイム リスト ファイル '{0}' が見つかりませんでした。https://aka.ms/dotnet-sdk-issue で、このエラーを .NET チームに報告してください。 diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index 0a01db3d5c76..cca2f28e6b15 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: RuntimeIdentifier 지정 {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: 런타임 목록 파일 '{0}'을(를) 찾을 수 없습니다. https://aka.ms/dotnet-sdk-issue에서 .NET 팀에 이 오류를 보고하세요. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index 6d0986d2a2cb..7a912f2333ad 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: Określ element RuntimeIdentifier {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: Nie odnaleziono pliku listy środowiska uruchomieniowego „{0}”. Zgłoś ten błąd zespołowi platformy .NET tutaj: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index 6c6a36e5fa1d..7a78ad646fe4 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: Especifique um RuntimeIdentifier {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: o arquivo da lista de runtime '{0}' não foi encontrado. Relate esse erro à equipe do .NET aqui: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index d3347bdbe6f4..6ce089cf6591 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: укажите RuntimeIdentifier {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: не найден файл списка среды выполнения "{0}". Сообщите об этой ошибке группе разработчиков .NET по следующему адресу: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 9e284d7e47ce..d9d6b2922d20 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: Bir RuntimeIdentifier belirtin {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: '{0}' çalışma zamanı listesi dosyası bulunamadı. Bu hatayı https://aka.ms/dotnet-sdk-issue adresinden .NET ekibine bildirin. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index ac1932748860..11c4cf888b47 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: 指定一个 RuntimeIdentifier {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: 找不到运行时列表文件“{0}”。请在此处将此错误报告给 .NET 团队: https://aka.ms/dotnet-sdk-issue。 diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index b1e292eb81ad..9396ccead2fe 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -765,6 +765,11 @@ The following are names of parameters or literal values and should not be transl NETSDK1028: 指定 RuntimeIdentifier {StrBegin="NETSDK1028: "} + + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1192: "} + NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. NETSDK1109: 找不到執行階段清單檔案 '{0}'。請將此錯誤回報給 .NET 小組: https://aka.ms/dotnet-sdk-issue。 From 04e421b798802c8f10532f29b5b0a495e4517ae5 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 7 Oct 2022 16:47:59 -0700 Subject: [PATCH 5/9] Add tests, but some are NET 8.0 so they break --- ...oft.NET.RuntimeIdentifierInference.targets | 4 +- ...GivenThatWeWantToBuildASelfContainedApp.cs | 178 +++++++++++++----- .../RuntimeIdentifiersTests.cs | 74 ++++++++ 3 files changed, 204 insertions(+), 52 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets index 359a6b5b52ad..8587e55f03ce 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets @@ -66,7 +66,7 @@ Copyright (c) .NET Foundation. All rights reserved. - $(NETCoreSdkPortableRuntimeIdentifier) + $(NETCoreSdkRuntimeIdentifier) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs index 5e4d21f01334..a37d8f57c539 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs @@ -99,21 +99,21 @@ public void It_errors_out_when_RuntimeIdentifier_architecture_and_PlatformTarget const string PlatformTarget = "x86"; var testAsset = _testAssetsManager - .CopyTestAsset("HelloWorld") - .WithSource() - .WithProjectChanges(project => - { - var ns = project.Root.Name.Namespace; - var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); - propertyGroup.Add(new XElement(ns + "RuntimeIdentifier", RuntimeIdentifier)); + .CopyTestAsset("HelloWorld") + .WithSource() + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + propertyGroup.Add(new XElement(ns + "RuntimeIdentifier", RuntimeIdentifier)); propertyGroup.Add(new XElement(ns + "PlatformTarget", PlatformTarget)); - }); + }); - var buildCommand = new BuildCommand(testAsset); + var buildCommand = new BuildCommand(testAsset); - buildCommand - .Execute() - .Should() + buildCommand + .Execute() + .Should() .Fail() .And.HaveStdOutContaining(string.Format( Strings.CannotHaveRuntimeIdentifierPlatformMismatchPlatformTarget, @@ -121,41 +121,41 @@ public void It_errors_out_when_RuntimeIdentifier_architecture_and_PlatformTarget PlatformTarget)); } - [Fact] - public void It_succeeds_when_RuntimeIdentifier_and_PlatformTarget_mismatch_but_PT_is_AnyCPU() - { - var targetFramework = ToolsetInfo.CurrentTargetFramework; - var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); - var testAsset = _testAssetsManager - .CopyTestAsset("HelloWorld") - .WithSource() - .WithProjectChanges(project => - { - var ns = project.Root.Name.Namespace; - var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); - propertyGroup.Add(new XElement(ns + "RuntimeIdentifier", runtimeIdentifier)); - propertyGroup.Add(new XElement(ns + "PlatformTarget", "AnyCPU")); - }); - - var buildCommand = new BuildCommand(testAsset); - - buildCommand - .Execute() - .Should() - .Pass(); - - var outputDirectory = buildCommand.GetOutputDirectory(targetFramework, runtimeIdentifier: runtimeIdentifier); - var selfContainedExecutable = $"HelloWorld{Constants.ExeSuffix}"; - - string selfContainedExecutableFullPath = Path.Combine(outputDirectory.FullName, selfContainedExecutable); + [Fact] + public void It_succeeds_when_RuntimeIdentifier_and_PlatformTarget_mismatch_but_PT_is_AnyCPU() + { + var targetFramework = ToolsetInfo.CurrentTargetFramework; + var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); + var testAsset = _testAssetsManager + .CopyTestAsset("HelloWorld") + .WithSource() + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + propertyGroup.Add(new XElement(ns + "RuntimeIdentifier", runtimeIdentifier)); + propertyGroup.Add(new XElement(ns + "PlatformTarget", "AnyCPU")); + }); + + var buildCommand = new BuildCommand(testAsset); + + buildCommand + .Execute() + .Should() + .Pass(); + + var outputDirectory = buildCommand.GetOutputDirectory(targetFramework, runtimeIdentifier: runtimeIdentifier); + var selfContainedExecutable = $"HelloWorld{Constants.ExeSuffix}"; + + string selfContainedExecutableFullPath = Path.Combine(outputDirectory.FullName, selfContainedExecutable); new RunExeCommand(Log, selfContainedExecutableFullPath) - .Execute() - .Should() - .Pass() - .And - .HaveStdOutContaining("Hello World!"); - } + .Execute() + .Should() + .Pass() + .And + .HaveStdOutContaining("Hello World!"); + } [RequiresMSBuildVersionFact("17.0.0.32901")] public void It_resolves_runtimepack_from_packs_folder() @@ -317,7 +317,7 @@ static int Last2DigitsTo0(int versionBuild) "); // Verify correct targeting pack version is resolved - var getValuesCommand = (GetValuesCommand) new GetValuesCommand(testAsset, "TargetingPack", GetValuesCommand.ValueType.Item) + var getValuesCommand = (GetValuesCommand)new GetValuesCommand(testAsset, "TargetingPack", GetValuesCommand.ValueType.Item) .WithEnvironmentVariable(EnvironmentVariableNames.WORKLOAD_MANIFEST_ROOTS, manifestRoot); getValuesCommand.MetadataNames = new List() { "NuGetPackageId", "NuGetPackageVersion" }; getValuesCommand.DependsOnTargets = "ProcessFrameworkReferences"; @@ -351,19 +351,22 @@ static int Last2DigitsTo0(int versionBuild) [Theory] [InlineData("net6.0")] - public void It_can_publish_runtime_specific_apps_with_library_dependencies_self_contained(string targetFramework) { + public void It_can_publish_runtime_specific_apps_with_library_dependencies_self_contained(string targetFramework) + { // create a basic library and a basic app, reference the library from the app and then // publish the app with a RID specified and self-contained. // verify that no warnings about missing the --self-contained flag are emitted. var rid = EnvironmentInfo.GetCompatibleRid(targetFramework); - var libProject = new TestProject("RidSelfContainedLib"){ + var libProject = new TestProject("RidSelfContainedLib") + { IsExe = false, TargetFrameworks = targetFramework, IsSdkProject = true }; var createdLibProject = _testAssetsManager.CreateTestProject(libProject); - var appProject = new TestProject("RidSelfContainedApp") { + var appProject = new TestProject("RidSelfContainedApp") + { IsExe = true, TargetFrameworks = targetFramework, IsSdkProject = true @@ -371,7 +374,82 @@ public void It_can_publish_runtime_specific_apps_with_library_dependencies_self_ appProject.ReferencedProjects.Add(libProject); var createdAppProject = _testAssetsManager.CreateTestProject(appProject); var publishCommand = new PublishCommand(createdAppProject); - publishCommand.Execute(new [] {"-property:SelfContained=true", "-property:_CommandLineDefinedSelfContained=true", $"-property:RuntimeIdentifier={rid}", "-property:_CommandLineDefinedRuntimeIdentifier=true" }).Should().Pass().And.NotHaveStdOutContaining("warning"); + publishCommand.Execute(new[] { "-property:SelfContained=true", "-property:_CommandLineDefinedSelfContained=true", $"-property:RuntimeIdentifier={rid}", "-property:_CommandLineDefinedRuntimeIdentifier=true" }).Should().Pass().And.NotHaveStdOutContaining("warning"); + } + + [Theory] + [InlineData("net7.0")] + [InlineData("net8.0")] + public void It_does_or_doesnt_imply_SelfContained_based_on_RuntimeIdentifier_and_TargetFramework(string targetFramework) + { + var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); + var testAsset = _testAssetsManager + .CopyTestAsset("HelloWorld") + .WithSource() + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + propertyGroup.Add(new XElement(ns + "RuntimeIdentifier", runtimeIdentifier)); + }); + + var buildCommand = new BuildCommand(testAsset); + buildCommand + .Execute() + .Should() + .Pass(); + + var outputDirectory = buildCommand.GetOutputDirectory(targetFramework, runtimeIdentifier: runtimeIdentifier); + var selfContainedExecutable = $"HelloWorld{Constants.ExeSuffix}"; + string selfContainedExecutableFullPath = Path.Combine(outputDirectory.FullName, selfContainedExecutable); + + if (targetFramework == "net7.0") + { + Assert.True(File.Exists(selfContainedExecutableFullPath)); + } + else + { + Assert.False(File.Exists(selfContainedExecutableFullPath)); // RuntimeIdentifier no longer implies SelfContained for TFM >= 8 + } + } + + [Theory] + [InlineData("net7.0", true)] + [InlineData("net7.0", false)] + [InlineData("net8.0", false)] + public void It_does_or_doesnt_warn_based_on_SelfContained_and_TargetFramework_breaking_RID_change(string targetFramework, bool defineSelfContained) + { + var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); + var testAsset = _testAssetsManager + .CopyTestAsset("HelloWorld") + .WithSource() + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + propertyGroup.Add(new XElement(ns + "RuntimeIdentifier", runtimeIdentifier)); + propertyGroup.Add(new XElement(ns + "SelfContained", defineSelfContained ? "true" : "")); + }); + + var buildCommand = new BuildCommand(testAsset); + var commandResult = buildCommand.Execute(); + + if (targetFramework == "net7.0" && !defineSelfContained) + { + commandResult + .Should() + .Pass() + .And + .HaveStdOutContaining(Strings.RuntimeIdentifierWillNoLongerImplySelfContained); + } + else + { + commandResult + .Should() + .Pass() + .And + .NotHaveStdOutContaining(Strings.RuntimeIdentifierWillNoLongerImplySelfContained); + } } [Theory] diff --git a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs index facaa4ac7ce5..6c0da5a4383d 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs @@ -3,9 +3,11 @@ using System; using System.Collections.Generic; +using System.Formats.Asn1; using System.IO; using System.Linq; using System.Text; +using System.Xml.Linq; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.NET.TestFramework; @@ -14,13 +16,24 @@ using Microsoft.NET.TestFramework.ProjectConstruction; using Xunit; using Xunit.Abstractions; +using Xunit.Sdk; namespace Microsoft.NET.Publish.Tests { public class RuntimeIdentifiersTests : SdkTest { + + TestProject _testProject; + public RuntimeIdentifiersTests(ITestOutputHelper log) : base(log) { + _testProject = new TestProject("TestProject") + { + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, + IsExe = true + }; + + _testProject.RecordProperties("RuntimeIdentifier", "SelfContained", "RuntimeIdentifiers"); } // Run on core MSBuild only as using a local packages folder hits long path issues on full MSBuild @@ -218,5 +231,66 @@ public void DuplicateRuntimeIdentifiers() .Pass(); } + + [Theory] + [InlineData("net7.0", "true")] + [InlineData("net7.0", "")] + [InlineData("net8.0", "")] + [InlineData("net8.0", "true")] + [InlineData("net8.0", "false")] + public void RuntimeSpecificEnablesOrDisablesRuntimeIdentifierByDefaultBasedOnValueAndTargetFramework(string targetFramework, string runtimeSpecific) + { + TestAsset testAsset = _testAssetsManager.CreateTestProject(_testProject, identifier: $"{targetFramework}_{runtimeSpecific}") + .WithTargetFramework(targetFramework) + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + propertyGroup.Add(new XElement(ns + "RuntimeSpecific", runtimeSpecific)); + }); + + var expectedRuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); + new DotnetBuildCommand(testAsset) + .Execute($"/p:NETCoreSdkRuntimeIdentifier={expectedRuntimeIdentifier}") + .Should() + .Pass(); + + if ((runtimeSpecific != "false" && targetFramework == "net8.0") || runtimeSpecific == "true" && targetFramework == "net7.0") + { + var properties = _testProject.GetPropertyValues(testAsset.TestRoot, targetFramework: targetFramework, runtimeIdentifier: expectedRuntimeIdentifier); + var resolvedRid = properties["RuntimeIdentifier"]; + Assert.True(resolvedRid == expectedRuntimeIdentifier); + } + else + { + var properties = _testProject.GetPropertyValues(testAsset.TestRoot, targetFramework: targetFramework); + var resolvedRid = properties["RuntimeIdentifier"]; + Assert.True(resolvedRid == ""); + } + } + + [Fact] + public void RuntimeIdentifiersDisablesRuntimeSpecificFDDBehavior() + { + string targetFramework = "net8.0"; + var expectedRuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); + TestAsset testAsset = _testAssetsManager.CreateTestProject(_testProject, identifier: $"RuntimeIdentifierS_{targetFramework}") // the S is intentional to call atention to it + .WithTargetFramework(targetFramework) + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + propertyGroup.Add(new XElement(ns + "RuntimeIdentifiers", $"{expectedRuntimeIdentifier};{expectedRuntimeIdentifier}")); + }); + + new DotnetBuildCommand(testAsset) + .Execute($"/p:NETCoreSdkRuntimeIdentifier={expectedRuntimeIdentifier}") + .Should() + .Pass(); + + var properties = _testProject.GetPropertyValues(testAsset.TestRoot, targetFramework: targetFramework, runtimeIdentifier: expectedRuntimeIdentifier); + var resolvedRid = properties["RuntimeIdentifier"]; + Assert.True(resolvedRid == ""); + } } } From 3d0dc5636c0335ab50e810a9a95c61ee4ee6e4e6 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 7 Oct 2022 16:56:28 -0700 Subject: [PATCH 6/9] Make fact a theory so I can revert then re-revert the 8.0 tests into a PR --- .../Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs index 6c0da5a4383d..eac303fbd2a1 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs @@ -269,10 +269,10 @@ public void RuntimeSpecificEnablesOrDisablesRuntimeIdentifierByDefaultBasedOnVal } } - [Fact] - public void RuntimeIdentifiersDisablesRuntimeSpecificFDDBehavior() + [Theory] + [InlineData("net7.0")] + public void RuntimeIdentifiersDisablesRuntimeSpecificFDDBehavior(string targetFramework) { - string targetFramework = "net8.0"; var expectedRuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); TestAsset testAsset = _testAssetsManager.CreateTestProject(_testProject, identifier: $"RuntimeIdentifierS_{targetFramework}") // the S is intentional to call atention to it .WithTargetFramework(targetFramework) From bf3d53d0896d1fe536be492db60214cca118cb4d Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 7 Oct 2022 16:57:27 -0700 Subject: [PATCH 7/9] oops wrong framework hahahahaaaaaa --- .../Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs index eac303fbd2a1..cc3557e0e0d3 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs @@ -270,7 +270,7 @@ public void RuntimeSpecificEnablesOrDisablesRuntimeIdentifierByDefaultBasedOnVal } [Theory] - [InlineData("net7.0")] + [InlineData("net8.0")] public void RuntimeIdentifiersDisablesRuntimeSpecificFDDBehavior(string targetFramework) { var expectedRuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); From 7be26403e013d2b96ec3e655563484c7b518ab5c Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 7 Oct 2022 16:58:11 -0700 Subject: [PATCH 8/9] Meet your demise, 8.0 tests --- .../GivenThatWeWantToBuildASelfContainedApp.cs | 1 - .../Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs index a37d8f57c539..9b84620956c4 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs @@ -416,7 +416,6 @@ public void It_does_or_doesnt_imply_SelfContained_based_on_RuntimeIdentifier_and [Theory] [InlineData("net7.0", true)] [InlineData("net7.0", false)] - [InlineData("net8.0", false)] public void It_does_or_doesnt_warn_based_on_SelfContained_and_TargetFramework_breaking_RID_change(string targetFramework, bool defineSelfContained) { var runtimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); diff --git a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs index cc3557e0e0d3..af77243565a1 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs @@ -235,9 +235,6 @@ public void DuplicateRuntimeIdentifiers() [Theory] [InlineData("net7.0", "true")] [InlineData("net7.0", "")] - [InlineData("net8.0", "")] - [InlineData("net8.0", "true")] - [InlineData("net8.0", "false")] public void RuntimeSpecificEnablesOrDisablesRuntimeIdentifierByDefaultBasedOnValueAndTargetFramework(string targetFramework, string runtimeSpecific) { TestAsset testAsset = _testAssetsManager.CreateTestProject(_testProject, identifier: $"{targetFramework}_{runtimeSpecific}") @@ -270,7 +267,7 @@ public void RuntimeSpecificEnablesOrDisablesRuntimeIdentifierByDefaultBasedOnVal } [Theory] - [InlineData("net8.0")] + [InlineData("net7.0")] public void RuntimeIdentifiersDisablesRuntimeSpecificFDDBehavior(string targetFramework) { var expectedRuntimeIdentifier = EnvironmentInfo.GetCompatibleRid(targetFramework); From c30299240d5254adc106abcc306f14dbb39e077a Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 10 Oct 2022 12:46:48 -0700 Subject: [PATCH 9/9] Update xlf --- 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 +++--- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index f85b3858e17c..d2f62f865c7e 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index f3ca1ef12e1f..fe022560a2d4 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index 0aca94813ab8..86b1ea332f79 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index e34492f21686..e19e624179d5 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 31947e44bec7..0e93e2e91767 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index 60fc879b2249..a6a16bfba363 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index 4e12f5588f4f..7ab275b3463b 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index 1fe08d6af812..19610c9c189d 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index 40cddd24bb34..0f4a05da01fc 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 5b3ff7c627dd..dcb95e4d632d 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index a79f44e7aa92..358dd0761ab3 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index f7740a50d2a2..478418c4f0f8 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index a20176d5eaf0..e187b536e372 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -771,9 +771,9 @@ The following are names of parameters or literal values and should not be transl {StrBegin="NETSDK1028: "} - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - NETSDK1192: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. - {StrBegin="NETSDK1192: "} + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + NETSDK1193: In projects with TargetFrameworks >= 8.0, RuntimeIdentifier no longer automatically implies SelfContained. To preserve a project's current behavior after upgrading to 8.0, consider setting SelfContained explicitly. + {StrBegin="NETSDK1193: "} NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET team here: https://aka.ms/dotnet-sdk-issue.