From 7b3e1ef699a90b04654c55ea5d4779034880ddc8 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Sat, 20 Jul 2024 23:33:25 +0200 Subject: [PATCH] GitHubSync update --- .github/workflows/build-and-test.yml | 2 +- .github/workflows/dependabot-auto-merge.yml | 3 +- deployment/cake/issuetrackers-github.cake | 2 +- deployment/cake/lib-msbuild.cake | 4 +- deployment/cake/tasks.cake | 2 +- deployment/cake/tests-nunit.cake | 2 +- src/Directory.Build.analyzers.props | 2 +- src/Directory.Build.shared.explicit.props | 849 ++++++++++---------- 8 files changed, 433 insertions(+), 433 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 833291a..32f406b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -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' diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 5214c1e..1894de2 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -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.') || diff --git a/deployment/cake/issuetrackers-github.cake b/deployment/cake/issuetrackers-github.cake index efa409b..44b0be5 100644 --- a/deployment/cake/issuetrackers-github.cake +++ b/deployment/cake/issuetrackers-github.cake @@ -1,4 +1,4 @@ -#tool "nuget:?package=gitreleasemanager&version=0.17.0" +#tool "nuget:?package=gitreleasemanager&version=0.18.0" //------------------------------------------------------------- diff --git a/deployment/cake/lib-msbuild.cake b/deployment/cake/lib-msbuild.cake index 16881fa..3b90ba1 100644 --- a/deployment/cake/lib-msbuild.cake +++ b/deployment/cake/lib-msbuild.cake @@ -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" diff --git a/deployment/cake/tasks.cake b/deployment/cake/tasks.cake index 9f4dc75..ff26d1c 100644 --- a/deployment/cake/tasks.cake +++ b/deployment/cake/tasks.cake @@ -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 diff --git a/deployment/cake/tests-nunit.cake b/deployment/cake/tests-nunit.cake index 59b559a..fe05b22 100644 --- a/deployment/cake/tests-nunit.cake +++ b/deployment/cake/tests-nunit.cake @@ -1,4 +1,4 @@ -#tool "nuget:?package=NUnit.ConsoleRunner&version=3.17.0" +#tool "nuget:?package=NUnit.ConsoleRunner&version=3.18.1" //------------------------------------------------------------- diff --git a/src/Directory.Build.analyzers.props b/src/Directory.Build.analyzers.props index 595ea76..0290b97 100644 --- a/src/Directory.Build.analyzers.props +++ b/src/Directory.Build.analyzers.props @@ -16,7 +16,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Directory.Build.shared.explicit.props b/src/Directory.Build.shared.explicit.props index 01dc5af..32f4958 100644 --- a/src/Directory.Build.shared.explicit.props +++ b/src/Directory.Build.shared.explicit.props @@ -1,425 +1,426 @@ - - - - - - - $(ProjectDir)..\..\output\$(Configuration) - - - <__OverridableOutputPathDefault>$(OverridableOutputRootPath)\$(MSBuildProjectName)\ - $(OverridableOutputRootPath)\$(MSBuildProjectName)\ - $(OverridableOutputRootPath)\$(OutputTargetAssemblyDirectory)\ - - - - $(OverridableOutputPath)\..\$(MSBuildProjectName)\ - $(OverridableOutputPath) - bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - - - - - false - - - - - $(DotNetPackIntermediateOutputPath) - - - - - CS8034;$(WarningsNotAsErrors) - - - - - - - - - - - - - - - - - - $(PackageId) - - - - icon.png - - - - - - - - - - true - tools - - - - true - tools - - - - - - - TextTemplatingFileGenerator - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - True - True - Resources.resx - - - - - - $(DefineConstants);NETCORE;NETCORE2_1;NETCOREAPP;NETCOREAPP2_1 - - - - - $(DefineConstants);NETCORE;NETCORE3_0;NETCOREAPP;NETCOREAPP3_0 - - - - - - - - - - - - $(DefineConstants);NETCORE;NETCORE3_0;NETCOREAPP;NETCOREAPP3_0 - - - - - - - - - - - - $(DefineConstants);NETCORE;NETCORE5;NETCORE5_0;NET5;NET5_0 - - - - - - - - - - - - $(DefineConstants);NETCORE;NETCORE6;NETCORE6_0;NET6;NET6_0 - - - - - - - - - - - - $(DefineConstants);NETCORE;NETCORE7;NETCORE7_0;NET7;NET7_0 - - - - - - - - - - - - $(DefineConstants);NETCORE;NETCORE8;NETCORE8_0;NET8;NET8_0 - - - - - - - - - - - - $(DefineConstants);NETCORE;NETCORE9;NETCORE9_0;NET9;NET9_0 - - - - - - - - - - - - $(DefineConstants);NETCORE;NETCORE10;NETCORE10_0;NET10;NET10_0 - - - - - - - - - - - - $(DefineConstants);NETSTANDARD;NETSTANDARD2_0;NS;NS20 - - - - - - - - - - - - true - $(DefineConstants);NET;NET45;NET450 - - - - true - $(DefineConstants);NET;NET45;NET451 - - - - true - $(DefineConstants);NET;NET45;NET452 - - - - - - - - - - - - true - $(DefineConstants);NET;NET46;NET460 - - - - true - $(DefineConstants);NET;NET46;NET461 - - - - true - $(DefineConstants);NET;NET46;NET462 - - - - - - - - - - - - true - $(DefineConstants);NET;NET47;NET470 - - - - true - $(DefineConstants);NET;NET47;NET471 - - - - true - $(DefineConstants);NET;NET47;NET472 - - - - - - - - - - - - true - $(DefineConstants);NET;NET48;NET480 - - - - true - $(DefineConstants);NET;NET48;NET481 - - - - true - $(DefineConstants);NET;NET48;NET482 - - - - - - - - - - - - true - $(DefineConstants);UAP;UAP_DEFAULT;NETFX_CORE;UWP;WINDOWS_UWP - - - - true - $(DefineConstants);UAP;UAP_16299;NETFX_CORE;UWP;WINDOWS_UWP - - - - - - - - - - - - $(DefineConstants);XAMARIN;IOS - - - - - - - - - - - - $(DefineConstants);XAMARIN;ANDROID - - - - - - - - - - - - <_InstallerTargetFramework>net48 - - - - - <_FakeOutputPath Include="..\$(OutputPath)\$(_InstallerTargetFramework)\$(AssemblyName).dll" /> - - - <_FakeOutputPath Include="..\$(OutputPath)\$(_InstallerTargetFramework)\$(AssemblyName).exe" /> - - - <_FakeOutputPath Include="..\$(OutputPath)\$(_InstallerTargetFramework)\$(AssemblyName).exe" /> - - + + + + + + + $(ProjectDir)..\..\output\$(Configuration) + + + <__OverridableOutputPathDefault>$(OverridableOutputRootPath)\$(MSBuildProjectName)\ + $(OverridableOutputRootPath)\$(MSBuildProjectName)\ + $(OverridableOutputRootPath)\$(OutputTargetAssemblyDirectory)\ + + + + $(OverridableOutputPath)\..\$(MSBuildProjectName)\ + $(OverridableOutputPath) + bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + + + + + false + + + + + $(DotNetPackIntermediateOutputPath) + + + + + CS8034;$(WarningsNotAsErrors) + + + + + + + + + + + + + + + + + + $(PackageId) + + + + icon.png + + + + + + + + + + true + tools + + + + true + tools + + + + + + + TextTemplatingFileGenerator + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + True + True + Resources.resx + + + + + + $(DefineConstants);NETCORE;NETCORE2_1;NETCOREAPP;NETCOREAPP2_1 + + + + + $(DefineConstants);NETCORE;NETCORE3_0;NETCOREAPP;NETCOREAPP3_0 + + + + + + + + + + + + $(DefineConstants);NETCORE;NETCORE3_0;NETCOREAPP;NETCOREAPP3_0 + + + + + + + + + + + + $(DefineConstants);NETCORE;NETCORE5;NETCORE5_0;NET5;NET5_0 + + + + + + + + + + + + $(DefineConstants);NETCORE;NETCORE6;NETCORE6_0;NET6;NET6_0 + + + + + + + + + + + + $(DefineConstants);NETCORE;NETCORE7;NETCORE7_0;NET7;NET7_0 + + + + + + + + + + + + $(DefineConstants);NETCORE;NETCORE8;NETCORE8_0;NET8;NET8_0 + + + + + + + + + + + + $(DefineConstants);NETCORE;NETCORE9;NETCORE9_0;NET9;NET9_0 + + + + + + + + + + + + $(DefineConstants);NETCORE;NETCORE10;NETCORE10_0;NET10;NET10_0 + + + + + + + + + + + + $(DefineConstants);NETSTANDARD;NETSTANDARD2_0;NS;NS20 + + + + + + + + + + + + true + $(DefineConstants);NET;NET45;NET450 + + + + true + $(DefineConstants);NET;NET45;NET451 + + + + true + $(DefineConstants);NET;NET45;NET452 + + + + + + + + + + + + true + $(DefineConstants);NET;NET46;NET460 + + + + true + $(DefineConstants);NET;NET46;NET461 + + + + true + $(DefineConstants);NET;NET46;NET462 + + + + + + + + + + + + true + $(DefineConstants);NET;NET47;NET470 + + + + true + $(DefineConstants);NET;NET47;NET471 + + + + true + $(DefineConstants);NET;NET47;NET472 + + + + + + + + + + + + true + $(DefineConstants);NET;NET48;NET480 + + + + true + $(DefineConstants);NET;NET48;NET481 + + + + true + $(DefineConstants);NET;NET48;NET482 + + + + + + + + + + + + true + $(DefineConstants);UAP;UAP_DEFAULT;NETFX_CORE;UWP;WINDOWS_UWP + + + + true + $(DefineConstants);UAP;UAP_16299;NETFX_CORE;UWP;WINDOWS_UWP + + + + + + + + + + + + $(DefineConstants);XAMARIN;IOS + + + + + + + + + + + + $(DefineConstants);XAMARIN;ANDROID + + + + + + + + + + + + <_InstallerTargetFramework>net48 + + + + + <_FakeOutputPath Include="..\$(OutputPath)\$(_InstallerTargetFramework)\$(AssemblyName).dll" /> + + + <_FakeOutputPath Include="..\$(OutputPath)\$(_InstallerTargetFramework)\$(AssemblyName).exe" /> + + + <_FakeOutputPath Include="..\$(OutputPath)\$(_InstallerTargetFramework)\$(AssemblyName).exe" /> + + \ No newline at end of file