From a4270d571f21f2b9feba24651f886a347b3e6303 Mon Sep 17 00:00:00 2001 From: Keelah Atom Date: Mon, 11 Apr 2022 10:07:03 +0200 Subject: [PATCH 1/7] Update keys and build settings --- FASTER.sln | 6 ++---- FASTER/ViewModel/ProfileViewModel.cs | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) 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"))) From 18e222826e332492a292f3c275eaef7dee018167 Mon Sep 17 00:00:00 2001 From: Keelah Date: Mon, 11 Apr 2022 13:51:58 +0200 Subject: [PATCH 2/7] Update codeql-analysis.yml again again... --- .github/workflows/codeql-analysis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0b6bfb1d..222ddb62 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -45,8 +45,7 @@ jobs: with: dotnet-version: 6.x - - name: Autobuild - uses: github/codeql-action/autobuild@v1 + - run: dotnet build ./FASTER.sln --configuration Debug - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 From f4e48683d84216a42db2939d4f6bbf0c590762fd Mon Sep 17 00:00:00 2001 From: Keelah Date: Mon, 11 Apr 2022 13:56:37 +0200 Subject: [PATCH 3/7] Update codeql-analysis.yml ffs... --- .github/workflows/codeql-analysis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 222ddb62..315c7c94 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -45,6 +45,7 @@ jobs: with: dotnet-version: 6.x + - run: dotnet restore - run: dotnet build ./FASTER.sln --configuration Debug - name: Perform CodeQL Analysis From ee9ed18420ea84c5c614bb29d338e79b92e81cfc Mon Sep 17 00:00:00 2001 From: Keelah Date: Mon, 11 Apr 2022 14:02:58 +0200 Subject: [PATCH 4/7] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 315c7c94..cf983269 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -45,7 +45,7 @@ jobs: with: dotnet-version: 6.x - - run: dotnet restore + - run: dotnet restore ./FASTER.sln - run: dotnet build ./FASTER.sln --configuration Debug - name: Perform CodeQL Analysis From 01350cce452929ee9ee156e033e2232e45b4fa4a Mon Sep 17 00:00:00 2001 From: Keelah Date: Mon, 11 Apr 2022 14:05:37 +0200 Subject: [PATCH 5/7] I swear I'm done with this shit.. --- .github/workflows/codeql-analysis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cf983269..e6c1203a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,11 @@ jobs: uses: actions/setup-dotnet@v2.0.0 with: dotnet-version: 6.x - + + # new step + - name: Add nuget.org as nuget package source + run: dotnet nuget add source https://api.nuget.org/v3/index.json --name nuget.org + - run: dotnet restore ./FASTER.sln - run: dotnet build ./FASTER.sln --configuration Debug From d75f8334277e560d2003836253b1407e0499ea79 Mon Sep 17 00:00:00 2001 From: Keelah Atom Date: Mon, 11 Apr 2022 14:30:17 +0200 Subject: [PATCH 6/7] That SHOULD work --- NuGet.Config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 45932406..17a4bae1 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -2,8 +2,6 @@ - - From d9feda449ef0bad90e28b886123719c03e9066df Mon Sep 17 00:00:00 2001 From: Keelah Date: Mon, 11 Apr 2022 14:35:09 +0200 Subject: [PATCH 7/7] Currently raging --- .github/workflows/codeql-analysis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e6c1203a..8269e78b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,12 +44,8 @@ jobs: uses: actions/setup-dotnet@v2.0.0 with: dotnet-version: 6.x - - # new step - - name: Add nuget.org as nuget package source - run: dotnet nuget add source https://api.nuget.org/v3/index.json --name nuget.org - - run: dotnet restore ./FASTER.sln + - run: dotnet restore - run: dotnet build ./FASTER.sln --configuration Debug - name: Perform CodeQL Analysis