diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 0000000000..c2dddd6871
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,12 @@
+<Project>
+  <PropertyGroup>
+    <Version>0.5.0</Version>
+    <AssemblyVersion>0.5.0</AssemblyVersion>
+    <InformationalVersion>0.5.0-beta</InformationalVersion>
+    <FileVersion>0.5.0</FileVersion>
+    <LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Company>Umbraco CMS</Company>
+    <Copyright>Copyright © Umbraco 2021</Copyright>
+  </PropertyGroup>
+</Project>
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
deleted file mode 100644
index 3a1f151388..0000000000
--- a/src/SolutionInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Resources;
-
-[assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// versions
-// read https://stackoverflow.com/questions/64602/what-are-differences-between-assemblyversion-assemblyfileversion-and-assemblyin
-
-// note: do NOT change anything here manually, use the build scripts
-
-// this is the ONLY ONE the CLR cares about for compatibility
-// should change ONLY when "hard" breaking compatibility (manual change)
-[assembly: AssemblyVersion("0.5.0")]
-
-// these are FYI and changed automatically
-[assembly: AssemblyFileVersion("0.5.0")]
-[assembly: AssemblyInformationalVersion("0.5.0-alpha003")]
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ee6f7370cb..933c00460c 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -8,6 +8,7 @@
         <InformationalVersion>0.5.0</InformationalVersion>
         <FileVersion>0.5.0</FileVersion>
         <Product>Umbraco CMS</Product>
+        <RootNamespace>Umbraco.Core</RootNamespace>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
index d1ad235c02..71f10f003b 100644
--- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
+++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
@@ -4,15 +4,15 @@
         <TargetFramework>net472</TargetFramework>
         <RootNamespace>Umbraco.Cms.Infrastructure.Examine</RootNamespace>
         <Product>Umbraco CMS</Product>
+        <RootNamespace>Umbraco.Examine</RootNamespace>
         <Title>Umbraco.Examine.Lucene</Title>
-        <LangVersion>8</LangVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
       <DebugSymbols>true</DebugSymbols>
       <DocumentationFile>bin\Release\Umbraco.Examine.Lucene.xml</DocumentationFile>
     </PropertyGroup>
-    
+
     <ItemGroup>
       <Compile Remove="obj\**" />
     </ItemGroup>
diff --git a/src/Umbraco.Infrastructure/Search/ExamineComposer.cs b/src/Umbraco.Infrastructure/Search/ExamineComposer.cs
index 9c903ec34f..45ba3c461e 100644
--- a/src/Umbraco.Infrastructure/Search/ExamineComposer.cs
+++ b/src/Umbraco.Infrastructure/Search/ExamineComposer.cs
@@ -22,10 +22,10 @@ namespace Umbraco.Cms.Infrastructure.Search
 
             // populators are not a collection: one cannot remove ours, and can only add more
             // the container can inject IEnumerable<IIndexPopulator> and get them all
-            builder.Services.AddSingleton<MemberIndexPopulator>();
-            builder.Services.AddSingleton<ContentIndexPopulator>();
-            builder.Services.AddSingleton<PublishedContentIndexPopulator>();
-            builder.Services.AddSingleton<MediaIndexPopulator>();
+            builder.Services.AddSingleton<IIndexPopulator, MemberIndexPopulator>();
+            builder.Services.AddSingleton<IIndexPopulator, ContentIndexPopulator>();
+            builder.Services.AddSingleton<IIndexPopulator, PublishedContentIndexPopulator>();
+            builder.Services.AddSingleton<IIndexPopulator, MediaIndexPopulator>();
 
             builder.Services.AddSingleton<IndexRebuilder>();
             builder.Services.AddUnique<IUmbracoIndexConfig, UmbracoIndexConfig>();
diff --git a/src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj b/src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj
index 54ff655ca9..93622540e4 100644
--- a/src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj
+++ b/src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <LangVersion>8</LangVersion>
         <TargetFramework>net472</TargetFramework>
         <RootNamespace>Umbraco.Cms.Persistence.SqlCe</RootNamespace>
     </PropertyGroup>
diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
index 9c40e8c2d0..8973054260 100644
--- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
+++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>Umbraco.Cms.Infrastructure.PublishedCache</RootNamespace>
         <LangVersion>8</LangVersion>
+        <RootNamespace>Umbraco.Infrastructure.PublishedCache</RootNamespace>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index f0947f2fde..9e4c6de077 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>Umbraco.Cms.Web.UI.NetCore</RootNamespace>
         <LangVersion>latest</LangVersion>
+        <RootNamespace>Umbraco.Web.UI.NetCore</RootNamespace>
     </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DocumentationFile>bin\Release\Umbraco.Web.UI.NetCore.xml</DocumentationFile>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index d8075d8867..6205dc67a3 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -126,9 +126,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -315,4 +312,4 @@
     <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
     <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index b56b4b1450..92009208b1 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -126,9 +126,6 @@
     <!--
     <Compile Include="**\*.cs" Exclude="obj\**\*.cs;**\*.aspx.cs;**\*.ascx.cs;**\*.designer.cs" />
     -->
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
     <Compile Include="AspNet\AspNetHostingEnvironment.cs" />
     <Compile Include="AspNet\AspNetApplicationShutdownRegistry.cs" />
     <Compile Include="AspNet\AspNetSessionManager.cs" />
@@ -233,4 +230,4 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 2056ef4601..b7f54cead9 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4
 		..\build\build-bootstrap.ps1 = ..\build\build-bootstrap.ps1
 		..\build\build.ps1 = ..\build\build.ps1
 		..\NuGet.Config = ..\NuGet.Config
-		SolutionInfo.cs = SolutionInfo.cs
 		..\linting\stylecop.json = ..\linting\stylecop.json
 		..\linting\codeanalysis.ruleset = ..\linting\codeanalysis.ruleset
 		..\linting\codeanalysis.tests.ruleset = ..\linting\codeanalysis.tests.ruleset