From e4484eff8fca69958f194fa9f2f517bf35f18e9a Mon Sep 17 00:00:00 2001 From: Michael Morten Sonne Date: Thu, 19 Jan 2023 21:50:51 +0100 Subject: [PATCH 1/3] Update to .Net 4.8 --- .../EncryptionUtilities/Source/EncryptionUtilities.csproj | 2 +- .../UnitTests/EncryptionUtilitiesUnitTests.csproj | 2 +- src/PFXImportPowershell/PFXImportPS/LogMessages.Designer.cs | 2 +- src/PFXImportPowershell/PFXImportPS/PFXImportPS.csproj | 2 +- src/PFXImportPowershell/UnitTests/PFXImportPSUnitTests.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PFXImportPowershell/EncryptionUtilities/Source/EncryptionUtilities.csproj b/src/PFXImportPowershell/EncryptionUtilities/Source/EncryptionUtilities.csproj index 7a3e4a5..bf9eed2 100644 --- a/src/PFXImportPowershell/EncryptionUtilities/Source/EncryptionUtilities.csproj +++ b/src/PFXImportPowershell/EncryptionUtilities/Source/EncryptionUtilities.csproj @@ -8,7 +8,7 @@ Properties Microsoft.Intune.EncryptionUtilities Microsoft.Intune.EncryptionUtilities - v4.6 + v4.8 512 {D4FF3D7B-3C1A-47B0-9983-95DD89D2AED4} diff --git a/src/PFXImportPowershell/EncryptionUtilities/UnitTests/EncryptionUtilitiesUnitTests.csproj b/src/PFXImportPowershell/EncryptionUtilities/UnitTests/EncryptionUtilitiesUnitTests.csproj index fbd3528..c3eb14c 100644 --- a/src/PFXImportPowershell/EncryptionUtilities/UnitTests/EncryptionUtilitiesUnitTests.csproj +++ b/src/PFXImportPowershell/EncryptionUtilities/UnitTests/EncryptionUtilitiesUnitTests.csproj @@ -7,7 +7,7 @@ Properties Microsoft.Intune.Test.EncryptionUtilitiesUnitTests EncryptionUtilitiesUnitTests - v4.6 + v4.8 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 diff --git a/src/PFXImportPowershell/PFXImportPS/LogMessages.Designer.cs b/src/PFXImportPowershell/PFXImportPS/LogMessages.Designer.cs index a22c5a3..527092e 100644 --- a/src/PFXImportPowershell/PFXImportPS/LogMessages.Designer.cs +++ b/src/PFXImportPowershell/PFXImportPS/LogMessages.Designer.cs @@ -19,7 +19,7 @@ namespace Microsoft.Management.Powershell.PFXImport { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class LogMessages { diff --git a/src/PFXImportPowershell/PFXImportPS/PFXImportPS.csproj b/src/PFXImportPowershell/PFXImportPS/PFXImportPS.csproj index 58f9592..5a8534d 100644 --- a/src/PFXImportPowershell/PFXImportPS/PFXImportPS.csproj +++ b/src/PFXImportPowershell/PFXImportPS/PFXImportPS.csproj @@ -9,7 +9,7 @@ Properties Microsoft.Management.Powershell.PFXImport Microsoft.Management.Powershell.PFXImport - v4.7.2 + v4.8 512 diff --git a/src/PFXImportPowershell/UnitTests/PFXImportPSUnitTests.csproj b/src/PFXImportPowershell/UnitTests/PFXImportPSUnitTests.csproj index 83e2131..924b502 100644 --- a/src/PFXImportPowershell/UnitTests/PFXImportPSUnitTests.csproj +++ b/src/PFXImportPowershell/UnitTests/PFXImportPSUnitTests.csproj @@ -8,7 +8,7 @@ Properties Microsoft.Management.Powershell.PFXImport.UnitTests Microsoft.Management.Powershell.PFXImport.UnitTests - v4.7.2 + v4.8 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 From 8bd90f867cc34fd0eadd1accd891fca562e252a4 Mon Sep 17 00:00:00 2001 From: Michael Morten Sonne Date: Thu, 19 Jan 2023 21:55:08 +0100 Subject: [PATCH 2/3] Fixed assembly name Microsoft.Management.PFXImport.IIntunePFXCertConnectorTestService.exe to Microsoft.Management.PFXImport.IntunePFXCertConnectorTestService.exe and update to .Net 4.8 --- .../InstallAndRunTestService.ps1 | 2 +- .../IntunePFXCertConnectorValidationService/App.config | 6 +++--- .../IntunePFXCertConnectorValidationService.csproj | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationPS/InstallAndRunTestService.ps1 b/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationPS/InstallAndRunTestService.ps1 index bc18585..522d8c1 100644 --- a/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationPS/InstallAndRunTestService.ps1 +++ b/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationPS/InstallAndRunTestService.ps1 @@ -12,7 +12,7 @@ $credentials = New-Object System.Management.Automation.PSCredential ($serviceUse -$binaryPath = "$($serviceDirectory)\Microsoft.Management.PFXImport.IIntunePFXCertConnectorTestService.exe" +$binaryPath = "$($serviceDirectory)\Microsoft.Management.PFXImport.IntunePFXCertConnectorTestService.exe" # Creating Service Write-Host "Installing service: $serviceName" diff --git a/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationService/App.config b/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationService/App.config index 731f6de..4bfa005 100644 --- a/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationService/App.config +++ b/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationService/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationService/IntunePFXCertConnectorValidationService.csproj b/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationService/IntunePFXCertConnectorValidationService.csproj index faceb50..fa73833 100644 --- a/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationService/IntunePFXCertConnectorValidationService.csproj +++ b/src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationService/IntunePFXCertConnectorValidationService.csproj @@ -7,10 +7,11 @@ {031F5622-EF2E-4F79-ABB4-25868F23DD36} WinExe Microsoft.Management.PFXImport.IntunePFXCertConnectorTestService - Microsoft.Management.PFXImport.IIntunePFXCertConnectorTestService - v4.6.1 + Microsoft.Management.PFXImport.IntunePFXCertConnectorTestService + v4.8 512 true + AnyCPU From bfb7540fcad920fa1e705f622d4b978e511f8564 Mon Sep 17 00:00:00 2001 From: Michael Morten Sonne Date: Thu, 19 Jan 2023 22:00:20 +0100 Subject: [PATCH 3/3] Small cleanup --- .../EncryptionUtilities/Source/CNGNCryptInterop.cs | 3 --- .../EncryptionUtilities/Source/ManagedRSAEncryption.cs | 1 - 2 files changed, 4 deletions(-) diff --git a/src/PFXImportPowershell/EncryptionUtilities/Source/CNGNCryptInterop.cs b/src/PFXImportPowershell/EncryptionUtilities/Source/CNGNCryptInterop.cs index 1ef9cbc..865334a 100644 --- a/src/PFXImportPowershell/EncryptionUtilities/Source/CNGNCryptInterop.cs +++ b/src/PFXImportPowershell/EncryptionUtilities/Source/CNGNCryptInterop.cs @@ -23,10 +23,7 @@ namespace Microsoft.Intune.EncryptionUtilities { - using System; using System.Diagnostics.CodeAnalysis; - using System.Runtime.InteropServices; - using System.Security.Cryptography; /// /// Provides a wrapper around native NCrypt dll calls. This handles checking NTSTATUS return values and throwing exceptions accordingly diff --git a/src/PFXImportPowershell/EncryptionUtilities/Source/ManagedRSAEncryption.cs b/src/PFXImportPowershell/EncryptionUtilities/Source/ManagedRSAEncryption.cs index cd345b0..b36a4be 100644 --- a/src/PFXImportPowershell/EncryptionUtilities/Source/ManagedRSAEncryption.cs +++ b/src/PFXImportPowershell/EncryptionUtilities/Source/ManagedRSAEncryption.cs @@ -31,7 +31,6 @@ namespace Microsoft.Intune.EncryptionUtilities using System.Security.Cryptography.Pkcs; using System.Security.Cryptography.X509Certificates; using System.Security.Principal; - using System.Text; public class ManagedRSAEncryption : ICNGLocalKeyCrypto {