From d8180ee187a2e3c487fc6279172f9dd1e9319a15 Mon Sep 17 00:00:00 2001 From: Coen van den Munckhof Date: Tue, 13 Sep 2022 09:03:27 +0200 Subject: [PATCH 1/5] update --- src/RepoM.Api/Git/FileRepositoryStore.cs | 4 ++-- src/RepoM.Api/RepoM.Api.csproj | 2 +- src/RepoM.App/RepoM.App.csproj | 2 +- src/RepoM.Plugin.AzureDevOps/RepoM.Plugin.AzureDevOps.csproj | 2 +- src/RepoM.Plugin.LuceneSearch/SearchAdapter.cs | 2 +- src/RepoM.Plugin.SonarCloud/RepoM.Plugin.SonarCloud.csproj | 2 +- src/RepoM.Plugin.SonarCloud/SonarCloudModule.cs | 3 --- tests/RepoM.Api.Tests/RepoM.Api.Tests.csproj | 2 +- tests/RepoM.Ipc.Tests/RepoM.Ipc.Tests.csproj | 2 +- .../RepoM.Plugin.AzureDevOps.Tests.csproj | 2 +- .../RepoM.Plugin.LuceneSearch.Tests.csproj | 2 +- .../RepoM.Plugin.SonarCloud.Tests.csproj | 2 +- tests/Specs/Specs.csproj | 4 ++-- tests/Tests/Tests.csproj | 4 ++-- 14 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/RepoM.Api/Git/FileRepositoryStore.cs b/src/RepoM.Api/Git/FileRepositoryStore.cs index b1c2fc1d..c5728a5b 100644 --- a/src/RepoM.Api/Git/FileRepositoryStore.cs +++ b/src/RepoM.Api/Git/FileRepositoryStore.cs @@ -30,7 +30,7 @@ public IEnumerable Get(string file) { return FileSystem.File.ReadAllLines(file); } - catch (Exception ex) + catch (Exception) { // swallow for now. } @@ -64,7 +64,7 @@ public void Set(IEnumerable paths) { FileSystem.File.WriteAllLines(GetFileName(), paths.ToArray()); } - catch (Exception ex) + catch (Exception) { // swallow for now. } diff --git a/src/RepoM.Api/RepoM.Api.csproj b/src/RepoM.Api/RepoM.Api.csproj index 94c65d24..33d22261 100644 --- a/src/RepoM.Api/RepoM.Api.csproj +++ b/src/RepoM.Api/RepoM.Api.csproj @@ -4,7 +4,7 @@ - + diff --git a/src/RepoM.App/RepoM.App.csproj b/src/RepoM.App/RepoM.App.csproj index 17b22251..e7a4cfcb 100644 --- a/src/RepoM.App/RepoM.App.csproj +++ b/src/RepoM.App/RepoM.App.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/RepoM.Plugin.AzureDevOps/RepoM.Plugin.AzureDevOps.csproj b/src/RepoM.Plugin.AzureDevOps/RepoM.Plugin.AzureDevOps.csproj index 002bc9e8..3828583f 100644 --- a/src/RepoM.Plugin.AzureDevOps/RepoM.Plugin.AzureDevOps.csproj +++ b/src/RepoM.Plugin.AzureDevOps/RepoM.Plugin.AzureDevOps.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/RepoM.Plugin.LuceneSearch/SearchAdapter.cs b/src/RepoM.Plugin.LuceneSearch/SearchAdapter.cs index 60355ec2..7be9aef6 100644 --- a/src/RepoM.Plugin.LuceneSearch/SearchAdapter.cs +++ b/src/RepoM.Plugin.LuceneSearch/SearchAdapter.cs @@ -39,7 +39,7 @@ public IEnumerable Search(string query) } } - List results = _index.Search(query, SearchOperator.And,out var _); + List results = _index.Search(query, SearchOperator.And, out var _); _cache = results; _now = DateTime.UtcNow.AddSeconds(50); _query = query; diff --git a/src/RepoM.Plugin.SonarCloud/RepoM.Plugin.SonarCloud.csproj b/src/RepoM.Plugin.SonarCloud/RepoM.Plugin.SonarCloud.csproj index ed425b7f..cbaea84c 100644 --- a/src/RepoM.Plugin.SonarCloud/RepoM.Plugin.SonarCloud.csproj +++ b/src/RepoM.Plugin.SonarCloud/RepoM.Plugin.SonarCloud.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/RepoM.Plugin.SonarCloud/SonarCloudModule.cs b/src/RepoM.Plugin.SonarCloud/SonarCloudModule.cs index 1f07249f..777ba09d 100644 --- a/src/RepoM.Plugin.SonarCloud/SonarCloudModule.cs +++ b/src/RepoM.Plugin.SonarCloud/SonarCloudModule.cs @@ -3,10 +3,7 @@ namespace RepoM.Plugin.SonarCloud; using System; using System.Threading.Tasks; using JetBrains.Annotations; -using RepoM.Api; using RepoM.Core.Plugin; -using SonarQube.Net.Common.Authentication; -using SonarQube.Net; [UsedImplicitly] internal class SonarCloudModule : IModule diff --git a/tests/RepoM.Api.Tests/RepoM.Api.Tests.csproj b/tests/RepoM.Api.Tests/RepoM.Api.Tests.csproj index d15e66a5..6dba193f 100644 --- a/tests/RepoM.Api.Tests/RepoM.Api.Tests.csproj +++ b/tests/RepoM.Api.Tests/RepoM.Api.Tests.csproj @@ -15,7 +15,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/RepoM.Ipc.Tests/RepoM.Ipc.Tests.csproj b/tests/RepoM.Ipc.Tests/RepoM.Ipc.Tests.csproj index 1320d5af..00510013 100644 --- a/tests/RepoM.Ipc.Tests/RepoM.Ipc.Tests.csproj +++ b/tests/RepoM.Ipc.Tests/RepoM.Ipc.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/tests/RepoM.Plugin.AzureDevOps.Tests/RepoM.Plugin.AzureDevOps.Tests.csproj b/tests/RepoM.Plugin.AzureDevOps.Tests/RepoM.Plugin.AzureDevOps.Tests.csproj index 5cea0d2a..cc32617d 100644 --- a/tests/RepoM.Plugin.AzureDevOps.Tests/RepoM.Plugin.AzureDevOps.Tests.csproj +++ b/tests/RepoM.Plugin.AzureDevOps.Tests/RepoM.Plugin.AzureDevOps.Tests.csproj @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/RepoM.Plugin.LuceneSearch.Tests/RepoM.Plugin.LuceneSearch.Tests.csproj b/tests/RepoM.Plugin.LuceneSearch.Tests/RepoM.Plugin.LuceneSearch.Tests.csproj index 6484c996..d275168d 100644 --- a/tests/RepoM.Plugin.LuceneSearch.Tests/RepoM.Plugin.LuceneSearch.Tests.csproj +++ b/tests/RepoM.Plugin.LuceneSearch.Tests/RepoM.Plugin.LuceneSearch.Tests.csproj @@ -11,7 +11,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/RepoM.Plugin.SonarCloud.Tests/RepoM.Plugin.SonarCloud.Tests.csproj b/tests/RepoM.Plugin.SonarCloud.Tests/RepoM.Plugin.SonarCloud.Tests.csproj index ffb7cfe9..92d0cf55 100644 --- a/tests/RepoM.Plugin.SonarCloud.Tests/RepoM.Plugin.SonarCloud.Tests.csproj +++ b/tests/RepoM.Plugin.SonarCloud.Tests/RepoM.Plugin.SonarCloud.Tests.csproj @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Specs/Specs.csproj b/tests/Specs/Specs.csproj index 89d0c72e..461a9899 100644 --- a/tests/Specs/Specs.csproj +++ b/tests/Specs/Specs.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/tests/Tests/Tests.csproj b/tests/Tests/Tests.csproj index 36af1120..b4065e8f 100644 --- a/tests/Tests/Tests.csproj +++ b/tests/Tests/Tests.csproj @@ -14,8 +14,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + From 59c2fc80e107c8bc340fc63b79db01ef8f535b1e Mon Sep 17 00:00:00 2001 From: Coen van den Munckhof Date: Tue, 13 Sep 2022 09:11:32 +0200 Subject: [PATCH 2/5] update pacakage --- src/Grr.App/Grr.App.csproj | 2 +- src/RepoM.Api/RepoM.Api.csproj | 2 +- src/RepoM.App/RepoM.App.csproj | 2 +- tests/RepoM.Api.Tests/RepoM.Api.Tests.csproj | 4 ++-- .../RepoM.Plugin.AzureDevOps.Tests.csproj | 4 ++-- .../RepoM.Plugin.SonarCloud.Tests.csproj | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Grr.App/Grr.App.csproj b/src/Grr.App/Grr.App.csproj index 9f25f9b9..da66753c 100644 --- a/src/Grr.App/Grr.App.csproj +++ b/src/Grr.App/Grr.App.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/RepoM.Api/RepoM.Api.csproj b/src/RepoM.Api/RepoM.Api.csproj index 33d22261..d818eecb 100644 --- a/src/RepoM.Api/RepoM.Api.csproj +++ b/src/RepoM.Api/RepoM.Api.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/RepoM.App/RepoM.App.csproj b/src/RepoM.App/RepoM.App.csproj index e7a4cfcb..ba66f3a8 100644 --- a/src/RepoM.App/RepoM.App.csproj +++ b/src/RepoM.App/RepoM.App.csproj @@ -35,7 +35,7 @@ - + diff --git a/tests/RepoM.Api.Tests/RepoM.Api.Tests.csproj b/tests/RepoM.Api.Tests/RepoM.Api.Tests.csproj index 6dba193f..c4b74144 100644 --- a/tests/RepoM.Api.Tests/RepoM.Api.Tests.csproj +++ b/tests/RepoM.Api.Tests/RepoM.Api.Tests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/tests/RepoM.Plugin.AzureDevOps.Tests/RepoM.Plugin.AzureDevOps.Tests.csproj b/tests/RepoM.Plugin.AzureDevOps.Tests/RepoM.Plugin.AzureDevOps.Tests.csproj index cc32617d..ffac47d2 100644 --- a/tests/RepoM.Plugin.AzureDevOps.Tests/RepoM.Plugin.AzureDevOps.Tests.csproj +++ b/tests/RepoM.Plugin.AzureDevOps.Tests/RepoM.Plugin.AzureDevOps.Tests.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/tests/RepoM.Plugin.SonarCloud.Tests/RepoM.Plugin.SonarCloud.Tests.csproj b/tests/RepoM.Plugin.SonarCloud.Tests/RepoM.Plugin.SonarCloud.Tests.csproj index 92d0cf55..fe10865f 100644 --- a/tests/RepoM.Plugin.SonarCloud.Tests/RepoM.Plugin.SonarCloud.Tests.csproj +++ b/tests/RepoM.Plugin.SonarCloud.Tests/RepoM.Plugin.SonarCloud.Tests.csproj @@ -18,8 +18,8 @@ - - + + From ec0fc7549833046732960ef942562b3f2578c87f Mon Sep 17 00:00:00 2001 From: Coen van den Munckhof Date: Tue, 13 Sep 2022 09:17:14 +0200 Subject: [PATCH 3/5] cleanup --- src/GrrUi.App/Program.cs | 2 +- src/RepoM.App/App.xaml.cs | 1 - tests/Tests/Git/RepositoryTests.cs | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/GrrUi.App/Program.cs b/src/GrrUi.App/Program.cs index 1ebd546f..5f62e039 100644 --- a/src/GrrUi.App/Program.cs +++ b/src/GrrUi.App/Program.cs @@ -198,7 +198,7 @@ private static void ExecuteOnSelectedRepository(Action action) return; } - if (!(repositories.Length > _repositoryList.SelectedItem)) + if (repositories.Length <= _repositoryList.SelectedItem) { return; } diff --git a/src/RepoM.App/App.xaml.cs b/src/RepoM.App/App.xaml.cs index d18ec194..70356d90 100644 --- a/src/RepoM.App/App.xaml.cs +++ b/src/RepoM.App/App.xaml.cs @@ -15,7 +15,6 @@ namespace RepoM.App; using ExpressionStringEvaluator.VariableProviders; using ExpressionStringEvaluator.VariableProviders.DateTime; using Hardcodet.Wpf.TaskbarNotification; -using RepoM.Api; using RepoM.Api.Common; using RepoM.Api.Git; using RepoM.Api.Git.AutoFetch; diff --git a/tests/Tests/Git/RepositoryTests.cs b/tests/Tests/Git/RepositoryTests.cs index c3dc5cf9..de988b0d 100644 --- a/tests/Tests/Git/RepositoryTests.cs +++ b/tests/Tests/Git/RepositoryTests.cs @@ -66,15 +66,6 @@ public void Can_Use_Either_Slashes_Or_Backslashes() r1.Equals(r2).Should().BeTrue(); } - // [Test] - // public void Accepts_Leading_Whitespaces() - // { - // var r1 = _builder1.WithPath(@"C:\Develop\RepoM\RepoM").Build(); - // var r2 = _builder2.WithPath(@" C:\Develop\RepoM\RepoM").Build(); - // - // r1.Equals(r2).Should().BeTrue(); - // } - [Test] public void Accepts_Empty_Strings() { From 7f6344a7d331565beef967e0f78b29844d07c4c3 Mon Sep 17 00:00:00 2001 From: Coen van den Munckhof Date: Tue, 13 Sep 2022 10:10:05 +0200 Subject: [PATCH 4/5] Remove project --- src/RepoM.Api.Common/RepoM.Api.Common.csproj | 24 -------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/RepoM.Api.Common/RepoM.Api.Common.csproj diff --git a/src/RepoM.Api.Common/RepoM.Api.Common.csproj b/src/RepoM.Api.Common/RepoM.Api.Common.csproj deleted file mode 100644 index b57abbdd..00000000 --- a/src/RepoM.Api.Common/RepoM.Api.Common.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - netstandard2.0 - - - - - - - - - - - - - - - - - - - - - From 0aa2d08cba470b93ccab9037b3eb5e646deced55 Mon Sep 17 00:00:00 2001 From: Coen van den Munckhof Date: Tue, 13 Sep 2022 11:47:18 +0200 Subject: [PATCH 5/5] remove project --- src/RepoM.Api.Win/RepoM.Api.Win.csproj | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 src/RepoM.Api.Win/RepoM.Api.Win.csproj diff --git a/src/RepoM.Api.Win/RepoM.Api.Win.csproj b/src/RepoM.Api.Win/RepoM.Api.Win.csproj deleted file mode 100644 index 1f923b46..00000000 --- a/src/RepoM.Api.Win/RepoM.Api.Win.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - netstandard2.0 - - - - - - - - - - -