From 6a77412484ab1d058172d804b4be2c111eae9197 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 10 Feb 2023 15:47:14 -0800 Subject: [PATCH 1/2] Add _Runtime and Reflection to Windows installer --- platforms/Windows/runtime-amd64.wxs | 6 +++++ platforms/Windows/runtime-arm64.wxs | 6 +++++ platforms/Windows/runtime-x86.wxs | 6 +++++ platforms/Windows/sdk-amd64.wxs | 38 +++++++++++++++++++++++++++++ platforms/Windows/sdk-arm64.wxs | 38 +++++++++++++++++++++++++++++ platforms/Windows/sdk-x86.wxs | 36 +++++++++++++++++++++++++++ 6 files changed, 130 insertions(+) diff --git a/platforms/Windows/runtime-amd64.wxs b/platforms/Windows/runtime-amd64.wxs index 5785c71a..110834a3 100644 --- a/platforms/Windows/runtime-amd64.wxs +++ b/platforms/Windows/runtime-amd64.wxs @@ -108,6 +108,12 @@ + + + + + + diff --git a/platforms/Windows/runtime-arm64.wxs b/platforms/Windows/runtime-arm64.wxs index df32b09a..73b1a230 100644 --- a/platforms/Windows/runtime-arm64.wxs +++ b/platforms/Windows/runtime-arm64.wxs @@ -42,6 +42,12 @@ + + + + + + diff --git a/platforms/Windows/runtime-x86.wxs b/platforms/Windows/runtime-x86.wxs index 68748e46..2f01bf7f 100644 --- a/platforms/Windows/runtime-x86.wxs +++ b/platforms/Windows/runtime-x86.wxs @@ -41,6 +41,12 @@ + + + + + + diff --git a/platforms/Windows/sdk-amd64.wxs b/platforms/Windows/sdk-amd64.wxs index fd4faafd..0cdecea3 100644 --- a/platforms/Windows/sdk-amd64.wxs +++ b/platforms/Windows/sdk-amd64.wxs @@ -62,6 +62,10 @@ + + + + @@ -240,6 +244,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -497,6 +533,8 @@ + + diff --git a/platforms/Windows/sdk-arm64.wxs b/platforms/Windows/sdk-arm64.wxs index f9f75f3e..859e2858 100644 --- a/platforms/Windows/sdk-arm64.wxs +++ b/platforms/Windows/sdk-arm64.wxs @@ -62,6 +62,10 @@ + + + + @@ -240,6 +244,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -497,6 +533,8 @@ + + diff --git a/platforms/Windows/sdk-x86.wxs b/platforms/Windows/sdk-x86.wxs index 674eeec2..3e712f6c 100644 --- a/platforms/Windows/sdk-x86.wxs +++ b/platforms/Windows/sdk-x86.wxs @@ -62,6 +62,10 @@ + + + + @@ -240,6 +244,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9cfe39b8f43d9f9201e41acada3f9d9e099a6b2a Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 10 Feb 2023 16:25:17 -0800 Subject: [PATCH 2/2] Add missing on x86 and sort --- platforms/Windows/sdk-amd64.wxs | 20 ++++++++++---------- platforms/Windows/sdk-arm64.wxs | 20 ++++++++++---------- platforms/Windows/sdk-x86.wxs | 18 ++++++++++-------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/platforms/Windows/sdk-amd64.wxs b/platforms/Windows/sdk-amd64.wxs index 0cdecea3..eb6baa34 100644 --- a/platforms/Windows/sdk-amd64.wxs +++ b/platforms/Windows/sdk-amd64.wxs @@ -529,25 +529,25 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/platforms/Windows/sdk-arm64.wxs b/platforms/Windows/sdk-arm64.wxs index 859e2858..c2255be6 100644 --- a/platforms/Windows/sdk-arm64.wxs +++ b/platforms/Windows/sdk-arm64.wxs @@ -529,25 +529,25 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/platforms/Windows/sdk-x86.wxs b/platforms/Windows/sdk-x86.wxs index 3e712f6c..1a02e245 100644 --- a/platforms/Windows/sdk-x86.wxs +++ b/platforms/Windows/sdk-x86.wxs @@ -523,23 +523,25 @@ - - - - - - - - + + + + + + + + + +