diff --git a/X10D/X10D.csproj b/X10D/X10D.csproj
index 06e70ac..dd5e161 100644
--- a/X10D/X10D.csproj
+++ b/X10D/X10D.csproj
@@ -8,7 +8,6 @@
         <ImplicitUsings>true</ImplicitUsings>
         <Authors>Oliver Booth</Authors>
         <NeutralLanguage>en</NeutralLanguage>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <RepositoryUrl>https://github.com/oliverbooth/X10D</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <Description>Extension methods on crack.</Description>
@@ -16,15 +15,30 @@
         <PackageIcon>icon.png</PackageIcon>
         <PackageIconUrl/>
         <PackageTags>dotnet extension-methods</PackageTags>
-        <Version>2.6.0</Version>
         <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
-        <AssemblyVersion>2.6.0</AssemblyVersion>
-        <FileVersion>2.6.0</FileVersion>
-        <PackageVersion>2.6.0</PackageVersion>
+        <VersionPrefix>3.0.0</VersionPrefix>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">
+        <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
+        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
+        <FileVersion>$(VersionPrefix).0</FileVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">
+        <Version>$(VersionPrefix)-$(VersionSuffix).$(BuildNumber)</Version>
+        <AssemblyVersion>$(VersionPrefix).$(BuildNumber)</AssemblyVersion>
+        <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(VersionSuffix)' == ''">
+        <Version>$(VersionPrefix)</Version>
+        <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
+        <FileVersion>$(VersionPrefix).0</FileVersion>
+    </PropertyGroup>
+
     <ItemGroup>
         <None Include="..\icon.png">
             <Pack>True</Pack>