Merge remote-tracking branch 'origin/main' into pr/1723

Analogy-LogViewer · May 12, 2023 · e027697 · e027697
2 parents 31dfed7 + f4598f8
commit e027697
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Analogy/Analogy.csproj b/Analogy/Analogy.csproj
@@ -5,7 +5,7 @@
 		<OutputType>WinExe</OutputType>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<TargetFrameworks>net48;net471;net7.0-windows;net6.0-windows</TargetFrameworks>
-		<Version>4.13.0</Version>
+		<Version>4.13.1</Version>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<IncludeSymbols>true</IncludeSymbols>
@@ -48,6 +48,7 @@
 		<EmbeddedResource Remove="UserControls\UCLogsNonFloatable.resx" />
 	</ItemGroup>
 	<ItemGroup>
+		<PackageReference Include="Analogy.LogViewer.ElasticCommonSchema" Version="0.2.0" />
 		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="3.8.3" />
 		<PackageReference Include="Analogy.LogViewer.LoggersTree" Version="1.0.2" />
 		<PackageReference Include="Analogy.LogViewer.Template" Version="3.8.3" />
@@ -62,7 +63,7 @@
 		<PackageReference Include="Analogy.LogViewer.WindowsEventLogs" Version="3.8.3" />
 		<PackageReference Include="Analogy.LogViewer.Serilog" Version="3.8.3" />
 		<PackageReference Include="Analogy.LogViewer.GitHistory" Version="3.8.3" />
-		<PackageReference Include="Analogy.LogViewer.Github" Version="3.8.3.1" />
+		<PackageReference Include="Analogy.LogViewer.Github" Version="3.8.3.2" />
 		<PackageReference Include="Analogy.LogViewer.gRPC" Version="3.8.3" />
 		<PackageReference Include="Analogy.LogViewer.JsonParser" Version="3.8.3" />
 		<PackageReference Include="Analogy.LogViewer.WordsSearch" Version="3.8.3" />
@@ -71,7 +72,7 @@
 		<PackageReference Include="Grpc.Core" Version="2.46.6" />
 		<PackageReference Include="Markdig" Version="0.31.0" />
 		<PackageReference Include="MessagePack" Version="2.5.108" />
-		<PackageReference Include="Octokit" Version="5.1.0" />
+		<PackageReference Include="Octokit" Version="6.0.0" />
 		<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
 		<PackageReference Include="System.IO.Compression" Version="4.3.0" />
 		<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />

diff --git a/Analogy/CommonChangeLog.cs b/Analogy/CommonChangeLog.cs
@@ -9,11 +9,13 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
         {
             return new List<AnalogyChangeLog>
             {
-                new ("V4.13.0 Release V4.13.0 #1707 ",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2023, 04, 14)),
+                new ("V4.13.1 - [Data Provider] Add Elastic Common Schema (ECS) as Data Provider #1729",AnalogChangeLogType.Feature,"Lior Banai",new DateTime(2023, 05, 12)),
+                new ("V4.13.1 - Welcome/setup form isn't showing any extension #1724",AnalogChangeLogType.Bug,"Lior Banani",new DateTime(2023, 05, 09)),
+                new ("V4.13.0 - Release V4.13.0 #1707",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2023, 04, 14)),
                 new ("V4.13.0 - Refactor GitHub client usage (use OctoKit.net Nuget) #1713",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2023, 04, 08)),
                 new AnalogyChangeLog("V4.13.0 - [Settings] Add more information for real time data providers #1709",AnalogChangeLogType.Improvement, "Lior Banai", new DateTime(2023, 04, 07)),
                 new AnalogyChangeLog("V4.13.0 - [UI] Do not Create menu for empty Data Providers #1708",AnalogChangeLogType.Improvement, "Lior Banai", new DateTime(2023, 04, 07)),
-                new AnalogyChangeLog("V4.13.0 - Pooling for rolling files #1680",AnalogChangeLogType.Improvement, "pybride", new DateTime(2023, 04, 07)), 
+                new AnalogyChangeLog("V4.13.0 - Pooling for rolling files #1680",AnalogChangeLogType.Improvement, "pybride", new DateTime(2023, 04, 07)),
                 new AnalogyChangeLog("V4.13.0 - Improving handling of custom control linked to log tabs #1681",AnalogChangeLogType.Improvement, "pybride", new DateTime(2023, 04, 07)),
                 new AnalogyChangeLog("V4.13.0 - Adding a new Values tab in Timeline Visualizer #1682",AnalogChangeLogType.Improvement, "pybride", new DateTime(2023, 04, 07)),
                 new AnalogyChangeLog("V4.13.0 - [Extensions] add LoggersTree nuget to Analogy #1706",AnalogChangeLogType.Improvement, "Lior Banai", new DateTime(2023, 04, 07)),

diff --git a/Analogy/Forms/Welcome/WelcomeForm.cs b/Analogy/Forms/Welcome/WelcomeForm.cs
@@ -69,7 +69,7 @@ private UserControl GetUserControlByType(ApplicationWelcomeSelectionType selecti
             }
         }
 
-        private void WelcomeForm_Load(object sender, EventArgs e)
+        private async void WelcomeForm_Load(object sender, EventArgs e)
         {
             if (DesignMode)
             {
@@ -78,6 +78,8 @@ private void WelcomeForm_Load(object sender, EventArgs e)
 
             ShowIcon = true;
             Icon = UserSettingsManager.UserSettings.GetIcon();
+            await FactoriesManager.Instance.InitializeBuiltInFactories();
+            await FactoriesManager.Instance.AddExternalDataSources();
             AddOrBringToFrontUserControl(ApplicationWelcomeSelectionType.General);
         }
       private void aceGeneral_Click(object sender, EventArgs e)