Skip to content

Feature/packages #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coenm merged 5 commits into from
Aug 19, 2022
Merged

Feature/packages #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7066870
update packages except ui
coenm Aug 17, 2022
27e6563
terminal ui update
coenm Aug 17, 2022
3ca1146
single step update ui package
coenm Aug 17, 2022
0a678e3
update code for guiui
coenm Aug 17, 2022
a194519
update
coenm Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
<Version>3.5.107</Version>
<Version>3.5.109</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Grr.App/Grr.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="System.IO.Abstractions" Version="17.0.18" />
<PackageReference Include="TextCopy" Version="4.2.0" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="System.IO.Abstractions" Version="17.1.1" />
<PackageReference Include="TextCopy" Version="6.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/GrrUi.App/GrrUi.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Terminal.Gui" Version="0.81.0" />
<PackageReference Include="TextCopy" Version="4.2.0" />
<PackageReference Include="Terminal.Gui" Version="1.7.2" />
<PackageReference Include="TextCopy" Version="6.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
44 changes: 28 additions & 16 deletions src/GrrUi.App/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ namespace GrrUi.App;
using System.Runtime.InteropServices;
using GrrUi.App.Model;
using GrrUi.App.UI;
using NStack;
using RepoM.Ipc;
using Terminal.Gui;

Expand Down Expand Up @@ -49,7 +50,7 @@ static void Main(string[] args)
Y = Pos.Top(filterLabel),
Width = Dim.Fill(margin: 1),
};
_filterField.Changed += FilterField_Changed;
_filterField.TextChanged += FilterFieldOnTextChanged;

_repositoryList = new ListView(_repositoriesView.Repositories)
{
Expand All @@ -59,57 +60,58 @@ static void Main(string[] args)
Height = Dim.Fill() - 2,
};

var win = new KeyPreviewWindow("grr: Git repositories of RepoM")
{
filterLabel,
_filterField,
_repositoryList,
};
var win = new KeyPreviewWindow("grr: Git repositories of RepoM");
win.Add(filterLabel);
win.Add(_filterField);
win.Add(_repositoryList);

var buttonX = Pos.Left(filterLabel);

var navigationButton = new Button("Navigate")
{
Clicked = Navigate,
X = buttonX,
Y = Pos.AnchorEnd(1),
CanFocus = false,
};

if (!CanNavigate)
if (CanNavigate)
{
navigationButton.Clicked += Navigate;
}
else
{
navigationButton.Clicked = CopyNavigationCommandAndQuit;
navigationButton.Clicked += CopyNavigationCommandAndQuit;
}

buttonX = buttonX + navigationButton.Text.Length + BUTTON_BORDER + BUTTON_DISTANCE;
var copyPathButton = new Button("Copy")
{
Clicked = Copy,
X = buttonX,
Y = Pos.AnchorEnd(1),
CanFocus = false,
};
copyPathButton.Clicked += Copy;

buttonX = buttonX + copyPathButton.Text.Length + BUTTON_BORDER + BUTTON_DISTANCE;
var browseButton = new Button("Browse")
{
Clicked = Browse,

X = buttonX,
Y = Pos.AnchorEnd(1),
CanFocus = false,
};
browseButton.Clicked += Browse;

var quitButton = new Button("Quit")
{
Clicked = Application.RequestStop,
X = Pos.AnchorEnd("Quit".Length + BUTTON_BORDER + BUTTON_DISTANCE),
Y = Pos.AnchorEnd(1),
CanFocus = false,
};
quitButton.Clicked += QuitButtonOnClicked;

win.Add(navigationButton, copyPathButton, browseButton, quitButton);

win.DefineKeyAction(Key.Enter, () => win.SetFocus(_repositoryList));
win.DefineKeyAction(Key.Enter, () => _repositoryList.SetFocus());
win.DefineKeyAction(Key.Esc, () =>
{
if (_filterField.HasFocus)
Expand All @@ -118,7 +120,7 @@ static void Main(string[] args)
}
else
{
win.SetFocus(_filterField);
_filterField.SetFocus();
}
});

Expand All @@ -131,6 +133,11 @@ static void Main(string[] args)
Application.Run();
}

private static void QuitButtonOnClicked()
{
Application.RequestStop();
}

private static void SetFilterText(string filter)
{
if (_filterField == null)
Expand Down Expand Up @@ -200,6 +207,11 @@ private static void ExecuteOnSelectedRepository(Action<Repository> action)
action(current.Repository);
}

private static void FilterFieldOnTextChanged(ustring obj)
{
FilterField_Changed(_filterField, obj);
}

private static void FilterField_Changed(object? sender, NStack.ustring e)
{
if (_repositoriesView == null)
Expand Down
2 changes: 1 addition & 1 deletion src/GrrUi.App/UI/TimelyMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public static void ShowMessage(string message, TimeSpan duration)
{
var width = message.Length + 6;
var height = 5;
var lines = Label.MeasureLines(message, width);
// var lines = Label.MeasureLines(message, width);

var dialog = new Dialog(null, width, height);

Expand Down
4 changes: 2 additions & 2 deletions src/RepoM.Api.Common/RepoM.Api.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<PackageReference Include="ExpressionStringEvaluator" Version="0.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0182" />
<PackageReference Include="System.IO.Abstractions" Version="17.0.18" />
<PackageReference Include="System.IO.Abstractions" Version="17.1.1" />
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="YamlDotNet" Version="11.2.1" />
<PackageReference Include="YamlDotNet" Version="12.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/RepoM.App/RepoM.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@
<Resource Include="App.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SimpleInjector" Version="5.3.3" />
<PackageReference Include="SimpleInjector" Version="5.4.0" />
<PackageReference Include="SimpleInjector.Packaging" Version="5.0.0" />
<PackageReference Include="System.IO.Abstractions" Version="17.0.18" />
<PackageReference Include="System.IO.Abstractions" Version="17.1.1" />
<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
<PackageReference Include="DotNetEnv" Version="2.3.0" />
<PackageReference Include="ExpressionStringEvaluator" Version="0.2.6" />
<PackageReference Include="FluentWPF" Version="0.8.0" />
<PackageReference Include="FluentWPF" Version="0.9.0" />
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0182" />
<PackageReference Include="MaterialDesignThemes.MahApps" Version="0.2.2" />
<PackageReference Include="NetMQ" Version="4.0.1.8" />
<PackageReference Include="NetMQ" Version="4.0.1.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/RepoM.Ipc/RepoM.Ipc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NetMQ" Version="4.0.1.8" />
<PackageReference Include="SimpleInjector" Version="5.3.3" />
<PackageReference Include="NetMQ" Version="4.0.1.9" />
<PackageReference Include="SimpleInjector" Version="5.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/RepoM.Plugin.AzureDevOps/RepoM.Plugin.AzureDevOps.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
Expand All @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="ExpressionStringEvaluator" Version="0.2.6" />
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.170.0" />
<PackageReference Include="SimpleInjector" Version="5.3.3" />
<PackageReference Include="SimpleInjector" Version="5.4.0" />
<PackageReference Include="SimpleInjector.Packaging" Version="5.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/RepoM.Plugin.EverythingFileSearch/RepoM.Plugin.EverythingFileSearch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SimpleInjector" Version="5.3.3" />
<PackageReference Include="SimpleInjector" Version="5.4.0" />
<PackageReference Include="SimpleInjector.Packaging" Version="5.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/RepoM.Plugin.IpcService/RepoM.Plugin.IpcService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NetMQ" Version="4.0.1.8" />
<PackageReference Include="SimpleInjector" Version="5.3.3" />
<PackageReference Include="NetMQ" Version="4.0.1.9" />
<PackageReference Include="SimpleInjector" Version="5.4.0" />
<PackageReference Include="SimpleInjector.Packaging" Version="5.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/RepoM.Plugin.LuceneSearch/RepoM.Plugin.LuceneSearch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- <PackageReference Include="Lucene.Net.Queries" Version="4.8.0-beta00016" /> -->
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
<!-- <PackageReference Include="Lucene.Net.Suggest" Version="4.8.0-beta00016" /> -->
<PackageReference Include="SimpleInjector" Version="5.3.3" />
<PackageReference Include="SimpleInjector" Version="5.4.0" />
<PackageReference Include="SimpleInjector.Packaging" Version="5.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/RepoM.Plugin.SonarCloud/RepoM.Plugin.SonarCloud.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="ExpressionStringEvaluator" Version="0.2.6" />
<PackageReference Include="SonarQube.Net" Version="1.0.5" />
<PackageReference Include="SimpleInjector" Version="5.3.3" />
<PackageReference Include="SimpleInjector" Version="5.4.0" />
<PackageReference Include="SimpleInjector.Packaging" Version="5.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/RepoM.Plugin.WindowsExplorerGitInfo/RepoM.Plugin.WindowsExplorerGitInfo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="System.Security.Permissions" Version="6.0.0" />
<PackageReference Include="SimpleInjector" Version="5.3.3" />
<PackageReference Include="SimpleInjector" Version="5.4.0" />
<PackageReference Include="SimpleInjector.Packaging" Version="5.0.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions tests/RepoM.Api.Common.Tests/RepoM.Api.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="System.IO.Abstractions" Version="17.0.18" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.0.18" />
<PackageReference Include="Verify.Xunit" Version="17.10.0" />
<PackageReference Include="System.IO.Abstractions" Version="17.1.1" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.1.1" />
<PackageReference Include="Verify.Xunit" Version="17.10.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="Xunit.EnumMemberData" Version="1.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
Expand Down
6 changes: 3 additions & 3 deletions tests/RepoM.Plugin.AzureDevOps.Tests/RepoM.Plugin.AzureDevOps.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="System.IO.Abstractions" Version="17.0.18" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.0.18" />
<PackageReference Include="Verify.Xunit" Version="17.10.0" />
<PackageReference Include="System.IO.Abstractions" Version="17.1.1" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.1.1" />
<PackageReference Include="Verify.Xunit" Version="17.10.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="Xunit.EnumMemberData" Version="1.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
Expand Down
6 changes: 3 additions & 3 deletions tests/RepoM.Plugin.SonarCloud.Tests/RepoM.Plugin.SonarCloud.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="System.IO.Abstractions" Version="17.0.18" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.0.18" />
<PackageReference Include="Verify.Xunit" Version="17.10.0" />
<PackageReference Include="System.IO.Abstractions" Version="17.1.1" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.1.1" />
<PackageReference Include="Verify.Xunit" Version="17.10.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="Xunit.EnumMemberData" Version="1.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
Expand Down
4 changes: 2 additions & 2 deletions tests/Specs/Specs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0182" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.3.0" />
<PackageReference Include="Moq" Version="4.18.1" />
<PackageReference Include="NetMQ" Version="4.0.1.8" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="NetMQ" Version="4.0.1.9" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion tests/Tests/Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.3.0" />
<PackageReference Include="Moq" Version="4.18.1" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
Expand Down