diff --git a/Yvand.EntraCP.Tests/Yvand.EntraCP.Tests.csproj b/Yvand.EntraCP.Tests/Yvand.EntraCP.Tests.csproj
index caa0e36..0700f2f 100644
--- a/Yvand.EntraCP.Tests/Yvand.EntraCP.Tests.csproj
+++ b/Yvand.EntraCP.Tests/Yvand.EntraCP.Tests.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{DB8C79E5-F7F7-4841-8A8C-A9832A9CAE88}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -20,22 +20,23 @@
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.SharePoint, Version=16.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
diff --git a/Yvand.EntraCP.sln b/Yvand.EntraCP.sln
index 1723932..5d508e6 100644
--- a/Yvand.EntraCP.sln
+++ b/Yvand.EntraCP.sln
@@ -16,14 +16,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EEC47949-34B5-4805-A04D-A372BE75D3CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EEC47949-34B5-4805-A04D-A372BE75D3CB}.Debug|x64.Build.0 = Debug|Any CPU
-		{EEC47949-34B5-4805-A04D-A372BE75D3CB}.Release|x64.ActiveCfg = Release|Any CPU
-		{EEC47949-34B5-4805-A04D-A372BE75D3CB}.Release|x64.Build.0 = Release|Any CPU
-		{DB8C79E5-F7F7-4841-8A8C-A9832A9CAE88}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DB8C79E5-F7F7-4841-8A8C-A9832A9CAE88}.Debug|x64.Build.0 = Debug|Any CPU
-		{DB8C79E5-F7F7-4841-8A8C-A9832A9CAE88}.Release|x64.ActiveCfg = Release|Any CPU
-		{DB8C79E5-F7F7-4841-8A8C-A9832A9CAE88}.Release|x64.Build.0 = Release|Any CPU
+		{EEC47949-34B5-4805-A04D-A372BE75D3CB}.Debug|x64.ActiveCfg = Debug|x64
+		{EEC47949-34B5-4805-A04D-A372BE75D3CB}.Debug|x64.Build.0 = Debug|x64
+		{EEC47949-34B5-4805-A04D-A372BE75D3CB}.Release|x64.ActiveCfg = Release|x64
+		{EEC47949-34B5-4805-A04D-A372BE75D3CB}.Release|x64.Build.0 = Release|x64
+		{DB8C79E5-F7F7-4841-8A8C-A9832A9CAE88}.Debug|x64.ActiveCfg = Debug|x64
+		{DB8C79E5-F7F7-4841-8A8C-A9832A9CAE88}.Debug|x64.Build.0 = Debug|x64
+		{DB8C79E5-F7F7-4841-8A8C-A9832A9CAE88}.Release|x64.ActiveCfg = Release|x64
+		{DB8C79E5-F7F7-4841-8A8C-A9832A9CAE88}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Yvand.EntraCP/Yvand.EntraCP.csproj b/Yvand.EntraCP/Yvand.EntraCP.csproj
index a498e30..a06e891 100644
--- a/Yvand.EntraCP/Yvand.EntraCP.csproj
+++ b/Yvand.EntraCP/Yvand.EntraCP.csproj
@@ -31,31 +31,32 @@
     <!-- <DebugType>embedded</DebugType> -->
   </PropertyGroup>
   <!-- Debug configuration -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>embedded</DebugType>
+  <!-- Release configuration -->
+  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <DebugType>embedded</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>8.0</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <!-- Release configuration -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <Optimize>true</Optimize>
+    <DebugType>portable</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>8.0</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
   </ItemGroup>