From b2514ded5f03eb29da3a0b9c2682859de6992fbf Mon Sep 17 00:00:00 2001 From: Jeremy Schonfeld Date: Fri, 12 Jul 2024 22:48:06 -0700 Subject: [PATCH 1/3] _FoundationCollections is named by ArchArchDir not ArchTriple (cherry picked from commit 251247b783531298d1a9839e0e4c912d1486b33b) --- platforms/Windows/sdk/sdk.wxs | 52 ++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs index 18c57957..545e1f09 100644 --- a/platforms/Windows/sdk/sdk.wxs +++ b/platforms/Windows/sdk/sdk.wxs @@ -1,4 +1,4 @@ - + @@ -335,12 +335,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -349,10 +382,10 @@ - + - + @@ -361,10 +394,10 @@ - + - + @@ -530,6 +563,8 @@ + + @@ -538,6 +573,9 @@ + + + From 165b7d711284d8b30cf0280efaeebcb52f1d5f8d Mon Sep 17 00:00:00 2001 From: Jeremy Schonfeld Date: Fri, 12 Jul 2024 20:12:48 -0700 Subject: [PATCH 2/3] _FoundationCollections is a combined module not files in an arch-specific dir (cherry picked from commit a53a40f827a9636fdd901f5495dddc9675524759) --- platforms/Windows/sdk/sdk.wxs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs index 545e1f09..0944d658 100644 --- a/platforms/Windows/sdk/sdk.wxs +++ b/platforms/Windows/sdk/sdk.wxs @@ -337,10 +337,10 @@ - + - + From 6905cb8f705feebe84786b2573f3c082404903fc Mon Sep 17 00:00:00 2001 From: Jeremy Schonfeld Date: Fri, 28 Jun 2024 16:30:23 -0700 Subject: [PATCH 3/3] Update Windows/Android installer scripts for swift-foundation re-core (cherry picked from commit 7642e2f7638bfeab6925aa2d459dff9cc6a6924b) --- platforms/Windows/rtl/lib/rtllib.wxs | 9 + platforms/Windows/sdk/sdk.wxs | 651 ++++++++++++++++++++++++++- 2 files changed, 658 insertions(+), 2 deletions(-) diff --git a/platforms/Windows/rtl/lib/rtllib.wxs b/platforms/Windows/rtl/lib/rtllib.wxs index 9513726d..4d25f936 100644 --- a/platforms/Windows/rtl/lib/rtllib.wxs +++ b/platforms/Windows/rtl/lib/rtllib.wxs @@ -74,6 +74,15 @@ + + + + + + + + + diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs index 0944d658..4c469deb 100644 --- a/platforms/Windows/sdk/sdk.wxs +++ b/platforms/Windows/sdk/sdk.wxs @@ -71,6 +71,8 @@ + + @@ -89,6 +91,9 @@ + + + @@ -224,6 +229,648 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -337,10 +984,10 @@ - + - +