From cfa378921112aa7eea87b960b8566b509208a802 Mon Sep 17 00:00:00 2001 From: David Boike Date: Wed, 8 Nov 2023 13:39:52 -0600 Subject: [PATCH 1/2] Lock 2 dependencies to versions that won't conflict with PowerShell 7.2 --- src/Directory.Packages.props | 7 +++++-- .../ServiceControl.Management.PowerShell.csproj | 2 +- .../ServiceControlInstaller.PowerShell.csproj | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index df4ed31aa4..74bf32ebc7 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -68,11 +68,9 @@ - - @@ -88,6 +86,11 @@ + + + + + diff --git a/src/ServiceControl.Management.PowerShell/ServiceControl.Management.PowerShell.csproj b/src/ServiceControl.Management.PowerShell/ServiceControl.Management.PowerShell.csproj index 6636c8fc6a..dbbb5d0368 100644 --- a/src/ServiceControl.Management.PowerShell/ServiceControl.Management.PowerShell.csproj +++ b/src/ServiceControl.Management.PowerShell/ServiceControl.Management.PowerShell.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/ServiceControlInstaller.PowerShell/ServiceControlInstaller.PowerShell.csproj b/src/ServiceControlInstaller.PowerShell/ServiceControlInstaller.PowerShell.csproj index 769485ec98..b6b65b60f7 100644 --- a/src/ServiceControlInstaller.PowerShell/ServiceControlInstaller.PowerShell.csproj +++ b/src/ServiceControlInstaller.PowerShell/ServiceControlInstaller.PowerShell.csproj @@ -10,7 +10,7 @@ - + From 6339fc13088bce13e3e2d4a9956d0e26dd84d9d4 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Wed, 8 Nov 2023 15:29:35 -0500 Subject: [PATCH 2/2] Fix formatting --- src/Directory.Packages.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 74bf32ebc7..96b5aa368d 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -86,10 +86,10 @@ - + - - + +