Skip to content

Commit fc38963

Browse files
authored
Cherry-pick PR #50749 to release/10.0.1xx: Update compatibility message for targeting .NET 10.0 in Visual Studio 17.14 (#51366)
2 parents 2699046 + 4e51f56 commit fc38963

22 files changed

+72
-70
lines changed

.vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ extends:
9898
name: $(DncEngInternalBuildPool)
9999
image: windows.vs2022.amd64
100100
os: windows
101-
helixTargetQueue: windows.amd64.vs2022.pre
101+
helixTargetQueue: windows.amd64.vs2026.pre.scout
102102
oneESCompat:
103103
templateFolderName: templates-official
104104
publishTaskPrefix: 1ES.

.vsts-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ stages:
4242
name: $(DncEngPublicBuildPool)
4343
demands: ImageOverride -equals windows.vs2022.amd64.open
4444
os: windows
45-
helixTargetQueue: windows.amd64.vs2022.pre.open
45+
helixTargetQueue: windows.amd64.vs2026.pre.scout.open
4646

4747
############### LINUX ###############
4848
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml

src/Tasks/Common/Resources/Strings.resx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -970,10 +970,6 @@ You may need to build the project on another operating system or architecture, o
970970
<value>NETSDK1222: PreferNativeArm64 applies only to .NET Framework targets. It is not supported and has no effect for when targeting .NET Core.</value>
971971
<comment>{StrBegins="NETSDK1222: "}</comment>
972972
</data>
973-
<data name="Net9NotCompatibleWithDev1711" xml:space="preserve">
974-
<value>NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported.</value>
975-
<comment>{StrBegins="NETSDK1223: "}</comment>
976-
</data>
977973
<data name="AspNetCorePackUnsupportedTargetFramework" xml:space="preserve">
978974
<value>NETSDK1224: ASP.NET Core framework assets are not supported for the target framework.</value>
979975
<comment>{StrBegins="NETSDK1224: "}</comment>
@@ -1010,5 +1006,9 @@ You may need to build the project on another operating system or architecture, o
10101006
<value>NETSDK1232: Unable to find a matching RID for '{0}' from among [{1}] in graph '{2}'.</value>
10111007
<comment>{StrBegins="NETSDK1232: "}{Locked="{0}"}{Locked="{1}"}{Locked="{2}"}</comment>
10121008
</data>
1013-
<!-- The latest message added is UnableToFindMatchingRid. Please update this value with each PR to catch parallel PRs both adding a new message -->
1009+
<data name="Net10NotCompatibleWithVS17" xml:space="preserve">
1010+
<value>NETSDK1233: Targeting .NET 10.0 or higher in Visual Studio 2022 17.14 is not supported.</value>
1011+
<comment>{StrBegins="NETSDK1233: "}</comment>
1012+
</data>
1013+
<!-- The latest message added is Net10NotCompatibleWithVS17. Please update this value with each PR to catch parallel PRs both adding a new message -->
10141014
</root>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)