Merge branch 'main' into dev/robocopy

Directory.Packages.props

@@ -3,17 +3,18 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'netstandard2.0'">16.9.0</MicrosoftBuildPackageVersion>
     <MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net46'">15.9.20</MicrosoftBuildPackageVersion>
-    <MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">17.7.2</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">17.7.2</MicrosoftBuildPackageVersion>
     <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.11" 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>

azure-pipelines.yml

@@ -5,8 +5,6 @@ variables:
   ArtifactsDirectoryName: 'artifacts'
   BuildConfiguration: 'Debug'
   BuildPlatform: 'Any CPU'
-  DotNet6Version: '6.x'
-  DotNet7Version: '7.x'
   DotNet8Version: '8.x'
   MSBuildArgs: '"/p:Platform=$(BuildPlatform)" "/p:Configuration=$(BuildConfiguration)" "/BinaryLogger:$(Build.SourcesDirectory)\$(ArtifactsDirectoryName)\msbuild.binlog"'
   SignType: 'Test'
@@ -36,16 +34,6 @@ jobs:
     vmImage: windows-latest
   steps:
 
-  - task: UseDotNet@2
-    displayName: 'Install .NET $(DotNet6Version)'
-    inputs:
-      version: '$(DotNet6Version)'
-
-  - task: UseDotNet@2
-    displayName: 'Install .NET $(DotNet7Version)'
-    inputs:
-      version: '$(DotNet7Version)'
-
   - task: UseDotNet@2
     displayName: 'Install .NET $(DotNet8Version)'
     inputs:
@@ -65,22 +53,6 @@ jobs:
       testRunTitle: 'Windows .NET Framework'
     condition: succeededOrFailed()
 
-  - task: DotNetCoreCLI@2
-    displayName: 'Run Unit Tests (.NET 6.0)'
-    inputs:
-      command: 'test'
-      arguments: '--no-restore --no-build --framework net6.0 /noautorsp'
-      testRunTitle: 'Windows .NET 6.0'
-    condition: succeededOrFailed()
-
-  - task: DotNetCoreCLI@2
-    displayName: 'Run Unit Tests (.NET 7.0)'
-    inputs:
-      command: 'test'
-      arguments: '--no-restore --no-build --framework net7.0 /noautorsp'
-      testRunTitle: 'Windows .NET 7.0'
-    condition: succeededOrFailed()
-
   - task: DotNetCoreCLI@2
     displayName: 'Run Unit Tests (.NET 8.0)'
     inputs:
@@ -102,16 +74,6 @@ jobs:
     vmImage: ubuntu-latest
   steps:
 
-  - task: UseDotNet@2
-    displayName: 'Install .NET $(DotNet6Version)'
-    inputs:
-      version: '$(DotNet6Version)'
-
-  - task: UseDotNet@2
-    displayName: 'Install .NET $(DotNet7Version)'
-    inputs:
-      version: '$(DotNet7Version)'
-
   - task: UseDotNet@2
     displayName: 'Install .NET $(DotNet8Version)'
     inputs:
@@ -123,22 +85,6 @@ jobs:
       command: 'build'
       arguments: '$(MSBuildArgs)'
 
-  - task: DotNetCoreCLI@2
-    displayName: 'Run Unit Tests (.NET 6.0)'
-    inputs:
-      command: 'test'
-      arguments: '--no-restore --no-build --framework net6.0 /noautorsp'
-      testRunTitle: 'Linux .NET 6.0'
-    condition: succeededOrFailed()
-
-  - task: DotNetCoreCLI@2
-    displayName: 'Run Unit Tests (.NET 7.0)'
-    inputs:
-      command: 'test'
-      arguments: '--no-restore --no-build --framework net7.0 /noautorsp'
-      testRunTitle: 'Linux .NET 7.0'
-    condition: succeededOrFailed()
-
   - task: DotNetCoreCLI@2
     displayName: 'Run Unit Tests (.NET 8.0)'
     inputs:
@@ -160,16 +106,6 @@ jobs:
     vmImage: macOS-latest
   steps:
 
-  - task: UseDotNet@2
-    displayName: 'Install .NET $(DotNet6Version)'
-    inputs:
-      version: '$(DotNet6Version)'
-
-  - task: UseDotNet@2
-    displayName: 'Install .NET $(DotNet7Version)'
-    inputs:
-      version: '$(DotNet7Version)'
-
   - task: UseDotNet@2
     displayName: 'Install .NET $(DotNet8Version)'
     inputs:
@@ -181,22 +117,6 @@ jobs:
       command: 'build'
       arguments: '$(MSBuildArgs)'
 
-  - task: DotNetCoreCLI@2
-    displayName: 'Run Unit Tests (.NET 6.0)'
-    inputs:
-      command: 'test'
-      arguments: '--no-restore --no-build --framework net6.0 /noautorsp'
-      testRunTitle: 'MacOS .NET 6.0'
-    condition: succeededOrFailed()
-
-  - task: DotNetCoreCLI@2
-    displayName: 'Run Unit Tests (.NET 7.0)'
-    inputs:
-      command: 'test'
-      arguments: '--no-restore --no-build --framework net7.0 /noautorsp'
-      testRunTitle: 'MacOS .NET 7.0'
-    condition: succeededOrFailed()
-
   - task: DotNetCoreCLI@2
     displayName: 'Run Unit Tests (.NET 8.0)'
     inputs:

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.400",
     "rollForward": "latestMinor"
   },
   "msbuild-sdks": {

samples/CentralPackageVersions/README.md

@@ -12,7 +12,7 @@ This sample shows how to use `Microsoft.Build.CentralPackageVersions`.
    ```xml
     <Project Sdk="Microsoft.NET.Sdk">
       <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
       </PropertyGroup>
       <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" />

samples/CentralPackageVersions/src/ClassLibrary/ClassLibrary.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" />

samples/NoTargets/SampleNoTargets/SampleNoTargets.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets/3.7.0">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <Target Name="CustomAction" AfterTargets="Build">
     <Message Text="This is a sample NoTargets project" Importance="High" />

samples/Traversal/ProjectA/ProjectA.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 </Project>

samples/Traversal/ProjectB/ProjectB.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 </Project>

src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AssemblyShader" />

src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />

src/CopyOnWrite.UnitTests/CopyUpToDateTests.cs

@@ -16,7 +16,7 @@ namespace Microsoft.Build.CopyOnWrite.UnitTests;
 // These tests rely on Microsoft.Build.Framework which has only a net472 and current-framework target.
 // Don't compile these tests for .NET versions in between as Microsoft.Build.Framework.dll will not be
 // propagated to the output dir.
-#if !NET6_0 && !NET7_0
+#if !NET8_0_OR_GREATER
 
 public class CopyUpToDateTests : MSBuildSdkTestBase
 {

src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj

@@ -1,18 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
     <Nullable>Enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CopyOnWrite" />
-    <PackageReference Include="Microsoft.Build.Framework" />
+    <PackageReference Include="Microsoft.Build" Condition="'$(TargetFramework)' != 'net8.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)' != 'net8.0' " />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>

src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AssemblyShader" />

src/NoTargets.UnitTests/NoTargetsTests.cs

@@ -91,10 +91,6 @@ public void DoNotReferenceOutputAssemblies()
                     path: Path.Combine(TestRootPath, "ProjectA", "ProjectA.csproj"),
 #if NETFRAMEWORK || NET8_0
                     targetFramework: "net8.0")
-#elif NET6_0
-                    targetFramework: "net6.0")
-#elif NET7_0
-                    targetFramework: "net7.0")
 #endif
                 .Save();
 
@@ -269,7 +265,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)
         {

src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AssemblyShader" />