From 82eb085ed040c0b7a16eea4ab203d7709c1d9765 Mon Sep 17 00:00:00 2001 From: alerickson <25858831+alerickson@users.noreply.github.com> Date: Tue, 15 Aug 2023 12:56:10 -0700 Subject: [PATCH 1/6] Update PSResourceGet to beta24 --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index ae56290cfb3..f7abd35a6f7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -13,7 +13,7 @@ - + From 99a70fce7a477129e1cd9196c34f4f44ada2063e Mon Sep 17 00:00:00 2001 From: alerickson <25858831+alerickson@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:53:55 +0000 Subject: [PATCH 2/6] Add dependencies to boms --- tools/packaging/boms/linux.json | 4 ++++ tools/packaging/boms/mac.json | 4 ++++ tools/packaging/boms/windows.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/tools/packaging/boms/linux.json b/tools/packaging/boms/linux.json index 9f5f886a4ca..1e6c7fd0cca 100644 --- a/tools/packaging/boms/linux.json +++ b/tools/packaging/boms/linux.json @@ -495,6 +495,10 @@ "Pattern": "Modules/PSResourceGet/_manifest/spdx_2.2/*.cat", "FileType": "NonProduct" }, + { + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll", + "FileType": "NonProduct" + }, { "Pattern": "Modules/ThreadJob/*.dll", "FileType": "NonProduct" diff --git a/tools/packaging/boms/mac.json b/tools/packaging/boms/mac.json index a4b5bc2bffb..0fcfb5847dd 100644 --- a/tools/packaging/boms/mac.json +++ b/tools/packaging/boms/mac.json @@ -375,6 +375,10 @@ "Pattern": "Modules/PSResourceGet/_manifest/spdx_2.2/*.cat", "FileType": "NonProduct" }, + { + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll", + "FileType": "NonProduct" + }, { "Pattern": "Modules/ThreadJob/*.dll", "FileType": "NonProduct" diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json index 8f47f13768e..7108073eba6 100644 --- a/tools/packaging/boms/windows.json +++ b/tools/packaging/boms/windows.json @@ -835,6 +835,10 @@ "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/PSGet.Format.ps1xml", "FileType": "NonProduct" }, + { + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll", + "FileType": "NonProduct" + }, { "Pattern": "Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1", "FileType": "NonProduct" From ab7326b2f349f7c804552f22495d988b2cb5e61c Mon Sep 17 00:00:00 2001 From: alerickson <25858831+alerickson@users.noreply.github.com> Date: Wed, 16 Aug 2023 18:33:45 +0000 Subject: [PATCH 3/6] Update boms --- tools/packaging/boms/linux.json | 18 +++++++----------- tools/packaging/boms/mac.json | 18 +++++++----------- tools/packaging/boms/windows.json | 4 ---- 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/tools/packaging/boms/linux.json b/tools/packaging/boms/linux.json index 1e6c7fd0cca..7d7730bece4 100644 --- a/tools/packaging/boms/linux.json +++ b/tools/packaging/boms/linux.json @@ -468,35 +468,31 @@ "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/*.dll", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/_manifest/spdx_2.2/manifest.cat", "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/*.ps?1", - "FileType": "NonProduct" - }, - { - "Pattern": "Modules/PSResourceGet/*.ps1xml", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll", "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/LICENSE", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/LICENSE", "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/Notice.txt", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.dll", "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/_manifest/spdx_2.2/*.json*", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.psd1", "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/_manifest/spdx_2.2/*.cat", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Notice.txt", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/PSGet.Format.ps1xml", "FileType": "NonProduct" }, { diff --git a/tools/packaging/boms/mac.json b/tools/packaging/boms/mac.json index 0fcfb5847dd..40e7085cad2 100644 --- a/tools/packaging/boms/mac.json +++ b/tools/packaging/boms/mac.json @@ -348,35 +348,31 @@ "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/*.dll", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/_manifest/spdx_2.2/manifest.cat", "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/*.ps?1", - "FileType": "NonProduct" - }, - { - "Pattern": "Modules/PSResourceGet/*.ps1xml", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll", "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/LICENSE", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/LICENSE", "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/Notice.txt", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.dll", "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/_manifest/spdx_2.2/*.json*", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.psd1", "FileType": "NonProduct" }, { - "Pattern": "Modules/PSResourceGet/_manifest/spdx_2.2/*.cat", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Notice.txt", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/PSGet.Format.ps1xml", "FileType": "NonProduct" }, { diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json index 7108073eba6..8f47f13768e 100644 --- a/tools/packaging/boms/windows.json +++ b/tools/packaging/boms/windows.json @@ -835,10 +835,6 @@ "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/PSGet.Format.ps1xml", "FileType": "NonProduct" }, - { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll", - "FileType": "NonProduct" - }, { "Pattern": "Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1", "FileType": "NonProduct" From f3004d257c05d4d39a19002597d49d7f03c53d12 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 16 Aug 2023 12:19:54 -0700 Subject: [PATCH 4/6] Update windows.json --- tools/packaging/boms/windows.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json index 8f47f13768e..75520ed9182 100644 --- a/tools/packaging/boms/windows.json +++ b/tools/packaging/boms/windows.json @@ -899,6 +899,10 @@ "Pattern": "Modules/ThreadJob/*.psd1", "FileType": "NonProduct" }, + { + "Pattern": "Modules\\Microsoft.PowerShell.PSResourceGet\\Microsoft.PowerShell.PSResourceGet.psm1", + "FileType": "NonProduct" + }, { "Pattern": "mscordaccore_*.dll", "FileType": "NonProduct" From 84cf58bda43e29b35a8c1129161abd0862a3ee41 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 16 Aug 2023 12:24:55 -0700 Subject: [PATCH 5/6] Update tools/packaging/boms/windows.json --- tools/packaging/boms/windows.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json index 75520ed9182..f1a9bec1ed5 100644 --- a/tools/packaging/boms/windows.json +++ b/tools/packaging/boms/windows.json @@ -900,7 +900,7 @@ "FileType": "NonProduct" }, { - "Pattern": "Modules\\Microsoft.PowerShell.PSResourceGet\\Microsoft.PowerShell.PSResourceGet.psm1", + "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.psm1", "FileType": "NonProduct" }, { From 7ed673ecf9355c86baa56541c0defd596f3a1631 Mon Sep 17 00:00:00 2001 From: alerickson <25858831+alerickson@users.noreply.github.com> Date: Wed, 16 Aug 2023 19:25:04 +0000 Subject: [PATCH 6/6] Revert linux and mac bom changes --- tools/packaging/boms/linux.json | 14 +++++++------- tools/packaging/boms/mac.json | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/packaging/boms/linux.json b/tools/packaging/boms/linux.json index 7d7730bece4..9f5f886a4ca 100644 --- a/tools/packaging/boms/linux.json +++ b/tools/packaging/boms/linux.json @@ -468,31 +468,31 @@ "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/_manifest/spdx_2.2/manifest.cat", + "Pattern": "Modules/PSResourceGet/*.dll", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll", + "Pattern": "Modules/PSResourceGet/*.ps?1", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/LICENSE", + "Pattern": "Modules/PSResourceGet/*.ps1xml", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.dll", + "Pattern": "Modules/PSResourceGet/LICENSE", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.psd1", + "Pattern": "Modules/PSResourceGet/Notice.txt", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Notice.txt", + "Pattern": "Modules/PSResourceGet/_manifest/spdx_2.2/*.json*", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/PSGet.Format.ps1xml", + "Pattern": "Modules/PSResourceGet/_manifest/spdx_2.2/*.cat", "FileType": "NonProduct" }, { diff --git a/tools/packaging/boms/mac.json b/tools/packaging/boms/mac.json index 40e7085cad2..a4b5bc2bffb 100644 --- a/tools/packaging/boms/mac.json +++ b/tools/packaging/boms/mac.json @@ -348,31 +348,31 @@ "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/_manifest/spdx_2.2/manifest.cat", + "Pattern": "Modules/PSResourceGet/*.dll", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/dependencies/*.dll", + "Pattern": "Modules/PSResourceGet/*.ps?1", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/LICENSE", + "Pattern": "Modules/PSResourceGet/*.ps1xml", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.dll", + "Pattern": "Modules/PSResourceGet/LICENSE", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Microsoft.PowerShell.PSResourceGet.psd1", + "Pattern": "Modules/PSResourceGet/Notice.txt", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/Notice.txt", + "Pattern": "Modules/PSResourceGet/_manifest/spdx_2.2/*.json*", "FileType": "NonProduct" }, { - "Pattern": "Modules/Microsoft.PowerShell.PSResourceGet/PSGet.Format.ps1xml", + "Pattern": "Modules/PSResourceGet/_manifest/spdx_2.2/*.cat", "FileType": "NonProduct" }, {