Skip to content

Commit 20be3dd

Browse files
LiorBanaiLiorBanai
committed
V4.10.2
1 parent 63a2d93 commit 20be3dd

11 files changed

+361
-35
lines changed

‎Analogy.Common/Analogy.Common.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Authors>Lior Banai</Authors>
1111
<RepositoryType>git</RepositoryType>
1212
<Version>0.9.0</Version>
13-
<Copyright>Lior Banai © 2019-2022</Copyright>
13+
<Copyright>Lior Banai © 2019-2023</Copyright>
1414
<Product>Analogy Log Viewer</Product>
1515
<AssemblyName>Analogy.Common</AssemblyName>
1616
<RootNamespace>Analogy.Common</RootNamespace>

‎Analogy.CommonControls.Example/Analogy.CommonControls.Example.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ItemGroup>
1717
<ProjectReference Include="..\Analogy.CommonControls\Analogy.CommonControls.csproj" />
1818
</ItemGroup>
19-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows' or '$(TargetFramework)' == 'net7.0-windows' ">
19+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' or '$(TargetFramework)' == 'net7.0-windows' ">
2020
<Reference Include="DevExpress.BonusSkins.v21.2">
2121
<HintPath>..\DevExpress\.net core\DevExpress.BonusSkins.v21.2.dll</HintPath>
2222
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎Analogy.CommonControls/Analogy.CommonControls.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5151
</PackageReference>
5252
</ItemGroup>
53-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows' or '$(TargetFramework)' == 'net7.0-windows' ">
53+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' or '$(TargetFramework)' == 'net7.0-windows' ">
5454
<Reference Include="DevExpress.BonusSkins.v21.2">
5555
<HintPath>..\DevExpress\.net core\DevExpress.BonusSkins.v21.2.dll</HintPath>
5656
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎Analogy/Analogy.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<OutputType>WinExe</OutputType>
66
<NeutralLanguage>en-US</NeutralLanguage>
77
<TargetFrameworks>net48;net471;net7.0-windows;net6.0-windows</TargetFrameworks>
8-
<Version>4.10.1</Version>
8+
<Version>4.10.2</Version>
99
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1010
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1111
<IncludeSymbols>true</IncludeSymbols>
@@ -93,7 +93,7 @@
9393
<PackageReference Include="DevExpress.Win.WinterJoySkin" Version="1.0.1" />
9494
</ItemGroup>-->
9595

96-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows' or '$(TargetFramework)' == 'net7.0-windows'">
96+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' or '$(TargetFramework)' == 'net7.0-windows'">
9797
<Reference Include="DevExpress.BonusSkins.v21.2">
9898
<HintPath>..\DevExpress\.net core\DevExpress.BonusSkins.v21.2.dll</HintPath>
9999
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎Analogy/Forms/WhatsNewForm.Designer.cs

+16-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Analogy/Forms/WhatsNewForm.cs

+14-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private void WhatsNewForm_Load(object sender, EventArgs e)
2020
return;
2121
}
2222
Icon = UserSettingsManager.UserSettings.GetIcon();
23-
WhatIsNew4_10_0 uc = new WhatIsNew4_10_0 { Name = "V4.10.0" };
23+
WhatIsNew4_10_2 uc = new WhatIsNew4_10_2 { Name = "V4.10.2" };
2424
fluentDesignFormContainer1.Controls.Add(uc);
2525
uc.Dock = DockStyle.Fill;
2626
uc.BringToFront();
@@ -294,5 +294,18 @@ private void e4100_Click(object sender, EventArgs e)
294294
}
295295
SetActive("V4.10.0");
296296
}
297+
298+
private void e4102_Click(object sender, EventArgs e)
299+
{
300+
if (!fluentDesignFormContainer1.Controls.ContainsKey("V4.10.2"))
301+
{
302+
WhatIsNew4_10_2 uc = new WhatIsNew4_10_2();
303+
uc.Name = "V4.10.2";
304+
fluentDesignFormContainer1.Controls.Add(uc);
305+
uc.Dock = DockStyle.Fill;
306+
uc.BringToFront();
307+
}
308+
SetActive("V4.10.2");
309+
}
297310
}
298311
}

‎Analogy/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static void Main()
6767
};
6868
Application.SetCompatibleTextRenderingDefault(false);
6969
Application.EnableVisualStyles();
70-
#if NETCOREAPP3_1 || NET
70+
#if NET
7171
Application.SetHighDpiMode(HighDpiMode.SystemAware);
7272
#endif
7373
Settings.IncreaseNumberOfLaunches();
@@ -210,7 +210,7 @@ private static IntPtr IntPtrAlloc<T>(T param)
210210
return retval;
211211
}
212212

213-
private static Process GetAlreadyRunningInstance()
213+
private static Process? GetAlreadyRunningInstance()
214214
{
215215
var current = Process.GetCurrentProcess();
216216
return Process.GetProcessesByName(current.ProcessName).FirstOrDefault(p => p.Id != current.Id);

‎Analogy/Properties/licenses.licx

+16-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
2-
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
3-
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
4-
DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
5-
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
6-
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
7-
DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
8-
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
9-
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
10-
DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v21.2, Version=21.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
11-
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
12-
DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
13-
DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
14-
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
15-
DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v21.1.UI, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
16-
DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
17-
DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
18-
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
19-
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
20-
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
21-
DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.1, Version=21.1.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
1+
DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v21.2.UI, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
2+
DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
3+
DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
4+
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
5+
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
6+
DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
7+
DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
8+
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
9+
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
10+
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
11+
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
12+
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
13+
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
14+
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
15+
DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
16+
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

0 commit comments

Comments
 (0)