From 8572315ced86798cec3baed95800551242baec5a Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Wed, 28 May 2025 21:28:51 -0700 Subject: [PATCH 1/6] Rename bld.msi and bld.cab to bld.asserts.msi and bld.asserts.cab --- platforms/Windows/SideBySideUpgradeStrategy.props | 4 ++-- .../{bld.wixproj => asserts/bld.asserts.wixproj} | 1 + platforms/Windows/bld/asserts/bld.wxs | 3 +++ platforms/Windows/bld/{bld.wxs => bld.wxi} | 15 ++++++++------- platforms/Windows/bundle/installer.wixproj | 2 +- platforms/Windows/bundle/installer.wxs | 2 +- platforms/Windows/readme.md | 2 +- platforms/Windows/shared/swift.en-us.wxl | 1 + 8 files changed, 18 insertions(+), 12 deletions(-) rename platforms/Windows/bld/{bld.wixproj => asserts/bld.asserts.wixproj} (97%) create mode 100644 platforms/Windows/bld/asserts/bld.wxs rename platforms/Windows/bld/{bld.wxs => bld.wxi} (97%) diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props index ae79f273..ad9010cd 100644 --- a/platforms/Windows/SideBySideUpgradeStrategy.props +++ b/platforms/Windows/SideBySideUpgradeStrategy.props @@ -17,7 +17,7 @@ --> - {7E95DC06-7F84-4E8E-A038-8304AF0468FB} + {7E95DC06-7F84-4E8E-A038-8304AF0468FB} {87019842-3F3E-4227-B5C5-23A8EF72AD89} {91D382AF-1E92-44DC-A4AD-AEE91C1B5160} {8DD91C86-D13D-490B-B06B-9522A9CF504C} @@ -54,7 +54,7 @@ $(DefineConstants); BundleUpgradeCode=$(BundleUpgradeCode); - BldUpgradeCode=$(BldUpgradeCode); + BldAssertsUpgradeCode=$(BldAssertsUpgradeCode); CliUpgradeCode=$(CliUpgradeCode); DbgUpgradeCode=$(DbgUpgradeCode); IdeUpgradeCode=$(IdeUpgradeCode); diff --git a/platforms/Windows/bld/bld.wixproj b/platforms/Windows/bld/asserts/bld.asserts.wixproj similarity index 97% rename from platforms/Windows/bld/bld.wixproj rename to platforms/Windows/bld/asserts/bld.asserts.wixproj index 0f3385e8..bd53ebaa 100644 --- a/platforms/Windows/bld/bld.wixproj +++ b/platforms/Windows/bld/asserts/bld.asserts.wixproj @@ -5,6 +5,7 @@ _USR_LIB_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang; _USR_LIB_SWIFT_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang; + bld.asserts diff --git a/platforms/Windows/bld/asserts/bld.wxs b/platforms/Windows/bld/asserts/bld.wxs new file mode 100644 index 00000000..dd1084ce --- /dev/null +++ b/platforms/Windows/bld/asserts/bld.wxs @@ -0,0 +1,3 @@ + + + diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxi similarity index 97% rename from platforms/Windows/bld/bld.wxs rename to platforms/Windows/bld/bld.wxi index 0af0ebea..6fcde7aa 100644 --- a/platforms/Windows/bld/bld.wxs +++ b/platforms/Windows/bld/bld.wxi @@ -1,18 +1,19 @@ - + + - + - + @@ -549,7 +550,7 @@ - + @@ -578,4 +579,4 @@ - + diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj index b62f1e58..598d0ab9 100644 --- a/platforms/Windows/bundle/installer.wixproj +++ b/platforms/Windows/bundle/installer.wixproj @@ -16,7 +16,7 @@ - + diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index 717a719b..ab18da59 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -82,7 +82,7 @@ diff --git a/platforms/Windows/readme.md b/platforms/Windows/readme.md index 80e8bd4f..c0b82312 100644 --- a/platforms/Windows/readme.md +++ b/platforms/Windows/readme.md @@ -216,7 +216,7 @@ Note that these GUIDs are substituted at bind time so they skip the normal valid | Property | Description | | -------- | ----------- | -| BldUpgradeCode, CliUpgradeCode, DbgUpgradeCode, IdeUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. | +| BldAssertsUpgradeCode, CliUpgradeCode, DbgUpgradeCode, IdeUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. | | BundleUpgradeCode | Upgrade codes for the bundle. Bundles don't support upgrade version ranges, so the bundle upgrade code must change for every minor version _and_ stay the same for the entire lifetime of that minor version (e.g., v5.10.0 through v5.10.9999). You can keep the history of upgrade codes using a condition like `Condition="'$(MajorMinorProductVersion)' == '5.10'` or just replace BundleUpgradeCode when forking to a new minor version. | diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl index 7b6517ea..1e6dae08 100644 --- a/platforms/Windows/shared/swift.en-us.wxl +++ b/platforms/Windows/shared/swift.en-us.wxl @@ -3,6 +3,7 @@ + From 64d80cb7f73f25783c8aa9be5944d3486217d2e7 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Thu, 29 May 2025 10:55:58 -0700 Subject: [PATCH 2/6] Rename cli.msi and cli.cab to cli.asserts.msi and cli.asserts.cab --- platforms/Windows/SideBySideUpgradeStrategy.props | 4 ++-- platforms/Windows/bundle/installer.wixproj | 2 +- platforms/Windows/bundle/installer.wxs | 2 +- .../{cli.wixproj => asserts/cli.asserts.wixproj} | 1 + platforms/Windows/cli/asserts/cli.asserts.wxs | 3 +++ platforms/Windows/cli/{cli.wxs => cli.wxi} | 15 ++++++++------- platforms/Windows/readme.md | 2 +- platforms/Windows/shared/swift.en-us.wxl | 1 + 8 files changed, 18 insertions(+), 12 deletions(-) rename platforms/Windows/cli/{cli.wixproj => asserts/cli.asserts.wixproj} (96%) create mode 100644 platforms/Windows/cli/asserts/cli.asserts.wxs rename platforms/Windows/cli/{cli.wxs => cli.wxi} (98%) diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props index ad9010cd..5d30c593 100644 --- a/platforms/Windows/SideBySideUpgradeStrategy.props +++ b/platforms/Windows/SideBySideUpgradeStrategy.props @@ -18,7 +18,7 @@ {7E95DC06-7F84-4E8E-A038-8304AF0468FB} - {87019842-3F3E-4227-B5C5-23A8EF72AD89} + {87019842-3F3E-4227-B5C5-23A8EF72AD89} {91D382AF-1E92-44DC-A4AD-AEE91C1B5160} {8DD91C86-D13D-490B-B06B-9522A9CF504C} {BEA8C6DC-F73E-445B-9486-2333D1CF2886} @@ -55,7 +55,7 @@ $(DefineConstants); BundleUpgradeCode=$(BundleUpgradeCode); BldAssertsUpgradeCode=$(BldAssertsUpgradeCode); - CliUpgradeCode=$(CliUpgradeCode); + CliAssertsUpgradeCode=$(CliAssertsUpgradeCode); DbgUpgradeCode=$(DbgUpgradeCode); IdeUpgradeCode=$(IdeUpgradeCode); RtlUpgradeCode=$(RtlUpgradeCode); diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj index 598d0ab9..dd962d38 100644 --- a/platforms/Windows/bundle/installer.wixproj +++ b/platforms/Windows/bundle/installer.wixproj @@ -17,7 +17,7 @@ - + diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index ab18da59..92989ad1 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -88,7 +88,7 @@ diff --git a/platforms/Windows/cli/cli.wixproj b/platforms/Windows/cli/asserts/cli.asserts.wixproj similarity index 96% rename from platforms/Windows/cli/cli.wixproj rename to platforms/Windows/cli/asserts/cli.asserts.wixproj index 5dda6e00..01937894 100644 --- a/platforms/Windows/cli/cli.wixproj +++ b/platforms/Windows/cli/asserts/cli.asserts.wixproj @@ -7,6 +7,7 @@ SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD); SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST=$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist; + cli.asserts diff --git a/platforms/Windows/cli/asserts/cli.asserts.wxs b/platforms/Windows/cli/asserts/cli.asserts.wxs new file mode 100644 index 00000000..bbee8a27 --- /dev/null +++ b/platforms/Windows/cli/asserts/cli.asserts.wxs @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxi similarity index 98% rename from platforms/Windows/cli/cli.wxs rename to platforms/Windows/cli/cli.wxi index adbc496a..02dcb123 100644 --- a/platforms/Windows/cli/cli.wxs +++ b/platforms/Windows/cli/cli.wxi @@ -1,18 +1,19 @@ - + + - + - + @@ -735,7 +736,7 @@ - + @@ -757,4 +758,4 @@ - + diff --git a/platforms/Windows/readme.md b/platforms/Windows/readme.md index c0b82312..d1cc8fe2 100644 --- a/platforms/Windows/readme.md +++ b/platforms/Windows/readme.md @@ -216,7 +216,7 @@ Note that these GUIDs are substituted at bind time so they skip the normal valid | Property | Description | | -------- | ----------- | -| BldAssertsUpgradeCode, CliUpgradeCode, DbgUpgradeCode, IdeUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. | +| BldAssertsUpgradeCode, CliAssertsUpgradeCode, DbgUpgradeCode, IdeUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. | | BundleUpgradeCode | Upgrade codes for the bundle. Bundles don't support upgrade version ranges, so the bundle upgrade code must change for every minor version _and_ stay the same for the entire lifetime of that minor version (e.g., v5.10.0 through v5.10.9999). You can keep the history of upgrade codes using a condition like `Condition="'$(MajorMinorProductVersion)' == '5.10'` or just replace BundleUpgradeCode when forking to a new minor version. | diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl index 1e6dae08..847dc50e 100644 --- a/platforms/Windows/shared/swift.en-us.wxl +++ b/platforms/Windows/shared/swift.en-us.wxl @@ -5,6 +5,7 @@ + From d1b5a645030dababa76c5cd626222def68da9e4e Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Thu, 29 May 2025 11:06:06 -0700 Subject: [PATCH 3/6] Rename dbg.msi and dbg.cab to dbg.asserts.msi and dbg.asserts.cab --- platforms/Windows/SideBySideUpgradeStrategy.props | 4 ++-- platforms/Windows/bundle/installer.wixproj | 2 +- platforms/Windows/bundle/installer.wxs | 2 +- platforms/Windows/dbg/asserts/dbg.asserts.wixproj | 5 +++++ platforms/Windows/dbg/asserts/dbg.asserts.wxs | 3 +++ platforms/Windows/dbg/dbg.wixproj | 2 -- platforms/Windows/dbg/{dbg.wxs => dbg.wxi} | 15 ++++++++------- platforms/Windows/readme.md | 2 +- platforms/Windows/shared/swift.en-us.wxl | 1 + 9 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 platforms/Windows/dbg/asserts/dbg.asserts.wixproj create mode 100644 platforms/Windows/dbg/asserts/dbg.asserts.wxs delete mode 100644 platforms/Windows/dbg/dbg.wixproj rename platforms/Windows/dbg/{dbg.wxs => dbg.wxi} (94%) diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props index 5d30c593..7b74bf73 100644 --- a/platforms/Windows/SideBySideUpgradeStrategy.props +++ b/platforms/Windows/SideBySideUpgradeStrategy.props @@ -19,7 +19,7 @@ {7E95DC06-7F84-4E8E-A038-8304AF0468FB} {87019842-3F3E-4227-B5C5-23A8EF72AD89} - {91D382AF-1E92-44DC-A4AD-AEE91C1B5160} + {91D382AF-1E92-44DC-A4AD-AEE91C1B5160} {8DD91C86-D13D-490B-B06B-9522A9CF504C} {BEA8C6DC-F73E-445B-9486-2333D1CF2886} {313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A} @@ -56,7 +56,7 @@ BundleUpgradeCode=$(BundleUpgradeCode); BldAssertsUpgradeCode=$(BldAssertsUpgradeCode); CliAssertsUpgradeCode=$(CliAssertsUpgradeCode); - DbgUpgradeCode=$(DbgUpgradeCode); + DbgAssertsUpgradeCode=$(DbgAssertsUpgradeCode); IdeUpgradeCode=$(IdeUpgradeCode); RtlUpgradeCode=$(RtlUpgradeCode); AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode); diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj index dd962d38..6e7ad970 100644 --- a/platforms/Windows/bundle/installer.wixproj +++ b/platforms/Windows/bundle/installer.wixproj @@ -18,7 +18,7 @@ - + diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index 92989ad1..6e2d5f4f 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -95,7 +95,7 @@ diff --git a/platforms/Windows/dbg/asserts/dbg.asserts.wixproj b/platforms/Windows/dbg/asserts/dbg.asserts.wixproj new file mode 100644 index 00000000..aa21e7f8 --- /dev/null +++ b/platforms/Windows/dbg/asserts/dbg.asserts.wixproj @@ -0,0 +1,5 @@ + + + dbg.asserts + + diff --git a/platforms/Windows/dbg/asserts/dbg.asserts.wxs b/platforms/Windows/dbg/asserts/dbg.asserts.wxs new file mode 100644 index 00000000..b5961e21 --- /dev/null +++ b/platforms/Windows/dbg/asserts/dbg.asserts.wxs @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/platforms/Windows/dbg/dbg.wixproj b/platforms/Windows/dbg/dbg.wixproj deleted file mode 100644 index 8a93eeab..00000000 --- a/platforms/Windows/dbg/dbg.wixproj +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/platforms/Windows/dbg/dbg.wxs b/platforms/Windows/dbg/dbg.wxi similarity index 94% rename from platforms/Windows/dbg/dbg.wxs rename to platforms/Windows/dbg/dbg.wxi index 94848bc2..8d9273e0 100644 --- a/platforms/Windows/dbg/dbg.wxs +++ b/platforms/Windows/dbg/dbg.wxi @@ -1,18 +1,19 @@ - + + - + - + @@ -140,7 +141,7 @@ - + @@ -153,4 +154,4 @@ - + diff --git a/platforms/Windows/readme.md b/platforms/Windows/readme.md index d1cc8fe2..d3783e11 100644 --- a/platforms/Windows/readme.md +++ b/platforms/Windows/readme.md @@ -216,7 +216,7 @@ Note that these GUIDs are substituted at bind time so they skip the normal valid | Property | Description | | -------- | ----------- | -| BldAssertsUpgradeCode, CliAssertsUpgradeCode, DbgUpgradeCode, IdeUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. | +| BldAssertsUpgradeCode, CliAssertsUpgradeCode, DbgAssertsUpgradeCode, IdeUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. | | BundleUpgradeCode | Upgrade codes for the bundle. Bundles don't support upgrade version ranges, so the bundle upgrade code must change for every minor version _and_ stay the same for the entire lifetime of that minor version (e.g., v5.10.0 through v5.10.9999). You can keep the history of upgrade codes using a condition like `Condition="'$(MajorMinorProductVersion)' == '5.10'` or just replace BundleUpgradeCode when forking to a new minor version. | diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl index 847dc50e..7d4d6355 100644 --- a/platforms/Windows/shared/swift.en-us.wxl +++ b/platforms/Windows/shared/swift.en-us.wxl @@ -7,6 +7,7 @@ + From f2012e76c967414f96cc4317c84bfb9a9f4edb72 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Thu, 29 May 2025 11:13:39 -0700 Subject: [PATCH 4/6] Rename ide.msi and ide.cab to ide.asserts.msi and ide.asserts.cab --- platforms/Windows/SideBySideUpgradeStrategy.props | 4 ++-- platforms/Windows/bundle/installer.wixproj | 2 +- platforms/Windows/bundle/installer.wxs | 2 +- platforms/Windows/ide/asserts/ide.asserts.wixproj | 5 +++++ platforms/Windows/ide/asserts/ide.asserts.wxs | 3 +++ platforms/Windows/ide/ide.wixproj | 2 -- platforms/Windows/ide/{ide.wxs => ide.wxi} | 13 +++++++------ platforms/Windows/shared/swift.en-us.wxl | 1 + 8 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 platforms/Windows/ide/asserts/ide.asserts.wixproj create mode 100644 platforms/Windows/ide/asserts/ide.asserts.wxs delete mode 100644 platforms/Windows/ide/ide.wixproj rename platforms/Windows/ide/{ide.wxs => ide.wxi} (84%) diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props index 7b74bf73..2fcf6fb8 100644 --- a/platforms/Windows/SideBySideUpgradeStrategy.props +++ b/platforms/Windows/SideBySideUpgradeStrategy.props @@ -20,7 +20,7 @@ {7E95DC06-7F84-4E8E-A038-8304AF0468FB} {87019842-3F3E-4227-B5C5-23A8EF72AD89} {91D382AF-1E92-44DC-A4AD-AEE91C1B5160} - {8DD91C86-D13D-490B-B06B-9522A9CF504C} + {8DD91C86-D13D-490B-B06B-9522A9CF504C} {BEA8C6DC-F73E-445B-9486-2333D1CF2886} {313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A} {01AFF1CF-A025-41B6-BCBC-728D794353FD} @@ -57,7 +57,7 @@ BldAssertsUpgradeCode=$(BldAssertsUpgradeCode); CliAssertsUpgradeCode=$(CliAssertsUpgradeCode); DbgAssertsUpgradeCode=$(DbgAssertsUpgradeCode); - IdeUpgradeCode=$(IdeUpgradeCode); + IdeAssertsUpgradeCode=$(IdeAssertsUpgradeCode); RtlUpgradeCode=$(RtlUpgradeCode); AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode); WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode); diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj index 6e7ad970..693c07a2 100644 --- a/platforms/Windows/bundle/installer.wixproj +++ b/platforms/Windows/bundle/installer.wixproj @@ -19,7 +19,7 @@ - + diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index 6e2d5f4f..cf0912a7 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -102,7 +102,7 @@ diff --git a/platforms/Windows/ide/asserts/ide.asserts.wixproj b/platforms/Windows/ide/asserts/ide.asserts.wixproj new file mode 100644 index 00000000..8a44f1d6 --- /dev/null +++ b/platforms/Windows/ide/asserts/ide.asserts.wixproj @@ -0,0 +1,5 @@ + + + ide.asserts + + \ No newline at end of file diff --git a/platforms/Windows/ide/asserts/ide.asserts.wxs b/platforms/Windows/ide/asserts/ide.asserts.wxs new file mode 100644 index 00000000..e5535534 --- /dev/null +++ b/platforms/Windows/ide/asserts/ide.asserts.wxs @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/platforms/Windows/ide/ide.wixproj b/platforms/Windows/ide/ide.wixproj deleted file mode 100644 index 8a93eeab..00000000 --- a/platforms/Windows/ide/ide.wixproj +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/platforms/Windows/ide/ide.wxs b/platforms/Windows/ide/ide.wxi similarity index 84% rename from platforms/Windows/ide/ide.wxs rename to platforms/Windows/ide/ide.wxi index 97170e15..0d2da126 100644 --- a/platforms/Windows/ide/ide.wxs +++ b/platforms/Windows/ide/ide.wxi @@ -1,18 +1,19 @@ - + + - + @@ -59,7 +60,7 @@ - + @@ -68,4 +69,4 @@ - + diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl index 7d4d6355..efdf1d6c 100644 --- a/platforms/Windows/shared/swift.en-us.wxl +++ b/platforms/Windows/shared/swift.en-us.wxl @@ -9,6 +9,7 @@ + From 9a0adfdc2fedde0e661404edc5bacf6d259681fc Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Thu, 29 May 2025 11:50:36 -0700 Subject: [PATCH 5/6] Add newlines at end of files --- platforms/Windows/cli/asserts/cli.asserts.wxs | 2 +- platforms/Windows/dbg/asserts/dbg.asserts.wxs | 2 +- platforms/Windows/ide/asserts/ide.asserts.wixproj | 2 +- platforms/Windows/ide/asserts/ide.asserts.wxs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platforms/Windows/cli/asserts/cli.asserts.wxs b/platforms/Windows/cli/asserts/cli.asserts.wxs index bbee8a27..b9b2899c 100644 --- a/platforms/Windows/cli/asserts/cli.asserts.wxs +++ b/platforms/Windows/cli/asserts/cli.asserts.wxs @@ -1,3 +1,3 @@  - \ No newline at end of file + diff --git a/platforms/Windows/dbg/asserts/dbg.asserts.wxs b/platforms/Windows/dbg/asserts/dbg.asserts.wxs index b5961e21..0f050b72 100644 --- a/platforms/Windows/dbg/asserts/dbg.asserts.wxs +++ b/platforms/Windows/dbg/asserts/dbg.asserts.wxs @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/platforms/Windows/ide/asserts/ide.asserts.wixproj b/platforms/Windows/ide/asserts/ide.asserts.wixproj index 8a44f1d6..1e311f8c 100644 --- a/platforms/Windows/ide/asserts/ide.asserts.wixproj +++ b/platforms/Windows/ide/asserts/ide.asserts.wixproj @@ -2,4 +2,4 @@ ide.asserts - \ No newline at end of file + diff --git a/platforms/Windows/ide/asserts/ide.asserts.wxs b/platforms/Windows/ide/asserts/ide.asserts.wxs index e5535534..eb8aa1a4 100644 --- a/platforms/Windows/ide/asserts/ide.asserts.wxs +++ b/platforms/Windows/ide/asserts/ide.asserts.wxs @@ -1,3 +1,3 @@  - \ No newline at end of file + From 04ebb2b73b07d8e91901d82f99ef67d7fd237337 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Fri, 30 May 2025 08:53:02 -0700 Subject: [PATCH 6/6] Rename ide.cab to ide.asserts.cab - missed in previous commit --- platforms/Windows/ide/ide.wxi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/Windows/ide/ide.wxi b/platforms/Windows/ide/ide.wxi index 0d2da126..46e22e45 100644 --- a/platforms/Windows/ide/ide.wxi +++ b/platforms/Windows/ide/ide.wxi @@ -11,7 +11,7 @@ Version="$(NonSemVerProductVersion)" Scope="$(PackageScope)"> - +