From 1db55ca16d6576849260243645daeb089fc4d7f2 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 15 Nov 2020 13:19:31 -0600 Subject: [PATCH] =?UTF-8?q?fix(services):=20=F0=9F=90=9B=20re-enable=20Cod?= =?UTF-8?q?eQL=20with=20net5.0=20via=20global.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/github/codeql-action/issues/244 --- .github/workflows/codeql-analysis.yml | 5 +---- services/FilterLists.sln | 3 ++- services/global.json | 6 ++++++ 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 services/global.json diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 638733e04..e035f08b8 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -19,10 +19,7 @@ jobs: matrix: # Override automatic language detection by changing the below list # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] - language: ['javascript'] - - # TODO: fix Autobuild failing csharp on net5.0 - # language: ['csharp', 'javascript'] + language: ['csharp', 'javascript'] # Learn more... # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection diff --git a/services/FilterLists.sln b/services/FilterLists.sln index 5755521f6..0bce12522 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -25,6 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig ..\.github\dependabot.yml = ..\.github\dependabot.yml FilterLists.sln.DotSettings = FilterLists.sln.DotSettings + global.json = global.json EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{8F419098-3EEB-4B4B-99A8-70555FA93DAF}" @@ -66,7 +67,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.SharedKernel.Lo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Api.Contracts", "Directory\FilterLists.Directory.Api.Contracts\FilterLists.Directory.Api.Contracts.csproj", "{4D3D2508-CCC6-4C0B-B5E4-734DD5EC588F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Archival.Domain", "Archival\FilterLists.Archival.Domain\FilterLists.Archival.Domain.csproj", "{6402E81A-75C2-422F-933B-AAC1ED8C4128}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Domain", "Archival\FilterLists.Archival.Domain\FilterLists.Archival.Domain.csproj", "{6402E81A-75C2-422F-933B-AAC1ED8C4128}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/services/global.json b/services/global.json new file mode 100644 index 000000000..7abee7494 --- /dev/null +++ b/services/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "5.0.100", + "rollForward": "latestMajor" + } +} \ No newline at end of file