Skip to content

Commit 3c6ce1b

Browse files
LiorBanaiLiorBanai
authored
Geolocation extension #2265 (#2267)
* Add Geolocation service (WIP) * update nugets * v8.1.1 add geo location service
1 parent 83d7aa5 commit 3c6ce1b

File tree

12 files changed

+859
-28
lines changed

12 files changed

+859
-28
lines changed

‎Analogy.Common/Analogy.Common.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<Company>Analogy.LogViewer</Company>
2323
</PropertyGroup>
2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
26-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
27-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
28-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
25+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
26+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
27+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
28+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
2929
</ItemGroup>
3030
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
3131
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -44,10 +44,10 @@
4444
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.1.0" />
4545
<PackageReference Include="Analogy.LogViewer.Template" Version="8.1.0" />
4646
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
47-
<PackageReference Include="System.Drawing.Common" Version="9.0.4" />
47+
<PackageReference Include="System.Drawing.Common" Version="9.0.6" />
4848
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
4949
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
50-
<PackageReference Include="System.Resources.Extensions" Version="9.0.4" />
50+
<PackageReference Include="System.Resources.Extensions" Version="9.0.6" />
5151
</ItemGroup>
5252
<ItemGroup>
5353
<Compile Update="Properties\Resources.Designer.cs">

‎Analogy.CommonControls/Analogy.CommonControls.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
<ItemGroup>
4646
<PackageReference Include="Analogy.CommonUtilities" Version="8.1.0" />
4747
<PackageReference Include="Analogy.LogViewer.Template" Version="8.1.0" />
48-
<PackageReference Include="Markdig" Version="0.41.1" />
49-
<PackageReference Include="MessagePack" Version="3.1.3" />
50-
<PackageReference Include="System.Drawing.Common" Version="9.0.4" />
48+
<PackageReference Include="Markdig" Version="0.41.2" />
49+
<PackageReference Include="MessagePack" Version="3.1.4" />
50+
<PackageReference Include="System.Drawing.Common" Version="9.0.6" />
5151
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
5252
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
53-
<PackageReference Include="System.Resources.Extensions" Version="9.0.4" />
53+
<PackageReference Include="System.Resources.Extensions" Version="9.0.6" />
5454
</ItemGroup>
5555
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0-windows' or '$(TargetFramework)' == 'net9.0-windows'">
5656
<Reference Include="DevExpress.BonusSkins.v24.2">

‎Analogy.UnitTests/Analogy.UnitTests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
4949
<ItemGroup>
5050
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.1.0" />
51-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
52-
<PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
53-
<PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
51+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
52+
<PackageReference Include="MSTest.TestAdapter" Version="3.9.3" />
53+
<PackageReference Include="MSTest.TestFramework" Version="3.9.3" />
5454
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
55-
<PackageReference Include="System.Text.Json" Version="9.0.4" />
55+
<PackageReference Include="System.Text.Json" Version="9.0.6" />
5656
</ItemGroup>
5757
<ItemGroup>
5858
<ProjectReference Include="..\Analogy\Analogy.csproj" />

‎Analogy/Analogy.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<PackageReference Include="Analogy.LogViewer.GitHistory" Version="8.1.0" />
3535
<PackageReference Include="Analogy.LogViewer.Github" Version="8.1.0" />
3636
<PackageReference Include="Analogy.LogViewer.gRPC" Version="8.1.0" />
37-
<PackageReference Include="Analogy.LogViewer.IISLogsProvider" Version="8.1.0" />
37+
<PackageReference Include="Analogy.LogViewer.IISLogsProvider" Version="8.2.0" />
3838
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.1.0" />
3939
<PackageReference Include="Analogy.LogViewer.JsonParser" Version="8.1.0" />
4040
<PackageReference Include="Analogy.LogViewer.LiteDB" Version="2.1.0" />
@@ -49,17 +49,17 @@
4949
<PackageReference Include="Analogy.LogViewer.WindowsEventLogs" Version="8.1.0" />
5050
<PackageReference Include="Analogy.LogViewer.XMLParser" Version="8.1.0" />
5151
<PackageReference Include="LiteDB" Version="5.0.21" />
52-
<PackageReference Include="Markdig" Version="0.41.1" />
53-
<PackageReference Include="MessagePack" Version="3.1.3" />
54-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
55-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
56-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
57-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
52+
<PackageReference Include="Markdig" Version="0.41.2" />
53+
<PackageReference Include="MessagePack" Version="3.1.4" />
54+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
55+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
56+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
57+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
5858
<PackageReference Include="Octokit" Version="14.0.0" />
59-
<PackageReference Include="System.Drawing.Common" Version="9.0.4" />
59+
<PackageReference Include="System.Drawing.Common" Version="9.0.6" />
6060
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
6161
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
62-
<PackageReference Include="System.Resources.Extensions" Version="9.0.4" />
62+
<PackageReference Include="System.Resources.Extensions" Version="9.0.6" />
6363
</ItemGroup>
6464
<ItemGroup>
6565
<ProjectReference Include="..\Analogy.CommonControls\Analogy.CommonControls.csproj" />

‎Analogy/DataProviders/AnalogyBuiltInFactory.cs‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,14 @@ public class AnalogyCustomActionFactory : CustomActionsFactory
150150

151151
public AnalogyCustomActionFactory()
152152
{
153-
Actions = new List<IAnalogyCustomAction> { new AnalogyCustomAction(), new AnalogyUnixTimeAction(), new AnalogyJsonViewerAction(), new AnalogyCompareTextAction() };
153+
Actions = new List<IAnalogyCustomAction>
154+
{
155+
new AnalogyCustomAction(),
156+
new AnalogyUnixTimeAction(),
157+
new AnalogyJsonViewerAction(),
158+
new AnalogyCompareTextAction(),
159+
new AnalogyGeoLocationAction(),
160+
};
154161
}
155162
}
156163

@@ -203,4 +210,16 @@ public class AnalogyCompareTextAction : IAnalogyCustomAction
203210
public class AnalogyBuiltInImages : AnalogyImages
204211
{
205212
}
213+
214+
public class AnalogyGeoLocationAction : IAnalogyCustomAction
215+
{
216+
public Action Action => () => new GeoLocationForm().Show();
217+
public Guid Id { get; set; } = new Guid("10a0d408-d520-4471-8851-75e3bd0a8cc6");
218+
public Image? SmallImage { get; set; } = Resources.Watermark_16x16;
219+
public Image? LargeImage { get; set; } = Resources.Watermark_32x32;
220+
221+
public string Title { get; set; } = "Geo Location Lookup";
222+
public AnalogyCustomActionType Type { get; } = AnalogyCustomActionType.Global;
223+
public AnalogyToolTip? ToolTip { get; set; }
224+
}
206225
}

0 commit comments

Comments
 (0)