diff --git a/src/Demo/Demo.csproj b/src/Demo/Demo.csproj
index e830460..120e80e 100644
--- a/src/Demo/Demo.csproj
+++ b/src/Demo/Demo.csproj
@@ -1,22 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <!-- Version -->
+    <VersionPrefix>1.0.0</VersionPrefix>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- Assembly attributes -->
     <AssemblyTitle>WpfMessageBoxDemo</AssemblyTitle>
     <Description>Application used to demonstrate the capabilities of the WpfMessageBox</Description>
     <Product>WpfMessageBoxDemo</Product>
-    <Copyright>ⓒ Otiel $([System.DateTime]::Now.Year)</Copyright>
+  </PropertyGroup>
 
-    <AppendPlatformToOutputPath>false</AppendPlatformToOutputPath>
+  <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net48;net9.0-windows;net10.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
-
-    <VersionPrefix>1.0.0</VersionPrefix>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <VersionSuffix>pre$([System.DateTime]::Now.ToString("yyyyMMdd-HHmmss"))</VersionSuffix>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 0000000..af29133
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,15 @@
+<Project>
+
+  <PropertyGroup>
+    <Copyright>ⓒ Otiel $([System.DateTime]::Now.Year)</Copyright>
+    <AppendPlatformToOutputPath>false</AppendPlatformToOutputPath>
+    <TargetFrameworks>net48;net9.0-windows;net10.0-windows</TargetFrameworks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <VersionSuffix>pre$([System.DateTime]::Now.ToString("yyyyMMdd-HHmmss"))</VersionSuffix>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/WpfMessageBox.sln b/src/WpfMessageBox.sln
index faac044..c646cdf 100644
--- a/src/WpfMessageBox.sln
+++ b/src/WpfMessageBox.sln
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
 		..\README.md = ..\README.md
 		..\.github\workflows\dotnet.yml = ..\.github\workflows\dotnet.yml
 		global.json = global.json
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
 Global
diff --git a/src/WpfMessageBox/WpfMessageBox.csproj b/src/WpfMessageBox/WpfMessageBox.csproj
index 1a69231..959a659 100644
--- a/src/WpfMessageBox/WpfMessageBox.csproj
+++ b/src/WpfMessageBox/WpfMessageBox.csproj
@@ -1,20 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <!-- Version -->
+    <VersionPrefix>1.3.0</VersionPrefix>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- Assembly attributes -->
     <AssemblyTitle>WpfMessageBox</AssemblyTitle>
     <Description>A WPF message box, with optional features like custom buttons, textbox and checkbox.</Description>
     <Product>WpfMessageBox</Product>
-    <Copyright>ⓒ Otiel $([System.DateTime]::Now.Year)</Copyright>
+  </PropertyGroup>
 
-    <AppendPlatformToOutputPath>false</AppendPlatformToOutputPath>
-    <TargetFrameworks>net48;net9.0-windows;net10.0-windows</TargetFrameworks>
+  <PropertyGroup>
     <UseWPF>true</UseWPF>
-
-    <VersionPrefix>1.3.0</VersionPrefix>
-
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <!-- Package properties -->
     <PackageId>WpfMessageBox</PackageId>
     <Authors>Otiel</Authors>
@@ -27,10 +31,6 @@
     <PackageTags>wpf messagebox message box</PackageTags>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <VersionSuffix>pre$([System.DateTime]::Now.ToString("yyyyMMdd-HHmmss"))</VersionSuffix>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     <None Include="..\..\docs\images\Icon.64x64.png" Pack="true" PackagePath="\" />