diff --git a/ModelDesigner.Configuration/ModelDesigner.Configuration.csproj b/ModelDesigner.Configuration/ModelDesigner.Configuration.csproj index d0c5749e..4e0f6d8e 100644 --- a/ModelDesigner.Configuration/ModelDesigner.Configuration.csproj +++ b/ModelDesigner.Configuration/ModelDesigner.Configuration.csproj @@ -10,7 +10,7 @@ Properties CAS.CommServer.UA.ModelDesigner.Configuration CAS.CommServer.UA.ModelDesigner.Configuration - v4.6.1 + v4.7.2 512 true cas.snk @@ -75,22 +75,10 @@ ..\packages\CAS.CommServer.UA.Stack.Core.1.01.3265\lib\net451\CAS.CommServer.UA.Stack.Core.dll True - - ..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.dll - True - - - ..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.Core.dll - True - ..\packages\CAS.UA.IServerConfiguration.1.00.00\lib\net35\CAS.UA.IServerConfiguration.dll True - - ..\packages\CAS.Windows.Forms.6.1.2\lib\net451\CAS.Windows.Forms.dll - True - 3.5 @@ -101,6 +89,9 @@ + + ..\packages\UAOOI.Windows.Forms.7.0.3-Delta\lib\net451\UAOOI.Windows.Forms.dll + diff --git a/ModelDesigner.Configuration/Properties/Resources.Designer.cs b/ModelDesigner.Configuration/Properties/Resources.Designer.cs index 97ee4ae6..6ef8ca9e 100644 --- a/ModelDesigner.Configuration/Properties/Resources.Designer.cs +++ b/ModelDesigner.Configuration/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace CAS.CommServer.UA.ModelDesigner.Configuration.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/ModelDesigner.Configuration/Properties/Settings.Designer.cs b/ModelDesigner.Configuration/Properties/Settings.Designer.cs index ef67581d..135a87b5 100644 --- a/ModelDesigner.Configuration/Properties/Settings.Designer.cs +++ b/ModelDesigner.Configuration/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace CAS.CommServer.UA.ModelDesigner.Configuration.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/ModelDesigner.Configuration/ServerSelector.cs b/ModelDesigner.Configuration/ServerSelector.cs index e7f4b4ec..180056f2 100644 --- a/ModelDesigner.Configuration/ServerSelector.cs +++ b/ModelDesigner.Configuration/ServerSelector.cs @@ -9,7 +9,6 @@ using CAS.CommServer.UA.ModelDesigner.Configuration.UserInterface; using CAS.Lib.CodeProtect; using CAS.UA.IServerConfiguration; -using CAS.Windows.Forms.CodeProtectControls; using System; using System.Collections.Generic; using System.ComponentModel; @@ -19,6 +18,7 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; +using UAOOI.Windows.Forms.CodeProtectControls; namespace CAS.CommServer.UA.ModelDesigner.Configuration { diff --git a/ModelDesigner.Configuration/ServerWrapper.cs b/ModelDesigner.Configuration/ServerWrapper.cs index 0a769c00..010e919c 100644 --- a/ModelDesigner.Configuration/ServerWrapper.cs +++ b/ModelDesigner.Configuration/ServerWrapper.cs @@ -7,7 +7,7 @@ using CAS.CommServer.UA.Common; using CAS.CommServer.UA.ModelDesigner.Configuration.UserInterface; -using CAS.Lib.RTLib.Utils; +using CAS.Lib.CodeProtect; using CAS.UA.IServerConfiguration; using System; using System.Collections.Generic; diff --git a/ModelDesigner.Configuration/app.config b/ModelDesigner.Configuration/app.config index d5e118ec..0fa1d642 100644 --- a/ModelDesigner.Configuration/app.config +++ b/ModelDesigner.Configuration/app.config @@ -1,23 +1,15 @@ - + -
+
- + Configuration (* .{0})|*.{0}|(* .xml)|*.xml|All files (*.*)|*.* - - - - - - - - diff --git a/ModelDesigner.Configuration/packages.config b/ModelDesigner.Configuration/packages.config index 1510584d..57abff40 100644 --- a/ModelDesigner.Configuration/packages.config +++ b/ModelDesigner.Configuration/packages.config @@ -3,8 +3,7 @@ - - + \ No newline at end of file diff --git a/ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj b/ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj index 8d546f07..00cda0dc 100644 --- a/ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj +++ b/ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj @@ -10,7 +10,7 @@ Properties CAS.UA.Model.Designer CAS.UA.ModelDesigner - v4.6.1 + v4.7.2 512 CAS.UA.Model.Designer.Program true @@ -549,7 +549,6 @@ Always - Designer diff --git a/ModelDesigner.DesignStudio/Properties/Resources.Designer.cs b/ModelDesigner.DesignStudio/Properties/Resources.Designer.cs index 6e26e42f..b507e802 100644 --- a/ModelDesigner.DesignStudio/Properties/Resources.Designer.cs +++ b/ModelDesigner.DesignStudio/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace CAS.UA.Model.Designer.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/ModelDesigner.DesignStudio/ReleaseNotes.md b/ModelDesigner.DesignStudio/ReleaseNotes.md index 9064fce6..b5a86b04 100644 --- a/ModelDesigner.DesignStudio/ReleaseNotes.md +++ b/ModelDesigner.DesignStudio/ReleaseNotes.md @@ -6,7 +6,7 @@ * Description: OPC UA Information Model Design Studio. * Product: [Object Oriented Internet](https://github.com/mpostol/OPC-UA-OOI) * Version: 4.1.0 -* Release Date: 17.12.2019 +* Release Date: 2/8/2020 The main changes and new functionality are listed below: diff --git a/ModelDesigner.DesignStudio/Wrappers/AddressSpaceDictionary/AddressSpace.Designer.cs b/ModelDesigner.DesignStudio/Wrappers/AddressSpaceDictionary/AddressSpace.Designer.cs index 693706ab..f31e4958 100644 --- a/ModelDesigner.DesignStudio/Wrappers/AddressSpaceDictionary/AddressSpace.Designer.cs +++ b/ModelDesigner.DesignStudio/Wrappers/AddressSpaceDictionary/AddressSpace.Designer.cs @@ -37,7 +37,7 @@ public partial class AddressSpace : global::System.Data.DataSet { private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public AddressSpace() { this.BeginInit(); this.InitClass(); @@ -48,7 +48,7 @@ public AddressSpace() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected AddressSpace(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : base(info, context, false) { if ((this.IsBinarySerialized(info, context) == true)) { @@ -87,7 +87,7 @@ protected AddressSpace(global::System.Runtime.Serialization.SerializationInfo in } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public NodesTableDataTable NodesTable { @@ -97,7 +97,7 @@ public NodesTableDataTable NodesTable { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] public ReferencesTableDataTable ReferencesTable { @@ -107,7 +107,7 @@ public ReferencesTableDataTable ReferencesTable { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)] public override global::System.Data.SchemaSerializationMode SchemaSerializationMode { @@ -120,7 +120,7 @@ public ReferencesTableDataTable ReferencesTable { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] public new global::System.Data.DataTableCollection Tables { get { @@ -129,7 +129,7 @@ public ReferencesTableDataTable ReferencesTable { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] public new global::System.Data.DataRelationCollection Relations { get { @@ -138,7 +138,7 @@ public ReferencesTableDataTable ReferencesTable { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void InitializeDerivedDataSet() { this.BeginInit(); this.InitClass(); @@ -146,7 +146,7 @@ protected override void InitializeDerivedDataSet() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public override global::System.Data.DataSet Clone() { AddressSpace cln = ((AddressSpace)(base.Clone())); cln.InitVars(); @@ -155,19 +155,19 @@ protected override void InitializeDerivedDataSet() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override bool ShouldSerializeTables() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override bool ShouldSerializeRelations() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) { if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) { this.Reset(); @@ -195,7 +195,7 @@ protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() { global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(); this.WriteXmlSchema(new global::System.Xml.XmlTextWriter(stream, null)); @@ -204,13 +204,13 @@ protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal void InitVars() { this.InitVars(true); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal void InitVars(bool initTable) { this.tableNodesTable = ((NodesTableDataTable)(base.Tables["NodesTable"])); if ((initTable == true)) { @@ -230,7 +230,7 @@ internal void InitVars(bool initTable) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitClass() { this.DataSetName = "AddressSpace"; this.Prefix = ""; @@ -279,19 +279,19 @@ private void InitClass() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private bool ShouldSerializeNodesTable() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private bool ShouldSerializeReferencesTable() { return false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) { this.InitVars(); @@ -299,7 +299,7 @@ private void SchemaChanged(object sender, global::System.ComponentModel.Collecti } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) { AddressSpace ds = new AddressSpace(); global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); @@ -345,10 +345,10 @@ private void SchemaChanged(object sender, global::System.ComponentModel.Collecti return type; } - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public delegate void NodesTableRowChangeEventHandler(object sender, NodesTableRowChangeEvent e); - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public delegate void ReferencesTableRowChangeEventHandler(object sender, ReferencesTableRowChangeEvent e); /// @@ -363,7 +363,7 @@ public partial class NodesTableDataTable : global::System.Data.TypedTableBase ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public class NodesTableRowChangeEvent : global::System.EventArgs { private NodesTableRow eventRow; @@ -1151,14 +1151,14 @@ public class NodesTableRowChangeEvent : global::System.EventArgs { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public NodesTableRowChangeEvent(NodesTableRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public NodesTableRow Row { get { return this.eventRow; @@ -1166,7 +1166,7 @@ public NodesTableRow Row { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; @@ -1177,7 +1177,7 @@ public NodesTableRow Row { /// ///Row event argument class /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public class ReferencesTableRowChangeEvent : global::System.EventArgs { private ReferencesTableRow eventRow; @@ -1185,14 +1185,14 @@ public class ReferencesTableRowChangeEvent : global::System.EventArgs { private global::System.Data.DataRowAction eventAction; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public ReferencesTableRowChangeEvent(ReferencesTableRow row, global::System.Data.DataRowAction action) { this.eventRow = row; this.eventAction = action; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public ReferencesTableRow Row { get { return this.eventRow; @@ -1200,7 +1200,7 @@ public ReferencesTableRow Row { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataRowAction Action { get { return this.eventAction; diff --git a/ModelDesigner.DesignStudio/Wrappers/AddressSpaceDictionary/AddressSpace.cs b/ModelDesigner.DesignStudio/Wrappers/AddressSpaceDictionary/AddressSpace.cs index e105730a..793cf77d 100644 --- a/ModelDesigner.DesignStudio/Wrappers/AddressSpaceDictionary/AddressSpace.cs +++ b/ModelDesigner.DesignStudio/Wrappers/AddressSpaceDictionary/AddressSpace.cs @@ -1,34 +1,12 @@ -// -// Title : Address space created from the Information Model -// System : Microsoft Visual C# .NET 2008 -// $LastChangedDate$ -// $Rev$ -// $LastChangedBy$ -// $URL$ -// $Id$ +//___________________________________________________________________________________ // -// Copyright (C)2010, CAS LODZ POLAND. -// TEL: +48 (42) 686 25 47 -// mailto://techsupp@cas.eu -// http://www.cas.eu -// - -using CAS.UA.Common; -using CAS.UA.Model.Designer.Wrappers4ProperyGrid; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Xml; +// Copyright (C) 2020, Mariusz Postol LODZ POLAND. +// +// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI +//___________________________________________________________________________________ -namespace CAS.UA.Model.Designer.Wrappers.AddressSpaceDictionary -{ -} namespace CAS.UA.Model.Designer.Wrappers.AddressSpaceDictionary { } -namespace CAS.UA.Model.Designer.Wrappers.AddressSpaceDictionary -{ - -} diff --git a/ModelDesigner.DesignStudio/Wrappers/WrapperResources.Designer.cs b/ModelDesigner.DesignStudio/Wrappers/WrapperResources.Designer.cs index e2b508ea..2fee8866 100644 --- a/ModelDesigner.DesignStudio/Wrappers/WrapperResources.Designer.cs +++ b/ModelDesigner.DesignStudio/Wrappers/WrapperResources.Designer.cs @@ -19,7 +19,7 @@ namespace CAS.UA.Model.Designer.Wrappers { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class WrapperResources { diff --git a/ModelDesigner.DesignStudio/app.config b/ModelDesigner.DesignStudio/app.config index b67156b1..ae486e55 100644 --- a/ModelDesigner.DesignStudio/app.config +++ b/ModelDesigner.DesignStudio/app.config @@ -1,15 +1,15 @@ - + -
+
-
+
- + @@ -102,131 +102,131 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - + - + - - + +