Skip to content

[automated] Merge branch 'release/7.0.2xx' => 'main' #28397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
415a006
Add warning when targeting 7.0 in 17.3 and remove 7.0 from the list o…
marcpopMSFT Sep 28, 2022
a26437e
Fix up tests that include the new target net7 on 17.3 warning to only…
marcpopMSFT Sep 29, 2022
e84c3b3
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Sep 30, 2022
cfeaade
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Sep 30, 2022
8fe815e
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Oct 2, 2022
dd73ec2
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 3, 2022
4ac991d
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Oct 3, 2022
6546a08
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Oct 3, 2022
d78703a
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 3, 2022
fe2506d
Switch to 7.0.2xx for loc build
marcpopMSFT Oct 3, 2022
43c11d5
Merge pull request #28281 from dotnet/darc-release/7.0.1xx-4fbca2af-5…
nagilson Oct 3, 2022
67450ed
Merge pull request #28299 from dotnet/darc-release/7.0.1xx-729c0823-d…
nagilson Oct 3, 2022
2213562
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 3, 2022
3a84ddc
Update dependencies from https://github.com/nuget/nuget.client build …
dotnet-maestro[bot] Oct 4, 2022
9544a19
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 4, 2022
f47a731
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 4, 2022
cec89fb
Fix msbuild evaluation of ApiCompat task pkg (#28301)
ViktorHofer Oct 4, 2022
4dcce16
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Oct 4, 2022
4f16f59
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Oct 4, 2022
debb231
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 4, 2022
a500afd
Merge pull request #28314 from dotnet/darc-release/7.0.1xx-0b4cce48-f…
nagilson Oct 4, 2022
258ccc2
Merge pull request #28305 from dotnet/darc-release/7.0.1xx-5cff5798-8…
marcpopMSFT Oct 4, 2022
4fc7429
Merge pull request #28309 from dotnet/darc-release/7.0.1xx-e8da1fe8-0…
marcpopMSFT Oct 4, 2022
8d23cce
Fix message to trigger on earlier than 17.4 rather than 17.3.
marcpopMSFT Oct 4, 2022
ca57572
Merge pull request #28320 from dotnet/darc-release/7.0.1xx-852fc7af-3…
nagilson Oct 4, 2022
658cd8d
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 4, 2022
d56a227
Merge pull request #28318 from dotnet/darc-release/7.0.1xx-e6470046-6…
nagilson Oct 4, 2022
0983593
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 4, 2022
045b56d
VisualStudioVersion is actually 17.0 in the VS command prompt even in…
marcpopMSFT Oct 4, 2022
7f13cee
Merge pull request #28328 from dotnet/darc-release/7.0.1xx-1391960f-f…
marcpopMSFT Oct 4, 2022
42f7cec
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 4, 2022
6ddce59
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 5, 2022
4450739
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 5, 2022
96795fc
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Oct 5, 2022
27a902a
Merge pull request #28331 from dotnet/darc-release/7.0.1xx-1703c3a2-e…
nagilson Oct 5, 2022
ed348cf
Merge pull request #28335 from dotnet/darc-release/7.0.1xx-788e1443-b…
nagilson Oct 5, 2022
2fcce3d
Revert the test changes that are no longer needed because of the prio…
marcpopMSFT Oct 5, 2022
81fa239
Update dependencies from https://github.com/dotnet/roslyn build 20221…
dotnet-maestro[bot] Oct 6, 2022
a6699ff
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 6, 2022
e406732
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 6, 2022
983e15d
Update dependencies from https://github.com/dotnet/roslyn build 20221…
dotnet-maestro[bot] Oct 6, 2022
4996ae6
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 6, 2022
32c7109
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 6, 2022
861ace1
Update dependencies from https://github.com/dotnet/roslyn build 20221…
dotnet-maestro[bot] Oct 6, 2022
fddcf5a
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Oct 6, 2022
f8c153b
Update dependencies from https://github.com/dotnet/format build 20221…
dotnet-maestro[bot] Oct 6, 2022
214d29c
Merge pull request #28352 from dotnet/darc-release/7.0.1xx-7af37ebe-d…
nagilson Oct 6, 2022
6a6031a
Merge pull request #28353 from dotnet/darc-release/7.0.1xx-f6647658-7…
nagilson Oct 6, 2022
f153a54
Merge pull request #28359 from dotnet/darc-release/7.0.1xx-68ba38b4-5…
nagilson Oct 6, 2022
8ea7b5e
Merge pull request #28361 from dotnet/darc-release/7.0.1xx-b4c839f4-9…
nagilson Oct 6, 2022
b0fdbda
Update dependencies from https://github.com/dotnet/msbuild build 2022…
dotnet-maestro[bot] Oct 6, 2022
133529d
[release/7.0.1xx] Add missing EnableRuleAttributesMustMatch task prop…
ViktorHofer Oct 6, 2022
06f0705
Update dependencies from https://github.com/dotnet/msbuild build 2022…
dotnet-maestro[bot] Oct 6, 2022
1ce7f36
Merge pull request #28224 from dotnet/marcpopMSFT-warnonunsupportedta…
marcpopMSFT Oct 6, 2022
a9fe7a0
Merge branch 'release/7.0.2xx' into merge/release/7.0.1xx-to-release/…
marcpopMSFT Oct 6, 2022
3b8ece3
Update dependencies from https://github.com/dotnet/fsharp build 20221…
dotnet-maestro[bot] Oct 6, 2022
48fcaf6
Merge pull request #28304 from dotnet/marcpopMSFT-locbuildto702xx
nagilson Oct 6, 2022
4f3a340
Merge pull request #28371 from dotnet/darc-release/7.0.1xx-b290a7f7-1…
nagilson Oct 6, 2022
7468bf4
Update dependencies from https://github.com/dotnet/roslyn build 20221…
dotnet-maestro[bot] Oct 6, 2022
1015b43
Merge pull request #28374 from dotnet/darc-release/7.0.1xx-885c8e51-1…
nagilson Oct 6, 2022
acb1997
Merge pull request #28367 from dotnet-maestro-bot/merge/release/7.0.1…
marcpopMSFT Oct 6, 2022
a981182
Update dependencies from https://github.com/dotnet/roslyn build 20221…
dotnet-maestro[bot] Oct 6, 2022
5407779
Update dependencies from https://github.com/dotnet/roslyn build 20221…
dotnet-maestro[bot] Oct 7, 2022
2097b7a
Update dependencies from https://github.com/dotnet/roslyn build 20221…
dotnet-maestro[bot] Oct 7, 2022
8852f45
Update dependencies from https://github.com/dotnet/roslyn build 20221…
dotnet-maestro[bot] Oct 7, 2022
b859e99
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 7, 2022
98e60b6
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 7, 2022
dcddd7a
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 7, 2022
dfbf786
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 7, 2022
da0cd38
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 7, 2022
384978b
Update dependencies from https://github.com/dotnet/fsharp build 20221…
dotnet-maestro[bot] Oct 7, 2022
a430258
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 7, 2022
932b4ee
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 7, 2022
129b0ed
Merge pull request #28389 from dotnet/darc-release/7.0.1xx-704f84b8-2…
nagilson Oct 7, 2022
a40df6d
Merge pull request #28388 from dotnet/darc-release/7.0.2xx-ae915708-0…
nagilson Oct 7, 2022
ba4eebd
Merge pull request #28381 from dotnet/darc-release/7.0.1xx-b274861f-0…
nagilson Oct 7, 2022
b5de3a6
Merge pull request #28379 from dotnet/darc-release/7.0.1xx-1a3b9a7a-b…
nagilson Oct 7, 2022
ab1f5f8
Merge pull request #28378 from dotnet/darc-release/7.0.2xx-9562e4fe-d…
nagilson Oct 7, 2022
181e3f3
Merge pull request #28354 from dotnet/darc-release/7.0.2xx-34991cf7-1…
nagilson Oct 7, 2022
878bcb8
Merge remote-tracking branch 'upstream/release/7.0.2xx' into darc-rel…
nagilson Oct 7, 2022
cf039a8
Merge pull request #28345 from dotnet/darc-release/7.0.2xx-9a9d5869-2…
nagilson Oct 7, 2022
f4ed069
Merge branch 'release/7.0.2xx' into merge/release/7.0.1xx-to-release/…
marcpopMSFT Oct 7, 2022
894fbd9
Merge pull request #28375 from dotnet/darc-release/7.0.2xx-57ad5c53-e…
nagilson Oct 7, 2022
85a7107
Merge pull request #28392 from dotnet-maestro-bot/merge/release/7.0.1…
marcpopMSFT Oct 7, 2022
de5998e
Update dependencies from https://github.com/dotnet/fsharp build 20221…
dotnet-maestro[bot] Oct 7, 2022
13302d3
Merge pull request #28402 from dotnet/darc-release/7.0.2xx-d6b1d9df-5…
v-wuzhai Oct 8, 2022
440b88f
Merge branch 'release/7.0.2xx'
v-wuzhai Oct 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Tasks/Common/Resources/Strings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -871,4 +871,8 @@ You may need to build the project on another operating system or architecture, o
<value>NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly.</value>
<comment>{StrBegin="NETSDK1191: "}</comment>
</data>
<data name="Net7NotCompatibleWithDev173" xml:space="preserve">
<value>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</value>
<comment>{StrBegin="NETSDK1192: "}</comment>
</data>
</root>
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: Cílení na .NET 6.0 nebo vyšší ve Visual Studio 2019 se nepodporuje.</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: Pro zadaný identifikátor RuntimeIdentifier {0} není k dispozici žádný hostitel aplikace.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: .NET 6.0 oder höher wird als Ziel in Visual Studio 2019 nicht unterstützt.</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: Für den angegebenen RuntimeIdentifier "{0}" ist kein Anwendungshost verfügbar.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: No se admite el destino de .NET 6.0 o superior en Visual Studio 2019.</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: No hay ningún host de aplicación disponible para el valor de RuntimeIdentifier especificado "{0}".</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: le ciblage de .NET 6.0 ou plus dans Visual Studio 2019 n’est pas pris en charge.</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: il n'existe aucun d'hôte d'application disponible pour le RuntimeIdentifier spécifié '{0}'.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: la destinazione .NET 6.0 o versione successiva in Visual Studio 2019 non è supportata.</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: non è disponibile alcun host applicazione per l'elemento RuntimeIdentifier specificato '{0}'.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: Visual Studio 2019 では .NET 6.0 以降をターゲットにすることはできません。</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: 指定された RuntimeIdentifier '{0}' で利用できるアプリケーション ホストはありません。</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: Visual Studio 2019에서 .NET 6.0 이상을 대상으로 하는 것은 지원되지 않습니다.</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: 지정된 RuntimeIdentifier '{0}'에 사용할 수 있는 애플리케이션 호스트가 없습니다.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: Platforma docelowa .NET 6.0 lub nowsza w usłudze Visual Studio 2019 nie jest obsługiwana.</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: Brak dostępnej aplikacji hosta dla określonego elementu RuntimeIdentifier „{0}”.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: o direcionamento do .NET 6.0 ou superior no Visual Studio 2019 não é compatível.</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: não há nenhum host do aplicativo disponível para o RuntimeIdentifier especificado '{0}'.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: выбор .NET 6.0 или более поздней версии в качестве цели в Visual Studio 2019 не поддерживается.</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: нет узла приложения для указанного RuntimeIdentifier "{0}".</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: Visual Studio 2019'da .NET 6.0 veya daha üst sürümünü hedefleme desteklenmiyor.</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: Belirtilen RuntimeIdentifier '{0}' için kullanılabilecek bir uygulama konağı yok.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: 不支持在 Visual Studio 2019 中以 .NET 6.0 或更高版本为目标。</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: 没有应用程序主机可用于指定的 RuntimeIdentifier“{0}”。</target>
Expand Down
5 changes: 5 additions & 0 deletions src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ The following are names of parameters or literal values and should not be transl
<target state="translated">NETSDK1182: 不支援在 Visual Studio 2019 中以 .NET 6.0 或更高版本為目標。</target>
<note>{StrBegin="NETSDK1182: "}</note>
</trans-unit>
<trans-unit id="Net7NotCompatibleWithDev173">
<source>NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</source>
<target state="new">NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported.</target>
<note>{StrBegin="NETSDK1192: "}</note>
</trans-unit>
<trans-unit id="NoAppHostAvailable">
<source>NETSDK1084: There is no application host available for the specified RuntimeIdentifier '{0}'.</source>
<target state="translated">NETSDK1084: 對指定的 RuntimeIdentifier '{0}',無法使用任何應用程式主機。</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ Copyright (c) .NET Foundation. All rights reserved.
<NetSdkWarning ResourceName="Net6NotCompatibleWithDev16"/>
</Target>

<Target Name="_WarnWhenUsingNET7AndVSPriorTo174"
BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
Condition="$([MSBuild]::VersionLessThan($(MSBuildVersion), '17.4.0')) and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '7.0'))">
<NetSdkWarning ResourceName="Net7NotCompatibleWithDev173"/>
</Target>

<Target Name="_CheckForInvalidWindowsDesktopTargetingConfiguration"
BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '5.0')) and ('$(UseWindowsForms)' == 'true' or '$(UseWPF)' == 'true')">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ Copyright (c) .NET Foundation. All rights reserved.
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v3.1" DisplayName=".NET Core 3.1" Alias="netcoreapp3.1" />
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v5.0" DisplayName=".NET 5.0" Alias="net5.0" />
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v6.0" DisplayName=".NET 6.0" Alias="net6.0" />
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v7.0" DisplayName=".NET 7.0" Alias="net7.0" />
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v7.0" DisplayName=".NET 7.0" Alias="net7.0"
Condition="$([MSBuild]::VersionGreaterThanOrEquals($(MSBuildVersion), '17.4.0'))"/>
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v8.0" DisplayName=".NET 8.0" Alias="net8.0" />
</ItemGroup>

Expand Down