Skip to content

Upgrade to .Net 4.8 and fix IntunePFXCertConnectorTestService.exe AssemblyName and test script and some cleanup #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michaelmsonne wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Upgrade to .Net 4.8 and fix IntunePFXCertConnectorTestService.exe AssemblyName and test script and some cleanup #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4484ef
Update to .Net 4.8
michaelmsonne Jan 19, 2023
8bd90f8
Fixed assembly name Microsoft.Management.PFXImport.IIntunePFXCertConn…
michaelmsonne Jan 19, 2023
bfb7540
Small cleanup
michaelmsonne Jan 19, 2023
68d3101
Merge branch 'master' into master
michaelmsonne Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/PFXImportPowershell/EncryptionUtilities/Source/CNGNCryptInterop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@

namespace Microsoft.Intune.EncryptionUtilities
{
using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
using System.Security.Cryptography;

/// <summary>
/// Provides a wrapper around native NCrypt dll calls. This handles checking NTSTATUS return values and throwing exceptions accordingly
Expand Down
2 changes: 1 addition & 1 deletion src/PFXImportPowershell/EncryptionUtilities/Source/EncryptionUtilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Intune.EncryptionUtilities</RootNamespace>
<AssemblyName>Microsoft.Intune.EncryptionUtilities</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectGuid>{D4FF3D7B-3C1A-47B0-9983-95DD89D2AED4}</ProjectGuid>
<TargetFrameworkProfile />
Expand Down
1 change: 0 additions & 1 deletion src/PFXImportPowershell/EncryptionUtilities/Source/ManagedRSAEncryption.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/PFXImportPowershell/EncryptionUtilities/UnitTests/EncryptionUtilitiesUnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Intune.Test.EncryptionUtilitiesUnitTests</RootNamespace>
<AssemblyName>EncryptionUtilitiesUnitTests</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Expand Down
2 changes: 1 addition & 1 deletion ...wershell/OnPremValidation/IntunePFXCertConnectorValidationPS/InstallAndRunTestService.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions src/PFXImportPowershell/OnPremValidation/IntunePFXCertConnectorValidationService/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
</configuration>
5 changes: 3 additions & 2 deletions ...on/IntunePFXCertConnectorValidationService/IntunePFXCertConnectorValidationService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
<ProjectGuid>{031F5622-EF2E-4F79-ABB4-25868F23DD36}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>Microsoft.Management.PFXImport.IntunePFXCertConnectorTestService</RootNamespace>
<AssemblyName>Microsoft.Management.PFXImport.IIntunePFXCertConnectorTestService</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<AssemblyName>Microsoft.Management.PFXImport.IntunePFXCertConnectorTestService</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down
2 changes: 1 addition & 1 deletion src/PFXImportPowershell/PFXImportPS/LogMessages.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/PFXImportPowershell/PFXImportPS/PFXImportPS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Management.Powershell.PFXImport</RootNamespace>
<AssemblyName>Microsoft.Management.Powershell.PFXImport</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/PFXImportPowershell/UnitTests/PFXImportPSUnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Management.Powershell.PFXImport.UnitTests</RootNamespace>
<AssemblyName>Microsoft.Management.Powershell.PFXImport.UnitTests</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Expand Down