Skip to content

Commit 600db18

Browse files
JL03-YueJL03-Yue
authored
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#33067)
2 parents b190815 + 132c38c commit 600db18

16 files changed

+137
-1
lines changed

‎src/Tasks/Common/Resources/Strings.resx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,7 @@ You may need to build the project on another operating system or architecture, o
869869
</data>
870870
<data name="ImplicitRuntimeIdentifierResolutionForPublishPropertyFailed" xml:space="preserve">
871871
<value>NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly.</value>
872-
<comment>{StrBegin="NETSDK1191: "}</comment>
872+
<comment>{StrBegin="NETSDK1191: "}</comment>
873873
</data>
874874
<data name="Net7NotCompatibleWithDev173" xml:space="preserve">
875875
<value>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</value>
@@ -891,4 +891,8 @@ You may need to build the project on another operating system or architecture, o
891891
<value>NETSDK1198: A publish profile with the name '{0}' was not found in the project. Set the PublishProfile property to a valid file name.</value>
892892
<comment>{StrBegin="NETSDK1198: "}</comment>
893893
</data>
894+
<data name="WorkloadIsEol" xml:space="preserve">
895+
<value>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</value>
896+
<comment>{StrBegin="NETSDK1202: "}</comment>
897+
</data>
894898
</root>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: Odkazované sestavení se zkompilovalo pomocí novější verze Microsoft.Windows.SDK.NET.dll. Pokud chcete odkazovat na toto sestavení, aktualizujte prosím novější sadu .NET SDK.</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: Eine referenzierte Assembly wurde mit einer neueren Version von "Microsoft.Windows.SDK.NET.dll" kompiliert. Aktualisieren Sie auf ein neueres .NET SDK, um auf diese Assembly zu verweisen.</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: Un ensamblado al que se hace referencia se compiló con una versión más reciente de Microsoft.Windows.SDK.NET.dll. Actualice a un SDK de .NET más reciente para hacer referencia a este ensamblado.</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: un assembly de référence a été compilé à l'aide d'une version plus récente de Microsoft.Windows.SDK.NET.dll. Effectuez une mise à jour vers un kit SDK .NET plus récent pour référencer cet assembly.</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: un assembly di riferimento è stato compilato con una versione più recente di Microsoft.Windows.SDK.NET.dll. Eseguire l'aggiornamento a un SDK .NET più recente per fare riferimento a questo assembly.</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: 参照アセンブリは、より新しいバージョンの Microsoft.Windows.SDK.NET.dll を使用してコンパイルされています。このアセンブリを参照するには、より新しい .NET SDK に更新してください。</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: 참조된 어셈블리가 최신 버전의 Microsoft.Windows.SDK.NET.dll을 사용하여 컴파일되었습니다. 이 어셈블리를 참조하려면 최신 .NET SDK로 업데이트하세요.</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: Przywoływany zestaw został skompilowany przy użyciu nowszej wersji biblioteki Microsoft.Windows.SDK.NET.dll. Aby odwoływać się do tego zestawu, zaktualizuj do nowszego zestawu .NET SDK.</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: um assembly referenciado foi compilado usando uma versão mais recente do Microsoft.Windows.SDK.NET.dll. Atualize para um SDK do .NET mais recente para referenciar este assembly.</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

‎src/Tasks/Common/Resources/xlf/Strings.ru.xlf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: сборка, на которую указывает ссылка, была скомпилирована с помощью более новой версии Microsoft.Windows.SDK.NET.dll. Обновите пакет SDK для .NET до более поздней версии, чтобы можно было ссылаться на эту сборку.</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

‎src/Tasks/Common/Resources/xlf/Strings.tr.xlf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: Başvurulan bütünleştirilmiş kod, Microsoft.Windows.SDK.NET.dll'nin daha yeni bir sürümü kullanılarak derlendi. Bu bütünleştirilmiş koda başvurmak için lütfen daha yeni bir .NET SDK'ya güncelleştirin.</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

‎src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: 使用更新版本的 Microsoft.Windows.SDK.NET.dll 编译了引用的程序集。请更新为更新的 .NET SDK 以引用此程序集。</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

‎src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ The following are names of parameters or literal values and should not be transl
975975
<target state="translated">NETSDK1148: 參考的組件是使用 Microsoft.Windows.SDK.NET.dll 的較新版本編譯的。若要參考此組件，請更新至較新的 .NET SDK。</target>
976976
<note>{StrBegin="NETSDK1148: "}</note>
977977
</trans-unit>
978+
<trans-unit id="WorkloadIsEol">
979+
<source>NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</source>
980+
<target state="new">NETSDK1202: The workload '{0}' is out of support and will not receive security updates in the future. Please refer to {1} for more information about the support policy.</target>
981+
<note>{StrBegin="NETSDK1202: "}</note>
982+
</trans-unit>
978983
<trans-unit id="WorkloadNotAvailable">
979984
<source>NETSDK1178: The project depends on the following workload packs that do not exist in any of the workloads available in this installation: {0}
980985
You may need to build the project on another operating system or architecture, or update the .NET SDK.</source>

‎src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1313
<PropertyGroup>
1414
<!-- Default the check to true, but allow developers to turn the warning off. -->
1515
<CheckEolTargetFramework Condition="'$(CheckEolTargetFramework)' == ''">true</CheckEolTargetFramework>
16+
<CheckEolWorkloads Condition="'$(CheckEolWorkloads)' == ''">true</CheckEolWorkloads>
1617
</PropertyGroup>
1718

1819
<!--
@@ -28,4 +29,10 @@ Copyright (c) .NET Foundation. All rights reserved.
2829
<NETSdkWarning ResourceName="TargetFrameworkIsEol"
2930
FormatArguments="$(TargetFramework.ToLowerInvariant());https://aka.ms/dotnet-core-support" />
3031
</Target>
32+
33+
<Target Name="_CheckForEolWorkloads" AfterTargets="_CheckForUnsupportedNETCoreVersion"
34+
Condition="'@(EolWorkload)' != '' and '$(CheckEolWorkloads)' == 'true'">
35+
<NETSdkWarning ResourceName="WorkloadIsEol"
36+
FormatArguments="%(EolWorkload.Identity);$([MSBuild]::ValueOrDefault('%(EolWorkload.Url)', 'https://aka.ms/dotnet-core-support'))" />
37+
</Target>
3138
</Project>

0 commit comments

Comments
 (0)