Merge pull request #223 from mpostol/UANodeSetValidation5.1.0

Update master before prerelease.
mpostol · Apr 27, 2021 · 75a1a0b · 75a1a0b
2 parents 965dc79 + 4e2f022
commit 75a1a0b
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 42 deletions.
diff --git a/.github/ISSUE_TEMPLATE/MakeRelease.md b/.github/ISSUE_TEMPLATE/MakeRelease.md
@@ -4,21 +4,22 @@ about: Make release tasks list
 title: 'Close the milestone and make release'
 labels: 'Release'
 assignees: 'mpostol'
-
 ---
 
 ## Release ToDo List
 
 - [ ] Remove all not crucial tasks from the current milestone to a new one or backlog
 - [ ] Draft a new release
-- [ ] Update version information for all published assemblies (Model.t4), 
+- [ ] Update version information for all published assemblies (SolutionMetadataTemplate.t4),
+- [ ] Perform unit tests
+- [ ] Perform functional tests
+- [ ] pr to master and continue on master
 - [ ] Update ReleaseNotes.md and print it to .html using VC
 - [ ] Build the Release Configuration of the solution
 - [ ] rename the folder name Release to UA.ModelDesigner
 - [ ] Create the installation package and publish in on the Release page
-- [ ] Perform functional tests
 - [ ] Update Readme files
-- [ ] Prepare and publish NuGet packages if applicable. 
+- [ ] Prepare and publish NuGet packages if applicable.
 - [ ] Create release front page
   - [ ] Getting Started
   - [ ] Version information

diff --git a/ModelDesigner.Configuration.UnitTests/Properties/AssemblyInfo.cs b/ModelDesigner.Configuration.UnitTests/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
 
 [assembly: ComVisible(false)]
 [assembly: Guid( "c4b8d907-a0cd-42e5-8c08-dc61af69a2ac" )]
-[assembly: AssemblyVersion("4.3.2.*")]
-[assembly: AssemblyFileVersion("4.3.2")]
+[assembly: AssemblyVersion("4.5.0.*")]
+[assembly: AssemblyFileVersion("4.5.0")]
 
 
diff --git a/ModelDesigner.Configuration/Properties/AssemblyInfo.cs b/ModelDesigner.Configuration/Properties/AssemblyInfo.cs
@@ -1,9 +1,9 @@
-//___________________________________________________________________________________
+//__________________________________________________________________________________________________
 //
 //  Copyright (C) 2021, Mariusz Postol LODZ POLAND.
 //
-//  To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI
-//___________________________________________________________________________________
+//  To be in touch join the community at GitHub: https://github.com/mpostol/ASMD/discussions
+//__________________________________________________________________________________________________
 
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -20,8 +20,8 @@
 
 [assembly: ComVisible(false)]
 [assembly: Guid( "c4b8d907-a0cd-42e5-8c08-dc61af69a2ac" )]
-[assembly: AssemblyVersion("4.3.2.*")]
-[assembly: AssemblyFileVersion("4.3.2")]
+[assembly: AssemblyVersion("4.5.0.*")]
+[assembly: AssemblyFileVersion("4.5.0")]
 [assembly: InternalsVisibleToAttribute("CAS.CommServer.UA.ModelDesigner.Configuration.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b3cff1bec656a6" +
                                                                        "e3784c75cacce8ee3bc695d0ce135d820c86465eb49b2353f0438d28ad9a458e5350c0c141393d" +
                                                                        "d9ad606bd9f4e0a8e1b0c49fa37835630b16798ece56df81c756f4c6bd37f07d68cc91ebfa7be7" +

diff --git a/ModelDesigner.Configuration/Properties/AssemblyInfo.tt b/ModelDesigner.Configuration/Properties/AssemblyInfo.tt
@@ -1,10 +1,11 @@
 <#@ template debug="false" hostspecific="false" language="C#" #>
 <#@ output extension=".cs" #>
-//___________________________________________________________________________________
+//__________________________________________________________________________________________________
 //
-//  Copyright (C) 2019, Mariusz Postol LODZ POLAND.
+//  Copyright (C) 2021, Mariusz Postol LODZ POLAND.
 //
-//___________________________________________________________________________________
+//  To be in touch join the community at GitHub: https://github.com/mpostol/ASMD/discussions
+//__________________________________________________________________________________________________
 
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -28,7 +29,6 @@ using System.Runtime.InteropServices;
                                                                        "d9ad606bd9f4e0a8e1b0c49fa37835630b16798ece56df81c756f4c6bd37f07d68cc91ebfa7be7" +
                                                                        "8149d016bbc6a364beda14fc1119698d8c8d9923805b40122bf594f08cc29f41cb0a31e5e141e3" +
                                                                        "f2421b9d", AllInternalsVisible = true)]
-[assembly: CAS.Lib.CodeProtect.AssemblyHelper( Company = "<#= AssemblyCompany #>", Email = "<#= Email #>", Phone = "<#= Phone #>", Product = "<#=AssemblyTrademark#>", Url = "<#= Url #>" )]
 
 <#@ include file = "..\..\SolutionMetadataTemplate.t4" #>
 

diff --git a/ModelDesigner.DesignStudio.UnitTest/Properties/AssemblyInfo.cs b/ModelDesigner.DesignStudio.UnitTest/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("1f0f64d5-0977-4f85-8ad1-fc24af68e244")]
-[assembly: AssemblyVersion("4.3.2.*")]
-[assembly: AssemblyFileVersion("4.3.2")]
+[assembly: AssemblyVersion("4.5.0.*")]
+[assembly: AssemblyFileVersion("4.5.0")]
 
 
 
diff --git a/ModelDesigner.DesignStudio/AssemblyTraceEvent.cs b/ModelDesigner.DesignStudio/AssemblyTraceEvent.cs
@@ -8,27 +8,33 @@
 using System;
 using System.Diagnostics;
 using System.Reflection;
+using UAOOI.SemanticData.UANodeSetValidation;
 using TraceMessage = UAOOI.SemanticData.BuildingErrorsHandling.TraceMessage;
 
 namespace CAS.UA.Model.Designer
 {
   /// <summary>
   /// class responsible for tracing inside this module, it uses  <see cref="TraceSource"/> with the name "CAS.CommServer.UA.ModelDesigner.DesignStudio"
   /// </summary>
-  internal static class AssemblyTraceEvent
+  internal class AssemblyTraceEvent
   {
-    private static Lazy<TraceSource> m_traceSource = new Lazy<TraceSource>(() => new TraceSource(Assembly.GetCallingAssembly().GetName().Name));
-
+    public AssemblyTraceEvent()
+    {
+      BuildErrorsHandling.Log.TraceEventAction += z => TraceMessage(z, nameof(BuildErrorsHandling.Log), 335372265);
+    }
+    internal static AssemblyTraceEvent Log => m_Singleton.Value;
     /// <summary>
     /// Gets the tracer.
     /// </summary>
     /// <value>The tracer.</value>
-    public static TraceSource Tracer => m_traceSource.Value;
+    public static TraceSource Tracer => Log.m_traceSource.Value;
     internal static event EventHandler<string> Listeners;
-    internal static void TraceMessage(TraceMessage message, string at, int id)
+    internal void TraceMessage(TraceMessage message, string at, int id)
     {
       Tracer.TraceEvent(message.TraceLevel, id, "At {0}: {1}", at, message.Message);
       Listeners?.Invoke(null, $"At {at}: {id} {message.BuildError.ToString()}; {message.Message}");
     }
+    private Lazy<TraceSource> m_traceSource = new Lazy<TraceSource>(() => new TraceSource(Assembly.GetCallingAssembly().GetName().Name));
+    private static Lazy<AssemblyTraceEvent> m_Singleton = new Lazy<AssemblyTraceEvent>(() => new AssemblyTraceEvent());
   }
-}
+}
diff --git a/ModelDesigner.DesignStudio/IO/SolutionConfigurationManagement.cs b/ModelDesigner.DesignStudio/IO/SolutionConfigurationManagement.cs
@@ -102,7 +102,7 @@ void ISolutionConfigurationManagement.Save(bool prompt)
     /// <returns>ProjectTreeNode.</returns>
     void ISolutionConfigurationManagement.ImportNodeSet()
     {
-      IProjectConfigurationManagement _newModel = ProjectConfigurationManagement.ImportNodeSet(this, base.GraphicalUserInterface, x => AssemblyTraceEvent.TraceMessage(x, nameof(ISolutionConfigurationManagement.ImportNodeSet), 486245093));
+      IProjectConfigurationManagement _newModel = ProjectConfigurationManagement.ImportNodeSet(this, base.GraphicalUserInterface, x => AssemblyTraceEvent.Log.TraceMessage(x, nameof(ISolutionConfigurationManagement.ImportNodeSet), 486245093));
       if (_newModel == null)
         return;
       AddProjectTCollection(_newModel);

diff --git a/ModelDesigner.DesignStudio/MainForm.cs b/ModelDesigner.DesignStudio/MainForm.cs
@@ -439,7 +439,7 @@ private void OnOk()
 
     private void buildToolStripMenuItem_Click(object sender, EventArgs e)
     {
-      m_MainContol.Build(x => AssemblyTraceEvent.TraceMessage(TraceMessage.DiagnosticTraceMessage(x), nameof(m_MainContol.Build), 851392402));
+      m_MainContol.Build(x => AssemblyTraceEvent.Log.TraceMessage(TraceMessage.DiagnosticTraceMessage(x), nameof(m_MainContol.Build), 851392402));
     }
 
     private void stateMachineEditorToolStripMenuItem_Click(object sender, EventArgs e)

diff --git a/ModelDesigner.DesignStudio/Properties/AssemblyInfo.cs b/ModelDesigner.DesignStudio/Properties/AssemblyInfo.cs
@@ -18,9 +18,8 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid( "33281f75-30a8-43e1-a2b3-915eaaf43915" )]
-[assembly: AssemblyVersion("4.3.2.*")]
-[assembly: AssemblyFileVersion("4.3.2")]
-//TODO Remove dependency on CodeProtect - consolidated #211
+[assembly: AssemblyVersion("4.5.0.*")]
+[assembly: AssemblyFileVersion("4.5.0")]
 [assembly: CAS.Lib.CodeProtect.AssemblyHelper( Company = "Mariusz Postol", Email = "mpostol@cas.eu", Phone = "+48 (608) 619 899", Product = "OOI ASMD", Url = "https://mpostol.github.io/ASMD/" )]
 [assembly: InternalsVisibleToAttribute("CAS.CommServer.UA.ModelDesigner.DesignStudio.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b3cff1bec656a6" +
                                                                        "e3784c75cacce8ee3bc695d0ce135d820c86465eb49b2353f0438d28ad9a458e5350c0c141393d" +

diff --git a/ModelDesigner.DesignStudio/Wrappers/ProjectTreeNode.cs b/ModelDesigner.DesignStudio/Wrappers/ProjectTreeNode.cs
@@ -7,10 +7,8 @@
 
 using CAS.UA.Model.Designer.IO;
 using CAS.UA.Model.Designer.Properties;
-using CAS.UA.Model.Designer.ToForms;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Xml;
 
 namespace CAS.UA.Model.Designer.Wrappers

diff --git a/ModelDesigner.ImportExport.UnitTests/Properties/AssemblyInfo.cs b/ModelDesigner.ImportExport.UnitTests/Properties/AssemblyInfo.cs
@@ -17,6 +17,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid( "e9358c79-8f72-438f-8cc3-ebabaa50861b" )]
-[assembly: AssemblyVersion("4.3.2.*")]
-[assembly: AssemblyFileVersion("4.3.2")]
+[assembly: AssemblyVersion("4.5.0.*")]
+[assembly: AssemblyFileVersion("4.5.0")]
 
diff --git a/ModelDesigner.ImportExport/Properties/AssemblyInfo.cs b/ModelDesigner.ImportExport/Properties/AssemblyInfo.cs
@@ -18,8 +18,8 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid( "5a04d11c-4bda-4b0c-a772-03371015932a" )]
-[assembly: AssemblyVersion("4.3.2.*")]
-[assembly: AssemblyFileVersion("4.3.2")]
+[assembly: AssemblyVersion("4.5.0.*")]
+[assembly: AssemblyFileVersion("4.5.0")]
 [assembly: InternalsVisibleToAttribute("CAS.UAModelDesignerImportExportUT, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b3cff1bec656a6" +
                                                                                     "e3784c75cacce8ee3bc695d0ce135d820c86465eb49b2353f0438d28ad9a458e5350c0c141393d" +
                                                                                     "d9ad606bd9f4e0a8e1b0c49fa37835630b16798ece56df81c756f4c6bd37f07d68cc91ebfa7be7" +

diff --git a/ModelDesigner.MeshDiagram3D/Properties/AssemblyInfo.cs b/ModelDesigner.MeshDiagram3D/Properties/AssemblyInfo.cs
@@ -17,6 +17,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("45D894AC-F150-4C63-BCAE-7D4F878F1D74")]
-[assembly: AssemblyVersion("4.3.2.*")]
-[assembly: AssemblyFileVersion("4.3.2")]
+[assembly: AssemblyVersion("4.5.0.*")]
+[assembly: AssemblyFileVersion("4.5.0")]
 
diff --git a/ModelDesigner.ModelsContainer.UnitTests/Properties/AssemblyInfo.cs b/ModelDesigner.ModelsContainer.UnitTests/Properties/AssemblyInfo.cs
@@ -17,6 +17,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid( "7f6b3ca8-1d1c-41e2-85d9-938cd835034d" )]
-[assembly: AssemblyVersion("4.3.2.*")]
-[assembly: AssemblyFileVersion("4.3.2")]
+[assembly: AssemblyVersion("4.5.0.*")]
+[assembly: AssemblyFileVersion("4.5.0")]
 
diff --git a/ModelDesigner.ModelsContainer/Properties/AssemblyInfo.cs b/ModelDesigner.ModelsContainer/Properties/AssemblyInfo.cs
@@ -18,6 +18,6 @@
 
 [assembly: ComVisible(false)]
 [assembly: Guid( "ADD17203-F2A5-41BD-B653-47B319C90B26" )]
-[assembly: AssemblyVersion("4.3.2.*")]
-[assembly: AssemblyFileVersion("4.3.2")]
+[assembly: AssemblyVersion("4.5.0.*")]
+[assembly: AssemblyFileVersion("4.5.0")]
 
diff --git a/SolutionMetadataTemplate.t4 b/SolutionMetadataTemplate.t4
@@ -8,8 +8,8 @@ string AssemblyCopyright = "Copyright (c) 2021 Mariusz Postol";
 string AssemblyCompany = "Mariusz Postol";
 string AssemblyTrademark = "OOI ASMD";
 string AssemblyProduct = "Object-Oriented Internet Address Space Model Designer";
-string AssemblyVersion = "4.3.2";
-string AssemblyVersionPrerelease = "-Alpha";
+string AssemblyVersion = "4.5.0";
+string AssemblyVersionPrerelease = "-Bravo";
 
 //Note: 
 //Alpha, Bravo, Charlie, Delta, Echo, Foxtrot, Golf, Hotel, India, Juliet,