diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d8ae9593..d4a23cdd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: ✓ check formatting
         run: |
-          dotnet tool update -g --version 4.1.* dotnet-format >nul || dotnet tool list -g
+          dotnet tool update -g --version 4.1.* dotnet-format
           dotnet format -f src --check -v:diag
 
       - name: 🙏 build
diff --git a/.netconfig b/.netconfig
index b3689c57..6a4d2269 100644
--- a/.netconfig
+++ b/.netconfig
@@ -26,17 +26,13 @@
 	url = https://github.com/kzu/oss/blob/main/.github/ISSUE_TEMPLATE/bug.md
 	etag = 026852ba1f1921f3a043bb5e09cd7a2c3d9a33ec51f48e524dc3a2ab72de3141
 	weak
-[file ".github/ISSUE_TEMPLATE/feature.md"]
-	url = https://github.com/kzu/oss/blob/main/.github/ISSUE_TEMPLATE/feature.md
-	etag = c5b7de1bc9eaf1f2ae6d1d2021e68084a5b1ab4800e9f129416d2838c128cad1
-	weak
 [file ".github/dependabot.yml"]
 	url = https://github.com/kzu/oss/blob/main/.github/dependabot.yml
 	etag = 2fc8a0d2b47091b058ae3e1f68333492044b49a684621f4939a0bce5bff869d5
 	weak
 [file ".github/workflows/build.yml"]
 	url = https://github.com/kzu/oss/blob/main/.github/workflows/build.yml
-	etag = c56db40b37f8dbcff13aea20eefc263caf825d17d86b0dc055ce504d8cb8ae9d
+	etag = 4d598303ec512578cff4b6d539929490ec844dd9c0605251bd769adbe120b50d
 	weak
 [file ".github/workflows/release.yml"]
 	url = https://github.com/kzu/oss/blob/main/.github/workflows/release.yml
@@ -64,11 +60,11 @@
 	weak
 [file "src/Directory.Build.props"]
 	url = https://github.com/kzu/oss/blob/main/src/Directory.Build.props
-	etag = d0b93d7533832a4d62cff69c71540bad3284bf92a7d2096b1a91607d72099d2b
+	etag = a74681138b2e306cce2cbfc4b73148bb5a060a040abf1d86d9116fa36601a376
 	weak
 [file "src/Directory.Build.targets"]
 	url = https://github.com/kzu/oss/blob/main/src/Directory.Build.targets
-	etag = a8ae94f091decde21c9f9b2d851647c1cb573746956c29448346d0ccb1478652
+	etag = 5493a6e0a33cf0efe11b49d71f30bbd2555c4f94924f07a3f39fa47e466b705d
 	weak
 [file "src/kzu.snk"]
 	url = https://github.com/kzu/oss/blob/main/src/kzu.snk
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index aade2e19..0273b1c9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,23 @@
 <Project>
   <!-- To extend/change the defaults, create a Directory.props alongside this file -->
 
+  <PropertyGroup Label="CI" Condition="'$(CI)' == ''">
+    <CI>false</CI>
+    <!-- GH, CircleCI, GitLab and BitBucket already use CI -->
+    <CI Condition="'$(TF_BUILD)' == 'true' or 
+                   '$(TEAMCITY_VERSION)' != '' or 
+                   '$(APPVEYOR)' != '' or 
+                   '$(BuildRunner)' == 'MyGet' or 
+                   '$(JENKINS_URL)' != '' or 
+                   '$(TRAVIS)' == 'true' or 
+                   '$(BUDDY)' == 'true'">true</CI>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- The Microsoft.Managed.Core.targets use this property to use deterministic source paths in CI builds -->
+    <ContinuousIntegrationBuild>$(CI)</ContinuousIntegrationBuild>
+  </PropertyGroup>
+  
   <PropertyGroup Label="NuGet">
     <Authors>kzu</Authors>
     <Copyright>Copyright (C) Daniel Cazzulino and Contributors. All rights reserved.</Copyright>
@@ -21,11 +38,10 @@
 
   <ItemGroup Label="NuGet">
     <!-- This is compatible with nugetizer and SDK pack -->
-    <Content Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" 
-             CopyToOutputDirectory="PreserveNewest" 
-             Pack="true" 
-             Visible="false"
-             PackagePath="%(Filename)%(Extension)" />
+    <None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" 
+          Pack="true" 
+          Visible="false"
+          PackagePath="%(Filename)%(Extension)" />
   </ItemGroup>
 
   <PropertyGroup Label="Build">
@@ -68,7 +84,12 @@
 
     <!-- See: https://www.cazzulino.com/project-dependencies-as-project-references.html -->
     <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
-  </PropertyGroup>
+
+    <!-- Don't warn for packages using semver 2.0 -->
+    <NoWarn>NU5105;$(NoWarn)</NoWarn>
+    <!-- Turn warnings into errors in CI or Release builds -->
+    <WarningsAsErrors Condition="$(CI) or '$(Configuration)' == 'Release'">true</WarningsAsErrors>
+</PropertyGroup>
 
   <PropertyGroup Label="Version">
     <!-- Versioning: when building locally, it's always 42.42.42. 
@@ -106,23 +127,5 @@
     <ProjectProperty Include="PublicKeyToken" />
   </ItemGroup>
 
-
-  <PropertyGroup Label="CI" Condition="'$(CI)' == ''">
-    <CI>false</CI>
-    <!-- GH, CircleCI, GitLab and BitBucket already use CI -->
-    <CI Condition="'$(TF_BUILD)' == 'true' or 
-                   '$(TEAMCITY_VERSION)' != '' or 
-                   '$(APPVEYOR)' != '' or 
-                   '$(BuildRunner)' == 'MyGet' or 
-                   '$(JENKINS_URL)' != '' or 
-                   '$(TRAVIS)' == 'true' or 
-                   '$(BUDDY)' == 'true'">true</CI>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- The Microsoft.Managed.Core.targets use this property to use deterministic source paths in CI builds -->
-    <ContinuousIntegrationBuild>$(CI)</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
   <Import Project="Directory.props" Condition="Exists('Directory.props')"/>
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 965161b7..eed9317f 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -59,29 +59,25 @@
   </ItemGroup>
 
   <!-- Make sure the source control info is available before calling source generators -->
-  <Target Name="EnsureProjectInformation" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun" DependsOnTargets="InitializeSourceControlInformation" />
-
-  <Target Name="_InitializeRepositoryProperties" 
-          DependsOnTargets="InitializeSourceControlInformation" 
-          Condition="'$(SourceControlInformationFeatureSupported)' == 'true'">
-    <PropertyGroup>
+  <Target Name="EnsureProjectInformation" 
+          BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun" 
+          DependsOnTargets="InitializeSourceControlInformation">
+    <PropertyGroup Condition="'$(SourceControlInformationFeatureSupported)' == 'true'">
+      <!-- The project must specify PublishRepositoryUrl=true in order to publish the URL, in order to prevent inadvertent leak of internal URL. -->
+      <RepositoryUrl Condition="'$(RepositoryUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(PrivateRepositoryUrl)</RepositoryUrl>
+      <RepositoryCommit Condition="'$(RepositoryCommit)' == ''">$(SourceRevisionId)</RepositoryCommit>
+      <RepositorySha Condition="'$(SourceRevisionId)' != ''">$(SourceRevisionId.Substring(0, 9))</RepositorySha>
     </PropertyGroup>    
   </Target>
 
   <!-- Always append the link to the direct source tree for the current build -->
   <Target Name="UpdatePackageMetadata"
           BeforeTargets="PrepareForBuild;GenerateMSBuildEditorConfigFileShouldRun;GetAssemblyVersion;GetPackageMetadata;GenerateNuspec;Pack"
-          DependsOnTargets="InitializeSourceControlInformation"
+          DependsOnTargets="EnsureProjectInformation"
           Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And
                      '$(IsPackable)' == 'true'">
     <PropertyGroup>
-      <!-- The project must specify PublishRepositoryUrl=true in order to publish the URL, in order to prevent inadvertent leak of internal URL. -->
-      <RepositoryUrl Condition="'$(RepositoryUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(PrivateRepositoryUrl)</RepositoryUrl>
       <PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl)</PackageProjectUrl>
-
-      <RepositoryCommit Condition="'$(RepositoryCommit)' == ''">$(SourceRevisionId)</RepositoryCommit>
-      <RepositorySha Condition="'$(SourceRevisionId)' != ''">$(SourceRevisionId.Substring(0, 9))</RepositorySha>
-
       <Description Condition="'$(SourceRevisionId)' != '' and '$(RepositoryUrl)' != ''">$(Description)
 
 Built from $(RepositoryUrl)/tree/$(SourceRevisionId.Substring(0, 9))
diff --git a/src/ThisAssembly.Project/ProjectPropertyGenerator.cs b/src/ThisAssembly.Project/ProjectPropertyGenerator.cs
index e7bb6428..e7de2c9c 100644
--- a/src/ThisAssembly.Project/ProjectPropertyGenerator.cs
+++ b/src/ThisAssembly.Project/ProjectPropertyGenerator.cs
@@ -26,7 +26,7 @@ public void Execute(GeneratorExecutionContext context)
                     value : null))
                 .Where(pair => pair.Value != null)
                 .Distinct(new KeyValueComparer())
-                .ToDictionary(x => x.Key, x => x.Value);
+                .ToDictionary(x => x.Key, x => x.Value!);
 
             var model = new Model(properties);
             var language = context.ParseOptions.Language;