diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e1c56c1..bab75a1 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -17,20 +17,15 @@ jobs: with: fetch-depth: 0 # Git Versioning requires a non-shallow clone - - name: Install .NET 6 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: '6.x' - - - name: Install .NET 7 + - name: Install .NET 8 uses: actions/setup-dotnet@v3 with: - dotnet-version: '7.x' + dotnet-version: '8.x' - - name: Install .NET 8 + - name: Install .NET 9 uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.x' + dotnet-version: '9.x' - name: Restore run: dotnet restore -bl:logs/restore.binlog diff --git a/Directory.Build.props b/Directory.Build.props index 5de651d..6e73809 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,4 @@ - + true @@ -17,6 +17,12 @@ true + + + false diff --git a/Directory.Packages.props b/Directory.Packages.props index 4f2ffaf..66b2651 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,9 +2,7 @@ - 17.8.3 - 17.7.2 - 17.3.2 + 17.11.4 diff --git a/MSBuildPrediction.sln b/MSBuildPrediction.sln index 3e1a1d5..86b7ff7 100644 --- a/MSBuildPrediction.sln +++ b/MSBuildPrediction.sln @@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig .gitignore = .gitignore - azure-pipelines-ci.yml = azure-pipelines-ci.yml + .github\workflows\pr.yml = .github\workflows\pr.yml azure-pipelines-official.yml = azure-pipelines-official.yml CodeAnalysis.ruleset = CodeAnalysis.ruleset Directory.Build.props = Directory.Build.props diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 30c4841..199d6e4 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -4,7 +4,6 @@ variables: ArtifactsDirectory: artifacts BuildConfiguration: 'Release' BuildPlatform: 'Any CPU' - DotNetVersion: '8.x' MSBuildArgs: '"/p:Platform=$(BuildPlatform)" "/p:Configuration=$(BuildConfiguration)" "/BinaryLogger:$(LogDirectory)/msbuild.binlog"' SignType: 'Real' TeamName: 'MSBuild' @@ -74,9 +73,9 @@ extends: displayName: 'Set SignType to Real for tagged commits' condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v')) - task: UseDotNet@2 - displayName: 'Install .NET $(DotNetVersion)' + displayName: 'Install .NET' inputs: - version: '$(DotNetVersion)' + version: '9.x' - task: DotNetCoreCLI@2 displayName: 'Build Solution' inputs: diff --git a/src/BuildPrediction/Microsoft.Build.Prediction.csproj b/src/BuildPrediction/Microsoft.Build.Prediction.csproj index 19d2395..73d41b3 100644 --- a/src/BuildPrediction/Microsoft.Build.Prediction.csproj +++ b/src/BuildPrediction/Microsoft.Build.Prediction.csproj @@ -1,6 +1,6 @@  - net472;net6.0;net7.0;net8.0 + net472;net8.0;net9.0 diff --git a/src/BuildPredictionTests/Microsoft.Build.Prediction.Tests.csproj b/src/BuildPredictionTests/Microsoft.Build.Prediction.Tests.csproj index 391bad6..b9841e0 100644 --- a/src/BuildPredictionTests/Microsoft.Build.Prediction.Tests.csproj +++ b/src/BuildPredictionTests/Microsoft.Build.Prediction.Tests.csproj @@ -1,6 +1,6 @@  - net472;net6.0;net7.0;net8.0 + net472;net8.0;net9.0 $(NoWarn);SA1600;SA1611;SA1615 diff --git a/src/BuildPredictionTests/Predictors/ArtifactsSdkPredictorTests.cs b/src/BuildPredictionTests/Predictors/ArtifactsSdkPredictorTests.cs index 0255888..d89fb57 100644 --- a/src/BuildPredictionTests/Predictors/ArtifactsSdkPredictorTests.cs +++ b/src/BuildPredictionTests/Predictors/ArtifactsSdkPredictorTests.cs @@ -179,7 +179,7 @@ public void FindArtifactsForExistingDirectoryRecursive(string separator) // Recursive is the default. Also testing the file matching logic here. artifactItem.AddMetadata(ArtifactsSdkPredictor.FileMatchMetadata, "*.txt"); - artifactItem.AddMetadata(ArtifactsSdkPredictor.FileExcludeMetadata, string.Join(separator, ["exclude.*", "dontwant.*"])); + artifactItem.AddMetadata(ArtifactsSdkPredictor.FileExcludeMetadata, string.Join(separator, new string[] { "exclude.*", "dontwant.*" })); artifactItem.AddMetadata(ArtifactsSdkPredictor.DirExcludeMetadata, "excludeDir"); Directory.CreateDirectory(Path.Combine(_rootDir, @"src\Artifacts")); @@ -337,7 +337,7 @@ public void FindArtifactsForGeneratedDirectory(string separator) // Copying another project's output dir to this project's output dir var artifactItem = projectRootElement.AddItem(ArtifactsSdkPredictor.ArtifactsItemName, @"$(EnlistmentRoot)\bar\$(OutputPath)"); artifactItem.AddMetadata(ArtifactsSdkPredictor.DestinationFolderMetadata, @"$(OutputPath)"); - artifactItem.AddMetadata(ArtifactsSdkPredictor.FileMatchMetadata, string.Join(separator, ["*.dll", "*.pdb"])); + artifactItem.AddMetadata(ArtifactsSdkPredictor.FileMatchMetadata, string.Join(separator, new string[] { "*.dll", "*.pdb" })); ProjectInstance projectInstance = TestHelpers.CreateProjectInstanceFromRootElement(projectRootElement);