Update models to harmonize with current UA-ModelCompiler release #655

- New version: 6.5.3-Mike
mpostol · Apr 6, 2022 · cd43652 · cd43652
1 parent 45ff5bd
commit cd43652
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 18 deletions.
diff --git a/CommonResources/T4Definitions/Model.t4 b/CommonResources/T4Definitions/Model.t4
@@ -11,8 +11,8 @@ string Url = "https://github.com/mpostol/OPC-UA-OOI";
 string Email = "[email protected]";
 string Phone = "+48 608 619 899";
 string Owner = "Mariusz Postol";
-string RepositoryVersion = "6.5.0"; //increment on the same position as the group version
-string RepositoryVersionPrerelease = "-Kilo"; //increment on the same position as the group version
+string RepositoryVersion = "6.5.3"; //increment on the same position as the group version
+string RepositoryVersionPrerelease = "-Mike"; //increment on the same position as the group version
 string Authors = "Mariusz Postol";
 string IconURLTag = "https://github.com/mpostol/OPC-UA-OOI/blob/master/CommonResources/Media/Logo64.PNG?raw=true";
 
@@ -27,17 +27,17 @@ string DataDiscoveryPrerelease = "";
 string DataDiscoveryProduct = "Object Oriented Internet";
 
 //UAOOI.SemanticData
-string SemanticDataVersion = "6.5.0";
-string SemanticDataPrerelease = "-Kilo";
+string SemanticDataVersion = "6.5.3";
+string SemanticDataPrerelease = "-Mike";
 string SemanticDataProduct = "Object Oriented Internet";
 
 //UAOOI.SemanticData.UANodeSetValidation
-string SemanticDataUANodeSetValidationVersion = "6.5.0";
-string SemanticDataUANodeSetValidationPrerelease = "-Kilo";
+string SemanticDataUANodeSetValidationVersion = "6.5.3";
+string SemanticDataUANodeSetValidationPrerelease = "-https://github.com/mpostol/OPC-UA-OOI.git";
 
 //UAOOI.SemanticData.UAModelDesignExport
-string SemanticDataUAModelDesignExportVersion = "6.5.0";
-string SemanticDataUAModelDesignExportPrerelease = "-Kilo";
+string SemanticDataUAModelDesignExportVersion = "6.5.3";
+string SemanticDataUAModelDesignExportPrerelease = "-Mike";
 
 //UAOOI.Configuration
 string ConfigurationVersion = "6.4.8";

diff --git a/Networking/ReferenceApplication/ReadMe.txt b/Networking/ReferenceApplication/ReadMe.txt
@@ -8,7 +8,7 @@ Assembly Product:       Object Oriented Internet
 Assembly Copyright:     Copyright (C) 2022 Mariusz Postol LODZ POLAND
 Assembly Trademark:     Object Oriented Internet
 Assembly Version:       4.0.1
-Assembly Date:          09.03.2022
+Assembly Date:          06.04.2022
 
 The main changes and new functionalities are listed below:
 

diff --git a/SemanticData/AddressSpaceComplianceTestTool/Properties/AssemblyInfo.cs b/SemanticData/AddressSpaceComplianceTestTool/Properties/AssemblyInfo.cs
@@ -21,8 +21,8 @@
 [assembly: AssemblyTrademark("Object Oriented Internet")]
 [assembly: AssemblyCulture("")]
 [assembly: Guid("157926b5-f6a5-4496-84c2-f5f9dae937ae")]
-[assembly: AssemblyVersion("6.5.0.*")]
-[assembly: AssemblyFileVersion("6.5.0")]
+[assembly: AssemblyVersion("6.5.3.*")]
+[assembly: AssemblyFileVersion("6.5.3")]
 [assembly: InternalsVisibleToAttribute("AddressSpaceComplianceTestToolUnitTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001005b97a0972ff6b1" +
                                                                                           "3a8a9ff9c09503aea0e5e2fe29cb2275a0c0942182f4c3431814b6bc9a556d9fe0d7e7823439c1" +
                                                                                           "ba28521f6318e4c936c4461604ef668e9686c2021571b093e1bfba071b373bc56a07a3afdc120c" +

diff --git a/SemanticData/BuildingErrorsHandling/Properties/SemanticData.BuildingErrorsHandling.nuspec b/SemanticData/BuildingErrorsHandling/Properties/SemanticData.BuildingErrorsHandling.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>UAOOI.SemanticData.BuildingErrorsHandling</id>
-    <version>6.5.0-Kilo
+    <version>6.5.3-Mike
     </version>
     <title>Object Oriented Internet Common Infrastructure</title>
     <authors>Mariusz Postol</authors>

diff --git a/SemanticData/Tests/AddressSpaceComplianceTestToolUnitTests/Properties/AssemblyInfo.cs b/SemanticData/Tests/AddressSpaceComplianceTestToolUnitTests/Properties/AssemblyInfo.cs
@@ -22,6 +22,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("f0e97198-9cea-4cb8-a0b2-61eeca42eeca")]
-[assembly: AssemblyVersion("6.5.0.*")]
-[assembly: AssemblyFileVersion("6.5.0")]
+[assembly: AssemblyVersion("6.5.3.*")]
+[assembly: AssemblyFileVersion("6.5.3")]
 
diff --git a/SemanticData/Tests/USNodeSetValidationUnitTestProject/Properties/AssemblyInfo.cs b/SemanticData/Tests/USNodeSetValidationUnitTestProject/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("deea592b-285a-47db-afbc-b1e2efac8ab3")]
-[assembly: AssemblyVersion("6.5.0.*")]
-[assembly: AssemblyFileVersion("6.5.0")]
+[assembly: AssemblyVersion("6.5.3.*")]
+[assembly: AssemblyFileVersion("6.5.3")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 
diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/DoRecoverModelDesign.cmd b/SemanticData/UAModelDesignExport.UnitTest/Models/DoRecoverModelDesign.cmd
@@ -0,0 +1,26 @@
+:: Recovering ModelDesign from UANodeSet OPC UA Model Information
+:: %1 - location of the asp.exe 
+
+del %1\asp.log  /q
+del %1\asp.warnings.log /q
+%1\asp "XMLModels\DataTypeTest.NodeSet2.xml" -e "XMLModels\DataTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/DataTypeTest"
+xcopy %1\asp.log ReferenceTest.asp.log /y
+xcopy %1\asp.warnings.log ReferenceTest.asp.warnings.log /y /i
+
+del %1\asp.log  /q
+del %1\asp.warnings.log /q
+%1\asp "XMLModels\ObjectTypeTest.NodeSet2.xml" -e "XMLModels\ObjectTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest"
+xcopy %1\asp.log ReferenceTest.asp.log /y
+xcopy %1\asp.warnings.log ReferenceTest.asp.warnings.log /y /i
+
+del %1\asp.log  /q
+del %1\asp.warnings.log /q
+%1\asp "XMLModels\ReferenceTest.NodeSet2.xml" -e "XMLModels\ReferenceTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/ReferenceTest"
+xcopy %1\ReferenceTest.asp.log asp.log /y
+xcopy %1\asp.warnings.log .\ReferenceTest.asp.warnings.log /y /i
+
+del %1\asp.log  /q
+del %1\asp.warnings.log /q
+%1\asp "XMLModels\VariableTypeTest.NodeSet2.xml" -e "XMLModels\VariableTypeTest.asp.xml" -s XMLstylesheet -n "http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest"
+xcopy %1\asp.log VariableTypeTest.asp.log /y
+xcopy %1\asp.warnings.log VariableTypeTest.asp.warnings.log /y /i
diff --git a/SemanticData/UAModelDesignExport/Properties/UAModelDesignExport.Nuget.nuspec b/SemanticData/UAModelDesignExport/Properties/UAModelDesignExport.Nuget.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>UAOOI.SemanticData.UAModelDesignExport</id>
-    <version>6.5.0-Kilo</version>
+    <version>6.5.3-Mike</version>
     <title>Semantic-Data UAModelDesign Export</title>
     <authors>Mariusz Postol</authors>
     <owners>Mariusz Postol</owners>

diff --git a/SemanticData/UANodeSetValidation/Properties/UANodeSetValidation.Nuget.nuspec b/SemanticData/UANodeSetValidation/Properties/UANodeSetValidation.Nuget.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>UAOOI.SemanticData.UANodeSetValidation</id>
-    <version>6.5.0-Kilo</version>
+    <version>6.5.3-https://github.com/mpostol/OPC-UA-OOI.git</version>
     <title>Semantic-Data UANodeSet Validation</title>
     <authors>Mariusz Postol</authors>
     <owners>Mariusz Postol</owners>