From c446452a06ed8ee776a95ce540cacc93ec61d4bb Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Tue, 2 Jul 2024 15:17:19 +0200 Subject: [PATCH 1/2] Fix detection of torn SDK --- .../redist-installer/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets index 33a2fc7ec4ff..27df22e72400 100644 --- a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets +++ b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets @@ -1276,7 +1276,7 @@ Copyright (c) .NET Foundation. All rights reserved. $(MinimumMSBuildVersion) $(BundledMSBuildVersion) <_MSBuildVersionMajorMinor>%24([System.Version]::Parse('%24(MSBuildVersion)').ToString(2)) - <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionGreaterThan('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)')) + <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionLessThan('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)')) ]]> From cfceed25c377df277883724b2f8c5c90738fd416 Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Mon, 8 Jul 2024 09:31:28 +0200 Subject: [PATCH 2/2] Use `VersionNotEquals` --- .../redist-installer/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets index 27df22e72400..eb90c0f86210 100644 --- a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets +++ b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets @@ -1276,7 +1276,7 @@ Copyright (c) .NET Foundation. All rights reserved. $(MinimumMSBuildVersion) $(BundledMSBuildVersion) <_MSBuildVersionMajorMinor>%24([System.Version]::Parse('%24(MSBuildVersion)').ToString(2)) - <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionLessThan('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)')) + <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionNotEquals('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)')) ]]>