From 8fad456c862eec521d5f0f6e2f5e4b8ec051aabc Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 15 Dec 2022 07:59:59 -0800 Subject: [PATCH 1/4] WiX: repair the Windows packaging for SPM SPM introduced new libraries in apple/swift-package-manager@e26417cfa1ee117cf789b195c82459189e62ca70 and apple/swift-package-manager@b30ba0bc97eae2a0bb75cf491272c99926f1bc51 but failed to update the packaging rules resulting in an unusable distribution of SPM. Update the manifest to include the libraries. --- platforms/Windows/devtools-amd64.wxs | 6 ++++++ platforms/Windows/devtools-arm64.wxs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/platforms/Windows/devtools-amd64.wxs b/platforms/Windows/devtools-amd64.wxs index 47ab8c1f..21db17a7 100644 --- a/platforms/Windows/devtools-amd64.wxs +++ b/platforms/Windows/devtools-amd64.wxs @@ -104,6 +104,12 @@ + + + + + + diff --git a/platforms/Windows/devtools-arm64.wxs b/platforms/Windows/devtools-arm64.wxs index 80a9004b..4601cd33 100644 --- a/platforms/Windows/devtools-arm64.wxs +++ b/platforms/Windows/devtools-arm64.wxs @@ -104,6 +104,12 @@ + + + + + + From 7cd2cbbc3bb90611c60f0ddb543f35204ec893cb Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 15 Dec 2022 11:25:11 -0800 Subject: [PATCH 2/4] Update devtools-amd64.wxs --- platforms/Windows/devtools-amd64.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/Windows/devtools-amd64.wxs b/platforms/Windows/devtools-amd64.wxs index 21db17a7..d996c51f 100644 --- a/platforms/Windows/devtools-amd64.wxs +++ b/platforms/Windows/devtools-amd64.wxs @@ -109,7 +109,7 @@ - + From c292cf6e070b46b07534ac37492ca63cbb75b868 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 15 Dec 2022 14:46:06 -0800 Subject: [PATCH 3/4] Update devtools-amd64.wxs --- platforms/Windows/devtools-amd64.wxs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/platforms/Windows/devtools-amd64.wxs b/platforms/Windows/devtools-amd64.wxs index d996c51f..10236a4f 100644 --- a/platforms/Windows/devtools-amd64.wxs +++ b/platforms/Windows/devtools-amd64.wxs @@ -104,7 +104,7 @@ - + @@ -177,6 +177,12 @@ + + + + + + From 5dadee1af44fb7f0605a5ab824e1b1310a66aae2 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 15 Dec 2022 14:47:59 -0800 Subject: [PATCH 4/4] Update devtools-arm64.wxs --- platforms/Windows/devtools-arm64.wxs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platforms/Windows/devtools-arm64.wxs b/platforms/Windows/devtools-arm64.wxs index 4601cd33..4e770aef 100644 --- a/platforms/Windows/devtools-arm64.wxs +++ b/platforms/Windows/devtools-arm64.wxs @@ -177,6 +177,12 @@ + + + + + +