diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b0b9d94..618163e 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,13 +4,7 @@
   <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>
+    <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>
@@ -150,7 +144,7 @@
     <Using Include="System.ArgumentNullException" Static="true" />
   </ItemGroup>
 
-  <Import Project="Directory.props" Condition="Exists('Directory.props')"/>
+  <Import Project="Directory.props" Condition="Exists('Directory.props')" />
   <Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
 
   <!-- If the imported props changed ManagePackageVersionsCentrally, we need to replicate 
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 6232750..973d538 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -37,26 +37,14 @@
     <!-- Only difference is we don't copy either to output directory -->
 
     <!-- Project-level icon/readme will already be part of None items -->
-    <None Update="@(None -> WithMetadataValue('Filename', 'icon'))" 
-          Pack="true" PackagePath="%(Filename)%(Extension)" 
-          CopyToOutputDirectory="Never"
-          Condition="'$(PackageIcon)' != ''" />
-
-    <None Update="@(None -> WithMetadataValue('Filename', 'readme'))" 
-          Pack="true" PackagePath="%(Filename)%(Extension)" 
-          CopyToOutputDirectory="Never"
-          Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" />
+    <None Update="@(None -&gt; WithMetadataValue('Filename', 'icon'))" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="'$(PackageIcon)' != ''" />
+
+    <None Update="@(None -&gt; WithMetadataValue('Filename', 'readme'))" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" />
     
     <!-- src-level will need explicit inclusion -->
-    <None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" Visible="false" 
-          Pack="true" PackagePath="%(Filename)%(Extension)"
-          CopyToOutputDirectory="Never"
-          Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" />
-
-    <None Include="$(MSBuildThisFileDirectory)readme.md" Link="readme.md"  
-          Pack="true" PackagePath="%(Filename)%(Extension)"
-          CopyToOutputDirectory="Never"
-          Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" />
+    <None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" Visible="false" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" />
+
+    <None Include="$(MSBuildThisFileDirectory)readme.md" Link="readme.md" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" />
   </ItemGroup>
 
   <!-- Microsoft.NET.Sdk\targets\Microsoft.NET.DefaultAssemblyInfo.targets does this and is imported 
@@ -115,7 +103,7 @@
     <!-- Consider the project out of date if any of these files changes -->
     <UpToDateCheck Include="@(None);@(Content);@(EmbeddedResource)" />
     <!-- Opt-in to typed resource generation by setting custom tool to MSBuild:Compile -->
-    <EmbeddedResource Update="@(EmbeddedResource -> WithMetadataValue('Generator', 'MSBuild:Compile'))" Type="Resx">
+    <EmbeddedResource Update="@(EmbeddedResource -&gt; WithMetadataValue('Generator', 'MSBuild:Compile'))" Type="Resx">
       <!-- Default to Just Works resources generation. See https://www.cazzulino.com/resources.html -->
       <StronglyTypedFileName>$(IntermediateOutputPath)\$([MSBuild]::ValueOrDefault('%(RelativeDir)', '').Replace('\', '.').Replace('/', '.'))%(Filename).g$(DefaultLanguageSourceExtension)</StronglyTypedFileName>
       <StronglyTypedLanguage>$(Language)</StronglyTypedLanguage>
@@ -141,10 +129,7 @@
   </ItemGroup>
 
   <!-- Make sure the source control info is available before calling source generators -->
-  <Target Name="EnsureProjectInformation" 
-          BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun"
-          AfterTargets="InitializeSourceControlInformation"
-          DependsOnTargets="InitializeSourceControlInformation">
+  <Target Name="EnsureProjectInformation" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun" AfterTargets="InitializeSourceControlInformation" 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. -->
@@ -160,7 +145,7 @@
 
     <!-- Add SourceRoot as a project property too -->
     <ItemGroup>
-      <_GitSourceRoot Include="@(SourceRoot -> WithMetadataValue('SourceControl', 'git'))" />
+      <_GitSourceRoot Include="@(SourceRoot -&gt; WithMetadataValue('SourceControl', 'git'))" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -169,11 +154,7 @@
 
   </Target>
 
-  <Target Name="UpdatePackageMetadata"
-          BeforeTargets="PrepareForBuild;GenerateMSBuildEditorConfigFileShouldRun;GetAssemblyVersion;GetPackageMetadata;GenerateNuspec;Pack"
-          DependsOnTargets="EnsureProjectInformation"
-          Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And
-                     '$(IsPackable)' == 'true'">
+  <Target Name="UpdatePackageMetadata" BeforeTargets="PrepareForBuild;GenerateMSBuildEditorConfigFileShouldRun;GetAssemblyVersion;GetPackageMetadata;GenerateNuspec;Pack" DependsOnTargets="EnsureProjectInformation" Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And                      '$(IsPackable)' == 'true'">
     <PropertyGroup>
       <PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl)</PackageProjectUrl>
       <PackageDescription>$(Description)</PackageDescription>
@@ -182,7 +163,7 @@
   </Target>
 
   <!-- Import before UsingTask because first to declare tasks wins -->
-  <Import Project="Directory.targets" Condition="Exists('Directory.targets')"/>
+  <Import Project="Directory.targets" Condition="Exists('Directory.targets')" />
   <Import Project="Directory.targets.user" Condition="Exists('Directory.targets.user')" />
 
 </Project>
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
index 7e860d1..a8d2694 100644
--- a/src/Tests/Tests.csproj
+++ b/src/Tests/Tests.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.8.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>