diff --git a/Directory.Build.targets b/Directory.Build.targets index 6e7e89e..04bef13 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -2,6 +2,7 @@ false $(NoWarn);SA1600 + false diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index e7a9f38..409dda2 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -74,6 +74,7 @@ stages: inputs: projects: 'MSBuildSdks.sln' msbuildArgs: '$(MSBuildArgs)' + msbuildArchitecture: 'x64' - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 067579c..5a347b5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,6 @@ variables: 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' @@ -46,12 +45,6 @@ jobs: inputs: version: '$(DotNet7Version)' - - task: UseDotNet@2 - displayName: 'Install .NET $(DotNet8Version)' - inputs: - version: '$(DotNet8Version)' - includePreviewVersions: true - - task: DotNetCoreCLI@2 displayName: 'Build Solution' inputs: @@ -82,14 +75,6 @@ jobs: testRunTitle: 'Windows .NET 7.0' condition: succeededOrFailed() - - task: DotNetCoreCLI@2 - displayName: 'Run Unit Tests (.NET 8.0)' - inputs: - command: 'test' - arguments: '--no-restore --no-build --framework net8.0 /noautorsp' - testRunTitle: 'Windows .NET 8.0' - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' inputs: @@ -113,12 +98,6 @@ jobs: inputs: version: '$(DotNet7Version)' - - task: UseDotNet@2 - displayName: 'Install .NET $(DotNet8Version)' - inputs: - version: '$(DotNet8Version)' - includePreviewVersions: true - - task: DotNetCoreCLI@2 displayName: 'dotnet build' inputs: @@ -141,14 +120,6 @@ jobs: testRunTitle: 'Linux .NET 7.0' condition: succeededOrFailed() - - task: DotNetCoreCLI@2 - displayName: 'Run Unit Tests (.NET 8.0)' - inputs: - command: 'test' - arguments: '--no-restore --no-build --framework net8.0 /noautorsp' - testRunTitle: 'Linux .NET 8.0' - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' inputs: @@ -172,12 +143,6 @@ jobs: inputs: version: '$(DotNet7Version)' - - task: UseDotNet@2 - displayName: 'Install .NET $(DotNet8Version)' - inputs: - version: '$(DotNet8Version)' - includePreviewVersions: true - - task: DotNetCoreCLI@2 displayName: 'dotnet build' inputs: @@ -200,14 +165,6 @@ jobs: testRunTitle: 'MacOS .NET 7.0' condition: succeededOrFailed() - - task: DotNetCoreCLI@2 - displayName: 'Run Unit Tests (.NET 8.0)' - inputs: - command: 'test' - arguments: '--no-restore --no-build --framework net8.0 /noautorsp' - testRunTitle: 'MacOS .NET 8.0' - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' inputs: diff --git a/global.json b/global.json index bc739b2..3bcfa87 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,8 @@ { "sdk": { - "version": "6.0.100", - "rollForward": "latestMajor" + "version": "7.0.100", + "rollForward": "latestMajor", + "allowPrerelease": true }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0" diff --git a/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj b/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj index b3ec38d..9817927 100644 --- a/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj +++ b/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;net6.0;net7.0;net8.0 + net472;net6.0;net7.0 diff --git a/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj b/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj index e9a84c3..6412713 100644 --- a/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj +++ b/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;net6.0;net7.0;net8.0 + net472;net6.0;net7.0 diff --git a/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj b/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj index d6c1c4a..4bce966 100644 --- a/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj +++ b/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;net6.0;net7.0;net8.0 + net472;net6.0;net7.0 Enable diff --git a/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj b/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj index 6d719f6..3a5fd04 100644 --- a/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj +++ b/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;net6.0;net7.0;net8.0 + net472;net6.0;net7.0 diff --git a/src/NoTargets.UnitTests/NoTargetsTests.cs b/src/NoTargets.UnitTests/NoTargetsTests.cs index cd69ed9..7ff9c97 100644 --- a/src/NoTargets.UnitTests/NoTargetsTests.cs +++ b/src/NoTargets.UnitTests/NoTargetsTests.cs @@ -93,8 +93,6 @@ public void DoNotReferenceOutputAssemblies() targetFramework: "net7.0") #elif NET6_0 targetFramework: "net6.0") -#elif NET8_0 - targetFramework: "net8.0") #endif .Save(); diff --git a/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj b/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj index b944801..43591c4 100644 --- a/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj +++ b/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;net6.0;net7.0;net8.0 + net472;net6.0;net7.0