Use CopyOnWrite 0.3.10 (#569)

* Use CopyOnWrite 0.3.9 Consume the fix published in https://github.com/microsoft/CopyOnWrite/pull/45/files * Update Directory.Packages.props * Fix the tests
microsoft · Sep 24, 2024 · 947e614 · 947e614
1 parent 3240393
commit 947e614
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,13 +7,14 @@
     <MicrosoftBuildPackageVersion>17.8.3</MicrosoftBuildPackageVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="CopyOnWrite" Version="0.3.8" Condition=" '$(TargetFramework)' != 'net46' " />
-    <PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildPackageVersion)" />
+    <PackageVersion Include="CopyOnWrite" Version="0.3.10" Condition=" '$(TargetFramework)' != 'net46' " />
+    <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="System.CodeDom" Version="8.0.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="7.0.0" Condition=" '$(TargetFramework)' != 'net46' " />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="4.11.1" Condition=" '$(TargetFramework)' == 'net46' " />
   </ItemGroup>

diff --git a/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj b/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj
@@ -5,14 +5,15 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CopyOnWrite" />
-    <PackageReference Include="Microsoft.Build.Framework" />
+    <PackageReference Include="Microsoft.Build" Condition="'$(TargetFramework)' != 'net6.0' And '$(TargetFramework)' != 'net7.0' " />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Win32.Registry" />
     <PackageReference Include="MSBuild.ProjectCreation" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Shouldly" />
     <PackageReference Include="System.CodeDom" />
     <PackageReference Include="System.Collections.Immutable" />
+    <PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)' != 'net6.0' And '$(TargetFramework)' != 'net7.0' " />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>

diff --git a/src/NoTargets.UnitTests/NoTargetsTests.cs b/src/NoTargets.UnitTests/NoTargetsTests.cs
@@ -269,7 +269,9 @@ public void SimpleBuild(string projectExtension)
         }
 
         [Theory]
+#if !NETFRAMEWORK
         [InlineData(".csproj")]
+#endif
         [InlineData(".proj", Skip = "Currently broken because of a regression in Static Graph when the extension is .proj")]
         public void StaticGraphBuildsSucceed(string projectExtension)
         {