diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0b6bfb1d..8269e78b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,9 +44,9 @@ jobs: uses: actions/setup-dotnet@v2.0.0 with: dotnet-version: 6.x - - - name: Autobuild - uses: github/codeql-action/autobuild@v1 + + - run: dotnet restore + - run: dotnet build ./FASTER.sln --configuration Debug - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 diff --git a/FASTER.sln b/FASTER.sln index 96ea80de..c395fe13 100644 --- a/FASTER.sln +++ b/FASTER.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29020.237 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32210.238 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FASTER", "FASTER\FASTER.csproj", "{AB94896A-D1E3-4206-897C-4198B3F93AB9}" EndProject @@ -34,9 +34,7 @@ Global {65FDF864-BF9B-414A-A6E6-3473BCFB62BE}.Release|Any CPU.ActiveCfg = Release|Any CPU {65FDF864-BF9B-414A-A6E6-3473BCFB62BE}.Release|Any CPU.Build.0 = Release|Any CPU {465FB100-A08C-4E4F-A321-EC85C5C177B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {465FB100-A08C-4E4F-A321-EC85C5C177B3}.Debug|Any CPU.Build.0 = Debug|Any CPU {465FB100-A08C-4E4F-A321-EC85C5C177B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {465FB100-A08C-4E4F-A321-EC85C5C177B3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FASTER/ViewModel/ProfileViewModel.cs b/FASTER/ViewModel/ProfileViewModel.cs index 3c420508..cdee3f52 100644 --- a/FASTER/ViewModel/ProfileViewModel.cs +++ b/FASTER/ViewModel/ProfileViewModel.cs @@ -377,7 +377,7 @@ internal async Task CopyModKeys() internal async Task ClearModKeys() { - var ignoredKeys = new[] {"a3.bikey", "a3c.bikey", "gm.bikey"}; + var ignoredKeys = new[] {"a3.bikey", "a3c.bikey", "gm.bikey", "ws.bikey", "csla.bikey", "vn.bikey" }; if (Directory.Exists(Path.Combine(Profile.ArmaPath, "keys"))) { foreach (var keyFile in Directory.GetFiles(Path.Combine(Profile.ArmaPath, "keys"))) diff --git a/NuGet.Config b/NuGet.Config index 45932406..17a4bae1 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -2,8 +2,6 @@ - -