diff --git a/Confuser2.slnx b/Confuser2.slnx
index c3ee6225..8adac989 100644
--- a/Confuser2.slnx
+++ b/Confuser2.slnx
@@ -10,6 +10,7 @@
     <File Path="appveyor.yml" />
     <File Path="ConfuserEx.Common.props" />
     <File Path="ConfuserEx.Common.targets" />
+    <File Path="Directory.Build.props" />
     <File Path="LICENSE.md" />
     <File Path="README.md" />
     <File Path="version.json" />
diff --git a/ConfuserEx.Common.props b/ConfuserEx.Common.props
index 4c1bc948..9d32ec30 100644
--- a/ConfuserEx.Common.props
+++ b/ConfuserEx.Common.props
@@ -2,24 +2,6 @@
 
   <PropertyGroup Label="C-Sharp Compiler Settings" Condition="'$(MSBuildProjectExtension)' == '.csproj'">
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <LangVersion>7.3</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Label="Assembly Information">
-    <_CurrentYear>$([System.DateTime]::Now.ToString(yyyy))</_CurrentYear>
-    <Authors>Ki;Martin Karing;Andrii Kurdiumov</Authors>
-    <Copyright>Copyright © 2014 Ki, 2018 - 2022 Martin Karing, 2016 - $(_CurrentYear) Andrii Kurdiumov</Copyright>
-    <RepositoryUrl>https://github.com/kant2002/ConfuserEx.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-  </PropertyGroup>
-  
-  <PropertyGroup Label="Language">
-    <NeutralLanguage>en</NeutralLanguage>
-  </PropertyGroup>
-  
-  <PropertyGroup Label="SourceLink">
-	<SourceLinkServerType>GitHub</SourceLinkServerType>
-	<SourceLinkOriginUrl>$(RepositoryUrl)</SourceLinkOriginUrl>
   </PropertyGroup> 
   
   <PropertyGroup Label="Code Analysis">
diff --git a/Directory.Build.props b/Directory.Build.props
index 3cd50338..5d49da36 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,23 @@
 <Project>
   <PropertyGroup>
     <UseArtifactsOutput>true</UseArtifactsOutput>
+    <!--<LangVersion>11.0</LangVersion>-->
+  </PropertyGroup>
+
+  <PropertyGroup Label="Assembly Information">
+    <_CurrentYear>$([System.DateTime]::Now.ToString(yyyy))</_CurrentYear>
+    <Authors>Ki;Martin Karing;Andrii Kurdiumov</Authors>
+    <Copyright>Copyright © 2014 Ki, 2018 - 2022 Martin Karing, 2016 - $(_CurrentYear) Andrii Kurdiumov</Copyright>
+    <RepositoryUrl>https://github.com/kant2002/ConfuserEx.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Language">
+    <NeutralLanguage>en</NeutralLanguage>
+  </PropertyGroup>
+
+  <PropertyGroup Label="SourceLink">
+    <SourceLinkServerType>GitHub</SourceLinkServerType>
+    <SourceLinkOriginUrl>$(RepositoryUrl)</SourceLinkOriginUrl>
   </PropertyGroup>
 </Project>
diff --git a/Tests/Confuser.Core.Test/Project/ConfuserProjectTest.cs b/Tests/Confuser.Core.Test/Project/ConfuserProjectTest.cs
new file mode 100644
index 00000000..676e1fd3
--- /dev/null
+++ b/Tests/Confuser.Core.Test/Project/ConfuserProjectTest.cs
@@ -0,0 +1,38 @@
+using System.IO;
+using System.Xml;
+using Confuser.Core.Project;
+using Xunit;
+
+namespace Confuser.Core.Test {
+	public class ConfuserProjectTest {
+		[Fact]
+		public void SerializeConfuserProjectSuccessfully() {
+			var proj = new ConfuserProject();
+			proj.BaseDirectory = @"c:\obfuscation\input";
+			proj.OutputDirectory = @"c:\obfuscation\output";
+			proj.Debug = true;
+			proj.Add(new ProjectModule() {
+				Path = @"c:\obfuscation\input\test.dll"
+			});
+			proj.Add(new ProjectModule() {
+				Path = @"c:\obfuscation\input\test2.dll"
+			});
+			proj.ProbePaths.Add(@"c:\obfuscation\input\bin");
+
+			var xmlDoc = proj.Save();
+			var stringWriter = new StringWriter();
+			var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings() { Indent = true });
+			xmlDoc.WriteTo(xmlWriter);
+			xmlWriter.Flush();
+
+			Assert.Equal(
+				@"<?xml version=""1.0"" encoding=""utf-16""?>
+<project outputDir=""c:\obfuscation\output"" baseDir=""c:\obfuscation\input"" debug=""true"" xmlns=""http://confuser.codeplex.com"">
+  <module path=""c:\obfuscation\input\test.dll"" />
+  <module path=""c:\obfuscation\input\test2.dll"" />
+  <probePath>c:\obfuscation\input\bin</probePath>
+</project>".Replace("\r\n", "\n"),
+				stringWriter.ToString().Replace("\r\n", "\n"));
+		}
+	}
+}