Merge pull request #1295 from Ordisoftware/dev

Dev

Author: Ordisoftware

Documents/WebLinks/WebLinks-18-YouTubePlaylistsSciences.txt

@@ -22,6 +22,9 @@ URL = https://www.youtube.com/playlist?list=PLSn7yTHwEx-BEv_KNGXktzeF8oBTXGoKR
 Name = (FR/EN) Bodybuilding et nutrition
 URL = https://www.youtube.com/playlist?list=PLSn7yTHwEx-BEAk_k9s5tCMG5ZPwK6KVz
 
+Name = (FR/EN) Bodybuilding et nutrition selon JamCore
+URL = https://www.youtube.com/playlist?list=PLSn7yTHwEx-Dxwct2znoLCEugMfSoFVlB
+
 Name = (FR) Mentalisme et psychologie
 URL = https://www.youtube.com/playlist?list=PLSn7yTHwEx-B3m_jadFZi3rvJx9LPhHeG
 

Project/Hebrew Calendar (vs2022).csproj

@@ -1138,6 +1138,10 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\README.html">
+      <Link>README.html</Link>
+      <DependentUpon>README.md</DependentUpon>
+    </Content>
     <Content Include="..\Setup\OrdisoftwareHebrewCalendarSetup.iss">
       <Link>Properties\OrdisoftwareHebrewCalendarSetup.iss</Link>
     </Content>
@@ -1173,7 +1177,7 @@
       <Version>0.31.0</Version>
     </PackageReference>
     <PackageReference Include="morelinq">
-      <Version>3.4.1</Version>
+      <Version>3.4.2</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
@@ -1205,12 +1209,12 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="IDisposableAnalyzers">
-      <Version>4.0.2</Version>
+      <Version>4.0.4</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Meziantou.Analyzer">
-      <Version>2.0.26</Version>
+      <Version>2.0.29</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: NeutralResourcesLanguage("en")]
-[assembly: AssemblyVersion("10.3.0.0")]
-[assembly: AssemblyFileVersion("10.3.0.0")]
+[assembly: AssemblyVersion("10.4.0.0")]
+[assembly: AssemblyFileVersion("10.4.0.0")]

Project/Source/Common/Core/Globals/GlobalSuppressions.cs

@@ -90,3 +90,5 @@
 [assembly: SuppressMessage("Style", "GCop436:As the implementation is relatively long, change this into a standard method implementation.", Justification = "Opinion or N/A (need a parameter for the analyzer)", Scope = "module")]
 [assembly: SuppressMessage("Style", "GCop437:Complete the task associated to this \"TODO\" comment.", Justification = "N/A", Scope = "module")]
 [assembly: SuppressMessage("Usage", "GCop511:Either remove the parameter documentation node, or describe it properly.", Justification = "Opinion", Scope = "module")]
+
+[assembly: SuppressMessage("CodeQuality", "IDE0079:Retirer la suppression inutile", Justification = "For GCop when no nuget added", Scope = "module")]

Project/Source/Common/Core/Globals/Globals.Assembly.cs

@@ -61,37 +61,37 @@ static public string AssemblyTitleWithVersion
   /// Gets information describing the assembly.
   /// </summary>
   static public string AssemblyDescription
-    => GetAttribute<AssemblyDescriptionAttribute>().Description;
+    => GetAttribute<AssemblyDescriptionAttribute>()?.Description ?? string.Empty;
 
   /// <summary>
   /// Gets the assembly product.
   /// </summary>
   static public string AssemblyProduct
-    => GetAttribute<AssemblyProductAttribute>().Product;
+    => GetAttribute<AssemblyProductAttribute>()?.Product ?? string.Empty;
 
   /// <summary>
   /// Gets the assembly copyright.
   /// </summary>
   static public string AssemblyCopyright
-    => GetAttribute<AssemblyCopyrightAttribute>().Copyright;
+    => GetAttribute<AssemblyCopyrightAttribute>()?.Copyright ?? string.Empty;
 
   /// <summary>
   /// Gets the assembly company.
   /// </summary>
   static public string AssemblyCompany
-    => GetAttribute<AssemblyCompanyAttribute>().Company;
+    => GetAttribute<AssemblyCompanyAttribute>()?.Company ?? string.Empty;
 
   /// <summary>
   /// Gets the assembly trademark.
   /// </summary>
   static public string AssemblyTrademark
-    => GetAttribute<AssemblyTrademarkAttribute>().Trademark;
+    => GetAttribute<AssemblyTrademarkAttribute>()?.Trademark ?? string.Empty;
 
   /// <summary>
   /// Gets the assembly GUID.
   /// </summary>
   static public string AssemblyGUID
-    => GetAttribute<System.Runtime.InteropServices.GuidAttribute>().Value;
+    => GetAttribute<GuidAttribute>()?.Value ?? string.Empty;
 
   /// <summary>
   /// Gets the assembly compiled DateTime.

Project/Source/Common/Core/Globals/Globals.Files.cs

@@ -11,7 +11,7 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2016-04 </created>
-/// <edited> 2022-03 </edited>
+/// <edited> 2023-04 </edited>
 namespace Ordisoftware.Core;
 
 /// <summary>
@@ -149,6 +149,12 @@ static public string ApplicationIconFilePath
   static public string ApplicationReadmeMDPath
     => Path.Combine(RootFolderPath, "README.md");
 
+  /// <summary>
+  /// Indicates the file path of the application's readme html file.
+  /// </summary>
+  static public string ApplicationReadmeHtmlPath
+    => Path.Combine(RootFolderPath, "README.html");
+
   /// <summary>
   /// Indicates the file path of the help.
   /// </summary>

Project/Source/Common/Core/System/SystemManager.cs

@@ -133,7 +133,7 @@ static public long SizeOf(this object instance)
       try
       {
         using var stream = new MemoryStream();
-        new BinaryFormatter().Serialize(stream, instance); // TODO REPLACE
+        new BinaryFormatter().Serialize(stream, instance);
         result = stream.Length;
       }
       catch ( Exception ex1 )

Project/Source/Common/Core/WinControls/CommonMenusControl.cs

@@ -11,11 +11,9 @@
 /// You may add additional accurate notices of copyright ownership.
 /// </license>
 /// <created> 2016-04 </created>
-/// <edited> 2022-09 </edited>
+/// <edited> 2023-04 </edited>
 namespace Ordisoftware.Core;
 
-using Markdig;
-
 using TranslationPair = KeyValuePair<string, TranslationsDictionary>;
 
 public sealed partial class CommonMenusControl : UserControl
@@ -241,6 +239,8 @@ private void ActionOpenWebsiteURL_Click(object sender, EventArgs e)
 
   private void ActionReadme_Click(object sender, EventArgs e)
   {
+    SystemManager.RunShell(Globals.ApplicationReadmeHtmlPath);
+    /* TODO remove that and markdig
     var fileLines = Markdown.ToHtml(File.ReadAllText(Globals.ApplicationReadmeMDPath),
                                     new MarkdownPipelineBuilder().UseAdvancedExtensions().Build());
     string filePath = Path.Combine(Path.GetTempPath(), $"{Globals.ApplicationCode}-README.html");
@@ -253,7 +253,7 @@ private void ActionReadme_Click(object sender, EventArgs e)
       SystemManager.TryCatch(() => File.Delete(filePath));
       timer.Dispose();
     };
-    timer.Start();
+    timer.Start();*/
   }
 
   private void ActionAbout_Click(object sender, EventArgs e)

Project/Source/Forms/MainForm/MainForm.Designer.cs

@@ -229,7 +229,7 @@
     <value>MonthlyCalendar</value>
   </data>
   <data name="&gt;&gt;MonthlyCalendar.Type" xml:space="preserve">
-    <value>CodeProjectCalendar.NET.Calendar, Ordisoftware.Hebrew.Calendar, Version=10.1.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CodeProjectCalendar.NET.Calendar, Ordisoftware.Hebrew.Calendar, Version=10.4.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;MonthlyCalendar.Parent" xml:space="preserve">
     <value>PanelViewMonthlyCalendar</value>
@@ -3625,9 +3625,6 @@
   <data name="ContextMenuParashahSeparator.Size" type="System.Drawing.Size, System.Drawing">
     <value>239, 6</value>
   </data>
-  <data name="ContextMenuParashahSeparator.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <data name="ContextMenuDayCelebrationVersesBoard.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -3927,7 +3924,7 @@
     <value>Navigation window</value>
   </data>
   <data name="ContextMenuStripDay.Size" type="System.Drawing.Size, System.Drawing">
-    <value>243, 476</value>
+    <value>243, 498</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripDay.Name" xml:space="preserve">
     <value>ContextMenuStripDay</value>
@@ -3943,7 +3940,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC8
-        CQAAAk1TRnQBSQFMAgEBBAEAAaABAwGgAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBBAEAAagBAwGoAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -4180,7 +4177,7 @@
     <value>EditExportDataEnumsAsTranslations</value>
   </data>
   <data name="&gt;&gt;EditExportDataEnumsAsTranslations.Type" xml:space="preserve">
-    <value>Ordisoftware.Core.ToolStripCheckBoxItem, Ordisoftware.Hebrew.Calendar, Version=10.1.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>Ordisoftware.Core.ToolStripCheckBoxItem, Ordisoftware.Hebrew.Calendar, Version=10.4.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;LabelEnumsAsTranslations.Name" xml:space="preserve">
     <value>LabelEnumsAsTranslations</value>