diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..ba9bbd1
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,26 @@
+<Project>
+
+  <PropertyGroup>
+    <!-- Package Icon -->
+    <PackageIcon>NSS-128x128.png</PackageIcon>
+    <PackageIconUrl />
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+
+    <!-- Common solution settings -->
+    <OutputPath>$(SolutionDir)bin\</OutputPath>
+    <PackageOutputDir>$(SolutionDir)bin\</PackageOutputDir>
+    <LangVersion>latest</LangVersion>
+
+    <!-- Docs and symbols generation -->
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="$(SolutionDir)assets\NSS-128x128.png" Pack="true" PackagePath="\" />
+    <None Include="$(SolutionDir)README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Nefarius.Peripherals.SerialPort.sln b/Nefarius.Peripherals.SerialPort.sln
index 3908637..43e9f32 100644
--- a/Nefarius.Peripherals.SerialPort.sln
+++ b/Nefarius.Peripherals.SerialPort.sln
@@ -7,6 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nefarius.Peripherals.Serial
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{99052083-B245-462F-8778-4C94662ABABE}"
 	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
 		Local.testsettings = Local.testsettings
 		PInvokeSerialPort.vsmdi = PInvokeSerialPort.vsmdi
 		README.md = README.md
diff --git a/Nefarius.Peripherals.SerialPort/Nefarius.Peripherals.SerialPort.csproj b/Nefarius.Peripherals.SerialPort/Nefarius.Peripherals.SerialPort.csproj
index 7efce75..e67c7cd 100644
--- a/Nefarius.Peripherals.SerialPort/Nefarius.Peripherals.SerialPort.csproj
+++ b/Nefarius.Peripherals.SerialPort/Nefarius.Peripherals.SerialPort.csproj
@@ -1,21 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Ebrahim Byagowi, Benjamin Höglinger-Stelzer</Authors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageProjectUrl>https://github.com/nefarius/PInvokeSerialPort</PackageProjectUrl>
     <RepositoryUrl>https://github.com/nefarius/PInvokeSerialPort</RepositoryUrl>
     <PackageId>Nefarius.Peripherals.SerialPort</PackageId>
     <Description>P/Invoke wrapper for Win32API serial port</Description>
-    <Copyright>Copyright 2012-2017 Ebrahim Byagowi, 2018-2022 Benjamin Höglinger-Stelzer</Copyright>
-    <PackageIconUrl>https://raw.githubusercontent.com/Nefarius/PInvokeSerialPort/master/ProjectIcon.png</PackageIconUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/nefarius/PInvokeSerialPort/master/LICENSE</PackageLicenseUrl>
+    <Copyright>Copyright 2012-2017 Ebrahim Byagowi, 2018-2024 Benjamin Höglinger-Stelzer</Copyright>
     <Version>1.0.0</Version>
-    <OutputPath>$(SolutionDir)bin\</OutputPath>
-    <PackageIcon>NSS-128x128.png</PackageIcon>
-    <PackageIconUrl />
-    <LangVersion>latest</LangVersion>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -28,13 +23,6 @@
     <None Remove="Properties\**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\assets\NSS-128x128.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.123">
       <PrivateAssets>all</PrivateAssets>
diff --git a/PInvokeSerialPort.Sample/PInvokeSerialPort.Sample.csproj b/PInvokeSerialPort.Sample/PInvokeSerialPort.Sample.csproj
index 5777734..32a4d1a 100755
--- a/PInvokeSerialPort.Sample/PInvokeSerialPort.Sample.csproj
+++ b/PInvokeSerialPort.Sample/PInvokeSerialPort.Sample.csproj
@@ -9,8 +9,10 @@
     <Copyright>Copyright ©  2012</Copyright>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <LangVersion>latest</LangVersion>
+
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\Nefarius.Peripherals.SerialPort\Nefarius.Peripherals.SerialPort.csproj" />
   </ItemGroup>