From d5f939feb66f9d311dd1c92939cc9c59b8a3484c Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 17 Jul 2024 11:40:59 +0200 Subject: [PATCH 1/5] fix _MSBuildVersionMajorMinor assignment --- .../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 7d34b91cd80f..3bad5d583623 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)) + <_MSBuildVersionMajorMinor>%24([System.Version]::Parse('%24(MSBuildVersion)').%24([System.Version]::Parse('%24(MSBuildVersion)').Minor) <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionNotEquals('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)')) From 8f023ecc42f009878b0890ffe52b4d6067606343 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 17 Jul 2024 11:48:12 +0200 Subject: [PATCH 2/5] update the content --- .../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 3bad5d583623..920e1efa0bf2 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)').%24([System.Version]::Parse('%24(MSBuildVersion)').Minor) + <_MSBuildVersionMajorMinor>%24([System.Version]::Parse('%24(MSBuildVersion)').Major.%24([System.Version]::Parse('%24(MSBuildVersion)').Minor) <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionNotEquals('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)')) From 91027554d6c54d6279420b32486e932ed3a34ec3 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 17 Jul 2024 11:49:40 +0200 Subject: [PATCH 3/5] update _MSBuildVersionMajorMinor --- .../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 920e1efa0bf2..273c511535ac 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)').Major.%24([System.Version]::Parse('%24(MSBuildVersion)').Minor) + <_MSBuildVersionMajorMinor>%24([System.Version]::Parse('%24(MSBuildVersion)').Major).%24([System.Version]::Parse('%24(MSBuildVersion)').Minor) <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionNotEquals('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)')) From 377bec1de298fa4d9b6cadc1b275dcd390189617 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:33:36 +0200 Subject: [PATCH 4/5] get rid of %24 --- .../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 273c511535ac..dfe40b4e634c 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)').Major).%24([System.Version]::Parse('%24(MSBuildVersion)').Minor) + <_MSBuildVersionMajorMinor>$([System.Version]::Parse('$(MSBuildVersion)').Major).$([System.Version]::Parse('$(MSBuildVersion)').Minor) <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionNotEquals('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)')) From b280e3bf49eab310823a6bf085637501d2d6d801 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:57:53 +0200 Subject: [PATCH 5/5] fix other ToString occurence --- .../redist-installer/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets index dfe40b4e634c..629281b510fc 100644 --- a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets +++ b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets @@ -1257,7 +1257,7 @@ Copyright (c) .NET Foundation. All rights reserved. - <_BundledMSBuildVersionMajorMinor>$([System.Version]::Parse('$(BundledMSBuildVersion)').ToString(2)) + <_BundledMSBuildVersionMajorMinor>%24([System.Version]::Parse('%24(BundledMSBuildVersion)').Major).%24([System.Version]::Parse('%24(BundledMSBuildVersion)').Minor) @@ -1276,7 +1276,7 @@ Copyright (c) .NET Foundation. All rights reserved. $(MinimumMSBuildVersion) $(BundledMSBuildVersion) - <_MSBuildVersionMajorMinor>$([System.Version]::Parse('$(MSBuildVersion)').Major).$([System.Version]::Parse('$(MSBuildVersion)').Minor) + <_MSBuildVersionMajorMinor>%24([System.Version]::Parse('%24(MSBuildVersion)').Major).%24([System.Version]::Parse('%24(MSBuildVersion)').Minor) <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionNotEquals('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)'))