Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ extends:
name: $(DncEngInternalBuildPool)
image: windows.vs2022.amd64
os: windows
helixTargetQueue: windows.amd64.vs2022.pre
helixTargetQueue: windows.amd64.vs2026.pre.scout
oneESCompat:
templateFolderName: templates-official
publishTaskPrefix: 1ES.
Expand Down
2 changes: 1 addition & 1 deletion .vsts-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ stages:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64.open
os: windows
helixTargetQueue: windows.amd64.vs2022.pre.open
helixTargetQueue: windows.amd64.vs2026.pre.scout.open

############### LINUX ###############
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
Expand Down
10 changes: 5 additions & 5 deletions src/Tasks/Common/Resources/Strings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -970,10 +970,6 @@ You may need to build the project on another operating system or architecture, o
<value>NETSDK1222: PreferNativeArm64 applies only to .NET Framework targets. It is not supported and has no effect for when targeting .NET Core.</value>
<comment>{StrBegins="NETSDK1222: "}</comment>
</data>
<data name="Net9NotCompatibleWithDev1711" xml:space="preserve">
<value>NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported.</value>
<comment>{StrBegins="NETSDK1223: "}</comment>
</data>
<data name="AspNetCorePackUnsupportedTargetFramework" xml:space="preserve">
<value>NETSDK1224: ASP.NET Core framework assets are not supported for the target framework.</value>
<comment>{StrBegins="NETSDK1224: "}</comment>
Expand Down Expand Up @@ -1010,5 +1006,9 @@ You may need to build the project on another operating system or architecture, o
<value>NETSDK1232: Unable to find a matching RID for '{0}' from among [{1}] in graph '{2}'.</value>
<comment>{StrBegins="NETSDK1232: "}{Locked="{0}"}{Locked="{1}"}{Locked="{2}"}</comment>
</data>
<!-- The latest message added is UnableToFindMatchingRid. Please update this value with each PR to catch parallel PRs both adding a new message -->
<data name="Net10NotCompatibleWithVS17" xml:space="preserve">
<value>NETSDK1233: Targeting .NET 10.0 or higher in Visual Studio 2022 17.14 is not supported.</value>
<comment>{StrBegins="NETSDK1233: "}</comment>
</data>
<!-- The latest message added is Net10NotCompatibleWithVS17. Please update this value with each PR to catch parallel PRs both adding a new message -->
</root>
8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.de.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.es.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.fr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.it.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.ja.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.ko.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.pl.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.ru.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.tr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ public class GivenThatWeHaveErrorCodes
1192,
1213,
1214,
1219
1219,
1223
};

//ILLink lives in other repos and violated the _info requirement for no error code
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,11 @@ Copyright (c) .NET Foundation. All rights reserved.
FormatArguments="$(SdkResolverGlobalJsonPath)" />
</Target>

<Target Name="_WarnWhenUsingNET9AndVSPriorTo1712"
<!-- MSBuild was 17.15 during previews for dev18 so require that or higher -->
<Target Name="_WarnWhenUsingNET10AndVSPriorTo18"
BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
Condition="$([MSBuild]::VersionLessThan($(MSBuildVersion), '17.12.0')) and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '9.0'))">
<NetSdkWarning ResourceName="Net9NotCompatibleWithDev1711"/>
Condition="$([MSBuild]::VersionLessThan($(MSBuildVersion), '17.15.0')) and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '10.0'))">
<NetSdkWarning ResourceName="Net10NotCompatibleWithVS17"/>
</Target>

<Target Name="_CheckForInvalidWindowsDesktopTargetingConfiguration"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static void Main(string[] args)
.HaveStdOut("(0, 0)");
}

[FullMSBuildOnlyFact]
[FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/51361")]
public void WinMDInteropProjectCanBeReferenced()
{

Expand Down
Loading
Loading