From 320637fdb3ccf8aecef1ded3d0e803752e6e48c6 Mon Sep 17 00:00:00 2001 From: YR Chen Date: Sun, 21 Aug 2022 00:45:39 +0800 Subject: [PATCH 1/3] WiX: Add `SwiftCxx` to SDK package --- platforms/Windows/sdk-amd64.wxs | 19 +++++++++++++++++++ platforms/Windows/sdk-arm64.wxs | 19 +++++++++++++++++++ platforms/Windows/sdk-x86.wxs | 19 +++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/platforms/Windows/sdk-amd64.wxs b/platforms/Windows/sdk-amd64.wxs index fe0d2aea..d2ccb009 100644 --- a/platforms/Windows/sdk-amd64.wxs +++ b/platforms/Windows/sdk-amd64.wxs @@ -72,6 +72,8 @@ + + @@ -315,6 +317,22 @@ + + + + + + + + + + + + + + + + @@ -471,6 +489,7 @@ + diff --git a/platforms/Windows/sdk-arm64.wxs b/platforms/Windows/sdk-arm64.wxs index 898d64f5..45f05e79 100644 --- a/platforms/Windows/sdk-arm64.wxs +++ b/platforms/Windows/sdk-arm64.wxs @@ -72,6 +72,8 @@ + + @@ -315,6 +317,22 @@ + + + + + + + + + + + + + + + + @@ -471,6 +489,7 @@ + diff --git a/platforms/Windows/sdk-x86.wxs b/platforms/Windows/sdk-x86.wxs index 4faa254f..ad37a088 100644 --- a/platforms/Windows/sdk-x86.wxs +++ b/platforms/Windows/sdk-x86.wxs @@ -72,6 +72,8 @@ + + @@ -315,6 +317,22 @@ + + + + + + + + + + + + + + + + @@ -465,6 +483,7 @@ + From 757b927a4afdeadf0e1d954acf177138fc1d8c9c Mon Sep 17 00:00:00 2001 From: YR Chen Date: Sun, 21 Aug 2022 00:21:59 +0800 Subject: [PATCH 2/3] WiX: Add `SwiftCxx` to runtime package --- platforms/Windows/runtime-amd64.wxs | 6 ++++++ platforms/Windows/runtime-arm64.wxs | 6 ++++++ platforms/Windows/runtime-x86.wxs | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/platforms/Windows/runtime-amd64.wxs b/platforms/Windows/runtime-amd64.wxs index 05be9df8..0298d1c8 100644 --- a/platforms/Windows/runtime-amd64.wxs +++ b/platforms/Windows/runtime-amd64.wxs @@ -57,6 +57,9 @@ + + + @@ -120,6 +123,9 @@ + + + diff --git a/platforms/Windows/runtime-arm64.wxs b/platforms/Windows/runtime-arm64.wxs index 8b76d8de..ff765e94 100644 --- a/platforms/Windows/runtime-arm64.wxs +++ b/platforms/Windows/runtime-arm64.wxs @@ -57,6 +57,9 @@ + + + @@ -120,6 +123,9 @@ + + + diff --git a/platforms/Windows/runtime-x86.wxs b/platforms/Windows/runtime-x86.wxs index 6c0b27ca..60238b4d 100644 --- a/platforms/Windows/runtime-x86.wxs +++ b/platforms/Windows/runtime-x86.wxs @@ -56,6 +56,9 @@ + + + @@ -119,6 +122,9 @@ + + + From 98e9a106dc18e465401e2717dd10d8aa9c5ba9ae Mon Sep 17 00:00:00 2001 From: YR Chen Date: Sun, 21 Aug 2022 00:51:30 +0800 Subject: [PATCH 3/3] WiX: Update Program Files name to `Swift` --- platforms/Windows/runtime-amd64.wxs | 2 +- platforms/Windows/runtime-arm64.wxs | 2 +- platforms/Windows/runtime-x86.wxs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platforms/Windows/runtime-amd64.wxs b/platforms/Windows/runtime-amd64.wxs index 0298d1c8..f656e7ba 100644 --- a/platforms/Windows/runtime-amd64.wxs +++ b/platforms/Windows/runtime-amd64.wxs @@ -21,7 +21,7 @@ - + NOT INSTALLDIR diff --git a/platforms/Windows/runtime-arm64.wxs b/platforms/Windows/runtime-arm64.wxs index ff765e94..c619d5ac 100644 --- a/platforms/Windows/runtime-arm64.wxs +++ b/platforms/Windows/runtime-arm64.wxs @@ -21,7 +21,7 @@ - + NOT INSTALLDIR diff --git a/platforms/Windows/runtime-x86.wxs b/platforms/Windows/runtime-x86.wxs index 60238b4d..f8f5db24 100644 --- a/platforms/Windows/runtime-x86.wxs +++ b/platforms/Windows/runtime-x86.wxs @@ -20,7 +20,7 @@ - + NOT INSTALLDIR