Skip to content

Commit

Permalink
Merge pull request #813 from WildGums/GitHubSync/20240720-213320
Browse files Browse the repository at this point in the history
GitHubSync update
  • Loading branch information
GeertvanHorrik authored Jul 20, 2024
2 parents e8bd63c + 7b3e1ef commit 6bb57e6
Show file tree
Hide file tree
Showing 8 changed files with 433 additions and 433 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- name: Setup .NET Core
id: setup-dotnet
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
with:
dotnet-version: '8.0.x'

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Enable auto-merge for Dependabot PRs
if: |
(startsWith(steps.dependabot-metadata.outputs.dependency-names, 'approvaltests.') ||
startsWith(steps.dependabot-metadata.outputs.dependency-names, 'catel.') ||
(startsWith(steps.dependabot-metadata.outputs.dependency-names, 'catel.') ||
startsWith(steps.dependabot-metadata.outputs.dependency-names, 'fody') ||
endsWith(steps.dependabot-metadata.outputs.dependency-names, '.fody') ||
startsWith(steps.dependabot-metadata.outputs.dependency-names, 'microsoft.') ||
Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/issuetrackers-github.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#tool "nuget:?package=gitreleasemanager&version=0.17.0"
#tool "nuget:?package=gitreleasemanager&version=0.18.0"

//-------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions deployment/cake/lib-msbuild.cake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#addin "nuget:?package=Cake.Issues&version=4.6.0"
#addin "nuget:?package=Cake.Issues.MsBuild&version=4.6.0"
#addin "nuget:?package=Cake.Issues&version=4.8.1"
#addin "nuget:?package=Cake.Issues.MsBuild&version=4.8.1"
#addin "nuget:?package=System.Configuration.ConfigurationManager&version=8.0.0"

#tool "nuget:?package=MSBuild.Extension.Pack&version=1.9.1"
Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/tasks.cake
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
// It probably means the tool is not correctly installed.
// `dotnet tool install --global dotnet-sonarscanner --ignore-failed-sources`
//#tool "nuget:?package=MSBuild.SonarQube.Runner.Tool&version=4.8.0"
#tool "nuget:?package=dotnet-sonarscanner&version=6.2.0"
#tool "nuget:?package=dotnet-sonarscanner&version=7.1.0"

//-------------------------------------------------------------
// BACKWARDS COMPATIBILITY CODE - START
Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/tests-nunit.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#tool "nuget:?package=NUnit.ConsoleRunner&version=3.17.0"
#tool "nuget:?package=NUnit.ConsoleRunner&version=3.18.1"

//-------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.analyzers.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit.Analyzers" Version="4.1.0">
<PackageReference Include="NUnit.Analyzers" Version="4.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
849 changes: 425 additions & 424 deletions src/Directory.Build.shared.explicit.props

Large diffs are not rendered by default.

0 comments on commit 6bb57e6

Please sign in to comment.