Merge remote-tracking branch 'origin/v9/dev' into v10/dev

# Conflicts:
#	src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs

build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets

@@ -90,4 +90,10 @@
         <RemoveDir Directories="@(WwwrootUmbracoPackageDir)"  />
     </Target>
 
+    <Target Name="IncludeUmbracoRazorFiles" BeforeTargets="ResolveRazorGenerateInputs">
+        <ItemGroup>
+            <Content Include="$(MSBuildProjectDirectory)\umbraco\**\*.cshtml" />
+        </ItemGroup>
+    </Target>
+
 </Project>