diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json new file mode 100644 index 0000000..9574ed7 --- /dev/null +++ b/.config/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "gitversion.tool": { + "version": "6.0.3", + "commands": [ + "dotnet-gitversion" + ], + "rollForward": false + } + } +} \ No newline at end of file diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2a38ade..60e5330 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,25 +7,28 @@ version: 2 updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: 'github-actions' + directory: '/' + schedule: + interval: 'daily' + labels: + - 'ci-quality' + reviewers: + - 'microsoft/psrule-rules-github' -# Maintain dependencies for GitHub Actions -- package-ecosystem: 'github-actions' - directory: '/' - schedule: - interval: 'daily' - labels: - - 'ci-quality' - reviewers: - - 'microsoft/psrule-rules-github' - -# Maintain dependencies for NuGet -- package-ecosystem: 'nuget' - directory: '/' - schedule: - interval: 'daily' - labels: - - 'dependencies' - reviewers: - - 'microsoft/psrule-rules-github' - ignore: - - dependency-name: Newtonsoft.Json + # Maintain dependencies for NuGet + - package-ecosystem: 'nuget' + directory: '/' + schedule: + interval: 'daily' + labels: + - 'dependencies' + reviewers: + - 'microsoft/psrule-rules-github' + groups: + # Group PowerShell packages that have inter-dependencies + dev-powershell: + patterns: + - System.Management.Automation + - Microsoft.PowerShell.SDK diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b04748e..036635d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 7.x + dotnet-version: 8.x - name: Install dependencies shell: pwsh @@ -110,7 +110,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 7.x + dotnet-version: 8.x - if: ${{ matrix.shell == 'pwsh' }} name: Install dependencies (PowerShell) diff --git a/global.json b/global.json new file mode 100644 index 0000000..ae9f38c --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "8.0.400", + "rollForward": "latestFeature" + } +} diff --git a/src/PSRule.Rules.GitHub/PSRule.Rules.GitHub.csproj b/src/PSRule.Rules.GitHub/PSRule.Rules.GitHub.csproj index d9ac858..b30673b 100644 --- a/src/PSRule.Rules.GitHub/PSRule.Rules.GitHub.csproj +++ b/src/PSRule.Rules.GitHub/PSRule.Rules.GitHub.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/PSRule.Rules.GitHub/packages.lock.json b/src/PSRule.Rules.GitHub/packages.lock.json index 20d4841..049cd7f 100644 --- a/src/PSRule.Rules.GitHub/packages.lock.json +++ b/src/PSRule.Rules.GitHub/packages.lock.json @@ -29,9 +29,9 @@ }, "Newtonsoft.Json": { "type": "Direct", - "requested": "[13.0.1, )", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + "requested": "[13.0.3, )", + "resolved": "13.0.3", + "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" }, "Octokit": { "type": "Direct", diff --git a/src/SDK/packages.lock.json b/src/SDK/packages.lock.json index c415545..1c6836f 100644 --- a/src/SDK/packages.lock.json +++ b/src/SDK/packages.lock.json @@ -38,8 +38,8 @@ }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + "resolved": "13.0.3", + "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" }, "Octokit": { "type": "Transitive", @@ -54,7 +54,7 @@ "Microsoft.PSRule.Rules.GitHub.Core": { "type": "Project", "dependencies": { - "Newtonsoft.Json": "[13.0.1, )", + "Newtonsoft.Json": "[13.0.3, )", "Octokit": "[13.0.1, )", "YamlDotNet": "[13.7.1, )" } diff --git a/tests/PSRule.Rules.GitHub.Tests/PSRule.Rules.GitHub.Tests.csproj b/tests/PSRule.Rules.GitHub.Tests/PSRule.Rules.GitHub.Tests.csproj index 5e9f460..ef4a220 100644 --- a/tests/PSRule.Rules.GitHub.Tests/PSRule.Rules.GitHub.Tests.csproj +++ b/tests/PSRule.Rules.GitHub.Tests/PSRule.Rules.GitHub.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 {9ff459f0-c7bc-4936-9fc3-4d92b30b02a1} true false @@ -11,8 +11,8 @@ - - + + all