diff --git a/Directory.Build.props b/Directory.Build.props
index 1f59b4e81..38fbfde3f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -41,10 +41,15 @@
     <RID>$(RID)-$(PlatformTarget)</RID>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(CPPSHARP_RELEASE)' != 'true'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+      <DebugSymbols>true</DebugSymbols>
+      <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'DebugOpt'">
+      <DebugSymbols>true</DebugSymbols>
+      <DebugType>full</DebugType>
+      <Optimize>false</Optimize>
+      <DefineConstants>DEBUG</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DotNetCmd)' == 'dotnet' AND $(IsWindows)">
@@ -56,4 +61,9 @@
     <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(PackageDir)ref\$(GlobalTargetFramework)" Condition="'$(ProduceReferenceAssembly)' == 'true' AND '$(RID)' == 'win-x64'" />
     <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(PackageDir)runtimes\$(RID)\lib\$(GlobalTargetFramework)" />
   </Target>
+
+  <Target Name="ValidateCPPSHARPRelease" BeforeTargets="Build">
+      <Error Condition="'$(CPPSHARP_RELEASE)' == 'true' AND '$(Configuration)' != 'Release'"
+             Text="Configuration must be 'Release' when CPPSHARP_RELEASE is 'true'." />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/AST/CppSharp.AST.csproj b/src/AST/CppSharp.AST.csproj
index 67da38647..965ec0162 100644
--- a/src/AST/CppSharp.AST.csproj
+++ b/src/AST/CppSharp.AST.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
diff --git a/src/Core/CppSharp.csproj b/src/Core/CppSharp.csproj
index 7b852d0d8..404092bff 100644
--- a/src/Core/CppSharp.csproj
+++ b/src/Core/CppSharp.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
diff --git a/src/Generator/Generators/MSBuildGenerator.cs b/src/Generator/Generators/MSBuildGenerator.cs
index ab6fe8c5d..dfa3f50c2 100644
--- a/src/Generator/Generators/MSBuildGenerator.cs
+++ b/src/Generator/Generators/MSBuildGenerator.cs
@@ -24,7 +24,7 @@ public override void Process()
             Write($@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <PlatformTarget>{(Context.TargetInfo.PointerWidth == 64 ? "x64" : "x86")}</PlatformTarget>
     <OutputPath>{Options.OutputDir}</OutputPath>
     <DocumentationFile>{module.LibraryName}.xml</DocumentationFile>
diff --git a/src/Runtime/CppSharp.Runtime.csproj b/src/Runtime/CppSharp.Runtime.csproj
index 6b2ee9552..47bf5c915 100644
--- a/src/Runtime/CppSharp.Runtime.csproj
+++ b/src/Runtime/CppSharp.Runtime.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <LangVersion>7.3</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <IsPackable>true</IsPackable>
   </PropertyGroup>