Update for 1.05.03

OPCFoundation · Dec 12, 2023 · 5399dad · 5399dad
1 parent 02eb6cb
commit 5399dad
Show file tree

Hide file tree

Showing 16 changed files with 87 additions and 24 deletions.
diff --git a/BuildEngineeringUnits.bat b/BuildEngineeringUnits.bat
@@ -7,7 +7,7 @@ REM ****************************************************************************
 SETLOCAL
 
 set ROOT=%~dp0
-set MODELCOMPILER=%ROOT%build\bin\Release\net6.0\Opc.Ua.ModelCompiler.exe
+set MODELCOMPILER=%ROOT%build\bin\Release\net8.0\Opc.Ua.ModelCompiler.exe
 set OUTPUT=%ROOT%..\nodesets
 set INPUT=%ROOT%Opc.Ua.ModelCompiler\CSVs
 set EXCLUDE=-exclude nothing

diff --git a/BuildStandardTypes.bat b/BuildStandardTypes.bat
@@ -2,7 +2,7 @@
 SETLOCAL
 
 set ROOT=%~dp0
-set MODELCOMPILER=%ROOT%build\bin\Release\net6.0\Opc.Ua.ModelCompiler.exe
+set MODELCOMPILER=%ROOT%build\bin\Release\net8.0\Opc.Ua.ModelCompiler.exe
 set OUTPUT=%ROOT%..\nodesets
 set INPUT=%ROOT%Opc.Ua.ModelCompiler\Design
 set CSVINPUT=%ROOT%Opc.Ua.ModelCompiler\CSVs

diff --git a/CompileNodeSets.bat b/CompileNodeSets.bat
@@ -6,7 +6,7 @@ IF "%2"=="" (goto :usage)
 IF "%3"=="" (goto :usage)
 
 set ROOT=%~dp0
-set MODELCOMPILER=%ROOT%build\bin\Release\net6.0\Opc.Ua.ModelCompiler.exe
+set MODELCOMPILER=%ROOT%build\bin\Release\net8.0\Opc.Ua.ModelCompiler.exe
 set NODESETS=%1
 set OUTPUT=%2
 set TARGET=-uri %3

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /source
 
 # copy csproj and restore as distinct layers
@@ -7,10 +7,10 @@ RUN dotnet restore "ModelCompiler Solution.sln"
 
 # copy and publish app and libraries
 COPY . .
-RUN dotnet publish "ModelCompiler Solution.sln" -f net6.0 -c Release -o /app 
+RUN dotnet publish "ModelCompiler Solution.sln" -f net8.0 -c Release -o /app 
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/runtime:6.0
+FROM mcr.microsoft.com/dotnet/runtime:8.0
 WORKDIR /app
 COPY --from=build /app .
 ENTRYPOINT ["dotnet", "/app/Opc.Ua.ModelCompiler.dll"]
diff --git a/Opc.Ua.ModelCompiler/ModelGenerator2.cs b/Opc.Ua.ModelCompiler/ModelGenerator2.cs
@@ -861,7 +861,7 @@ private Stream GetNodeSet2Schema()
                 }
             }
 
-            throw new InvalidOperationException("Could not UANodeSet.xsd in assembly."); 
+            throw new InvalidOperationException("Could not find UANodeSet.xsd in assembly."); 
         }
 
         static void ValidationEventHandler(object sender, ValidationEventArgs e)

diff --git a/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.Debug.csproj b/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.Debug.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
     <AssemblyName>Opc.Ua.ModelCompiler</AssemblyName>
     <RootNamespace>ModelCompiler</RootNamespace>
-    <VersionSuffix>2.2.$([System.DateTime]::UtcNow.ToString(yyMM)).$([System.DateTime]::UtcNow.ToString(ddmm))</VersionSuffix>
+    <VersionSuffix>2.3.$([System.DateTime]::UtcNow.ToString(yyMM)).$([System.DateTime]::UtcNow.ToString(ddmm))</VersionSuffix>
     <AssemblyVersion Condition=" '$(VersionSuffix)' == '' ">0.0.0.1</AssemblyVersion>
     <AssemblyVersion Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</AssemblyVersion>
     <Version Condition=" '$(VersionSuffix)' == '' ">0.0.1.0</Version>
@@ -122,9 +122,16 @@
   <ItemGroup>
     <None Remove="CSVs\Attributes.csv" />
     <None Remove="CSVs\DemoModel.csv" />
+    <None Remove="CSVs\MDIS.csv" />
+    <None Remove="CSVs\MTConnectModel.csv" />
     <None Remove="CSVs\OpcUaAdiModel.csv" />
+    <None Remove="CSVs\OpcUaDiModel.csv" />
+    <None Remove="CSVs\OpcUaFdiPart5Model.csv" />
+    <None Remove="CSVs\OpcUaFdiPart7Model.csv" />
     <None Remove="CSVs\OpcUaGdsModel.csv" />
+    <None Remove="CSVs\OpcUaNodeSetModel.csv" />
     <None Remove="CSVs\OpcUaPLCopenModel.csv" />
+    <None Remove="CSVs\OpcUaProvisioningModel.csv" />
     <None Remove="CSVs\rec20_latest_a1.csv" />
     <None Remove="CSVs\rec20_latest_a2-3.csv" />
     <None Remove="CSVs\rec20_Rev15e-2020.xls" />
@@ -134,7 +141,13 @@
     <None Remove="CSVs\Status Codes.csv" />
     <None Remove="CSVs\UNECE_to_OPCUA.csv" />
     <None Remove="Design.v103\BuiltInTypes.xml" />
+    <None Remove="Design.v103\MDIS.xml" />
+    <None Remove="Design.v103\MTConnectModel.xml" />
     <None Remove="Design.v103\OpcUaAdiModel.xml" />
+    <None Remove="Design.v103\OpcUaDiModel.csv" />
+    <None Remove="Design.v103\OpcUaDiModel.xml" />
+    <None Remove="Design.v103\OpcUaFdiPart5Model.xml" />
+    <None Remove="Design.v103\OpcUaFdiPart7Model.xml" />
     <None Remove="Design.v103\OpcUaGdsModel.csv" />
     <None Remove="Design.v103\OpcUaGdsModel.xml" />
     <None Remove="Design.v103\OpcUaPLCopenModel.xml" />
@@ -149,7 +162,12 @@
     <None Remove="Design.v103\UA Status Codes.xml" />
     <None Remove="Design.v104\BuiltInTypes.xml" />
     <None Remove="Design.v104\DemoModel.xml" />
+    <None Remove="Design.v104\MDIS.xml" />
+    <None Remove="Design.v104\MTConnectModel.xml" />
     <None Remove="Design.v104\OpcUaAdiModel.xml" />
+    <None Remove="Design.v104\OpcUaDiModel.xml" />
+    <None Remove="Design.v104\OpcUaFdiPart5Model.xml" />
+    <None Remove="Design.v104\OpcUaFdiPart7Model.xml" />
     <None Remove="Design.v104\OpcUaGdsModel.xml" />
     <None Remove="Design.v104\OpcUaPLCopenModel.xml" />
     <None Remove="Design.v104\SercosModel.xml" />
@@ -161,6 +179,7 @@
     <None Remove="Design.v105\DemoModel.xml" />
     <None Remove="Design.v105\I4AAS.IRDI.xml" />
     <None Remove="Design.v105\I4AAS.Submodels.xml" />
+    <None Remove="Design.v105\OpcUaDiModel.xml" />
     <None Remove="Design.v105\OpcUaGdsModel.xml" />
     <None Remove="Design.v105\OpcUaNodeSetModel.xml" />
     <None Remove="Design.v105\OpcUaProvisioningModel.xml" />
@@ -258,9 +277,16 @@
 
   <ItemGroup>
     <EmbeddedResource Include="CSVs\DemoModel.csv" />
+    <EmbeddedResource Include="CSVs\MDIS.csv" />
+    <EmbeddedResource Include="CSVs\MTConnectModel.csv" />
     <EmbeddedResource Include="CSVs\OpcUaAdiModel.csv" />
+    <EmbeddedResource Include="CSVs\OpcUaDiModel.csv" />
+    <EmbeddedResource Include="CSVs\OpcUaFdiPart5Model.csv" />
+    <EmbeddedResource Include="CSVs\OpcUaFdiPart7Model.csv" />
     <EmbeddedResource Include="CSVs\OpcUaGdsModel.csv" />
+    <EmbeddedResource Include="CSVs\OpcUaNodeSetModel.csv" />
     <EmbeddedResource Include="CSVs\OpcUaPLCopenModel.csv" />
+    <EmbeddedResource Include="CSVs\OpcUaProvisioningModel.csv" />
     <EmbeddedResource Include="CSVs\rec20_latest_a1.csv" />
     <EmbeddedResource Include="CSVs\rec20_latest_a2-3.csv" />
     <EmbeddedResource Include="CSVs\SercosModel.csv" />
@@ -270,7 +296,13 @@
     <EmbeddedResource Include="CSVs\Status Codes.csv" />
     <EmbeddedResource Include="CSVs\UNECE_to_OPCUA.csv" />
     <EmbeddedResource Include="Design.v103\BuiltInTypes.xml" />
+    <EmbeddedResource Include="Design.v103\MDIS.xml" />
+    <EmbeddedResource Include="Design.v103\MTConnectModel.xml" />
     <EmbeddedResource Include="Design.v103\OpcUaAdiModel.xml" />
+    <EmbeddedResource Include="Design.v103\OpcUaDiModel.csv" />
+    <EmbeddedResource Include="Design.v103\OpcUaDiModel.xml" />
+    <EmbeddedResource Include="Design.v103\OpcUaFdiPart5Model.xml" />
+    <EmbeddedResource Include="Design.v103\OpcUaFdiPart7Model.xml" />
     <EmbeddedResource Include="Design.v103\OpcUaGdsModel.csv" />
     <EmbeddedResource Include="Design.v103\OpcUaGdsModel.xml" />
     <EmbeddedResource Include="Design.v103\OpcUaPLCopenModel.xml" />
@@ -285,16 +317,24 @@
     <EmbeddedResource Include="Design.v103\UA Status Codes.xml" />
     <EmbeddedResource Include="Design.v104\BuiltInTypes.xml" />
     <EmbeddedResource Include="Design.v104\DemoModel.xml" />
+    <EmbeddedResource Include="Design.v104\MDIS.xml" />
+    <EmbeddedResource Include="Design.v104\MTConnectModel.xml" />
     <EmbeddedResource Include="Design.v104\OpcUaAdiModel.xml" />
+    <EmbeddedResource Include="Design.v104\OpcUaDiModel.xml" />
+    <EmbeddedResource Include="Design.v104\OpcUaFdiPart5Model.xml" />
+    <EmbeddedResource Include="Design.v104\OpcUaFdiPart7Model.xml" />
     <EmbeddedResource Include="Design.v104\OpcUaGdsModel.xml" />
     <EmbeddedResource Include="Design.v104\OpcUaPLCopenModel.xml" />
     <EmbeddedResource Include="Design.v104\SercosModel.xml" />
     <EmbeddedResource Include="Design.v104\StandardTypes.xml" />
     <EmbeddedResource Include="Design.v104\UA Attributes.xml" />
     <EmbeddedResource Include="Design.v104\UA Core Services.xml" />
     <EmbeddedResource Include="Design.v104\UA Status Codes.xml" />
+    <EmbeddedResource Include="Design.v105\I4AAS.IRDI.xml" />
     <EmbeddedResource Include="Design.v105\BuiltInTypes.xml" />
+    <EmbeddedResource Include="Design.v105\I4AAS.Submodels.xml" />
     <EmbeddedResource Include="Design.v105\DemoModel.xml" />
+    <EmbeddedResource Include="Design.v105\OpcUaDiModel.xml" />
     <EmbeddedResource Include="Design.v105\OpcUaGdsModel.xml" />
     <EmbeddedResource Include="Design.v105\OpcUaNodeSetModel.xml" />
     <EmbeddedResource Include="Design.v105\StandardTypes.xml" />

diff --git a/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.csproj b/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
@@ -68,6 +68,12 @@
     <OutputPath>$(SolutionDir)build\bin\$(Configuration)\</OutputPath>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Protobuf\**" />
+    <EmbeddedResource Remove="Protobuf\**" />
+    <None Remove="Protobuf\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Remove="ExceptionDlg.cs" />
     <Compile Remove="ExceptionDlg.Designer.cs" />
@@ -302,6 +308,7 @@
     <None Remove="Templates\XmlSchema\File.xml" />
     <None Remove="Templates\XmlSchema\SimpleType.xml" />
     <None Remove="Templates\XmlSchema\Union.xml" />
+    <None Remove="UANodeSet.xsd" />
   </ItemGroup>
 
   <ItemGroup>
@@ -312,16 +319,29 @@
 
   <ItemGroup>
     <EmbeddedResource Include="CSVs\DemoModel.csv" />
+    <EmbeddedResource Include="CSVs\MDIS.csv" />
+    <EmbeddedResource Include="CSVs\MTConnectModel.csv" />
     <EmbeddedResource Include="CSVs\OpcUaAdiModel.csv" />
+    <EmbeddedResource Include="CSVs\OpcUaDiModel.csv" />
+    <EmbeddedResource Include="CSVs\OpcUaFdiPart5Model.csv" />
+    <EmbeddedResource Include="CSVs\OpcUaFdiPart7Model.csv" />
     <EmbeddedResource Include="CSVs\OpcUaGdsModel.csv" />
+    <EmbeddedResource Include="CSVs\OpcUaNodeSetModel.csv" />
     <EmbeddedResource Include="CSVs\OpcUaPLCopenModel.csv" />
+    <EmbeddedResource Include="CSVs\OpcUaProvisioningModel.csv" />
     <EmbeddedResource Include="CSVs\rec20_latest_a1.csv" />
     <EmbeddedResource Include="CSVs\rec20_latest_a2-3.csv" />
     <EmbeddedResource Include="CSVs\SercosModel.csv" />
     <EmbeddedResource Include="CSVs\StandardTypes.csv" />
     <EmbeddedResource Include="CSVs\UNECE_to_OPCUA.csv" />
     <EmbeddedResource Include="Design.v103\BuiltInTypes.xml" />
+    <EmbeddedResource Include="Design.v103\MDIS.xml" />
+    <EmbeddedResource Include="Design.v103\MTConnectModel.xml" />
     <EmbeddedResource Include="Design.v103\OpcUaAdiModel.xml" />
+    <EmbeddedResource Include="Design.v103\OpcUaDiModel.csv" />
+    <EmbeddedResource Include="Design.v103\OpcUaDiModel.xml" />
+    <EmbeddedResource Include="Design.v103\OpcUaFdiPart5Model.xml" />
+    <EmbeddedResource Include="Design.v103\OpcUaFdiPart7Model.xml" />
     <EmbeddedResource Include="Design.v103\OpcUaGdsModel.csv" />
     <EmbeddedResource Include="Design.v103\OpcUaGdsModel.xml" />
     <EmbeddedResource Include="Design.v103\OpcUaPLCopenModel.xml" />
@@ -336,7 +356,12 @@
     <EmbeddedResource Include="Design.v103\UA Status Codes.xml" />
     <EmbeddedResource Include="Design.v104\BuiltInTypes.xml" />
     <EmbeddedResource Include="Design.v104\DemoModel.xml" />
+    <EmbeddedResource Include="Design.v104\MDIS.xml" />
+    <EmbeddedResource Include="Design.v104\MTConnectModel.xml" />
     <EmbeddedResource Include="Design.v104\OpcUaAdiModel.xml" />
+    <EmbeddedResource Include="Design.v104\OpcUaDiModel.xml" />
+    <EmbeddedResource Include="Design.v104\OpcUaFdiPart5Model.xml" />
+    <EmbeddedResource Include="Design.v104\OpcUaFdiPart7Model.xml" />
     <EmbeddedResource Include="Design.v104\OpcUaGdsModel.xml" />
     <EmbeddedResource Include="Design.v104\OpcUaPLCopenModel.xml" />
     <EmbeddedResource Include="Design.v104\SercosModel.xml" />
@@ -346,6 +371,7 @@
     <EmbeddedResource Include="Design.v104\UA Status Codes.xml" />
     <EmbeddedResource Include="Design.v105\BuiltInTypes.xml" />
     <EmbeddedResource Include="Design.v105\DemoModel.xml" />
+    <EmbeddedResource Include="Design.v105\OpcUaDiModel.xml" />
     <EmbeddedResource Include="Design.v105\OpcUaGdsModel.xml" />
     <EmbeddedResource Include="Design.v105\OpcUaNodeSetModel.xml" />
     <EmbeddedResource Include="Design.v105\StandardTypes.xml" />
@@ -500,6 +526,7 @@
     <EmbeddedResource Include="Templates\XmlSchema\File.xml" />
     <EmbeddedResource Include="Templates\XmlSchema\SimpleType.xml" />
     <EmbeddedResource Include="Templates\XmlSchema\Union.xml" />
+    <EmbeddedResource Include="UANodeSet.xsd" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Opc.Ua.ModelCompiler/UANodeSet.xsd b/Opc.Ua.ModelCompiler/UANodeSet.xsd
@@ -177,9 +177,7 @@
   </xs:complexType>
 
   <xs:simpleType name="ModelVersion">
-    <xs:restriction base="xs:token">
-      <xs:pattern value="^(0|[1-9]+[0-9]*)\.(0|[1-9]+[0-9]*)\.(0|[1-9]+[0-9]*)(-(0|[1-9A-Za-z-][0-9A-Za-z-]*)(\.[0-9A-Za-z-]+)*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$" />
-    </xs:restriction>
+    <xs:restriction base="xs:string" />
   </xs:simpleType>
 
   <xs:simpleType name="NodeId">

diff --git a/PublishModel.bat b/PublishModel.bat
@@ -2,7 +2,7 @@
 SETLOCAL
 
 set ROOT=%~dp0
-set MODELCOMPILER=%ROOT%build\bin\Release\net6.0\Opc.Ua.ModelCompiler.exe
+set MODELCOMPILER=%ROOT%build\bin\Release\net8.0\Opc.Ua.ModelCompiler.exe
 set SOURCE=%1
 set TARGET=%2
 set OUTPUT=%ROOT%..\nodesets

diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ Opc.Ua.ModelCompiler compile-nodesets -input .\v105\ -o2 .\Tests -uri http://opc
 |2.0|Intial release with version tracking and .NET 5.0 support.|
 |2.1|Added UA 1.05.00 support.<br/>Switched to Microsoft.Extensions.CommandLineUtils.<br/>Arguments are the same, however, the command 'compile' must be specified.<br/>Use --help for more details.<br/>Fixed bug in generating the 'uanodes' input for the .NET codebase.|
 |2.2|Added UA 1.05.02 support.<br/>Added support for NodeSet2 input format.<br/>Added DisplayName to enumeration fields.<br/>Add Union/OptionalFields Support.<br/>Add IJsonEncodeable interface.<br/>Remove unnecessary descriptions in autogenerated code.<br/>Add -compile-nodesets command|
-|2.3|Fixed numerous issues where the generated code was not correct.|
+|2.3|Added UA 1.05.03 support.<br/>Numerous fixes needed for 1.05.03.<br/>Upgrade to .NET 8.0.<br/>Generate constants in TypeScript.| 
 
 The executable file version has the form 2.0.YYMM.DDHH where the last two fields are based on the time that it was built.
 
@@ -105,7 +105,7 @@ The public repository is updated as frequently as the OPC UA Specification (once
 
 ## License Model ##
 
-The ModelCompiler code is [MIT license](https://github.com/OPCFoundation/UA-ModelCompiler/blob/master/license.md), however, it links to the UA-.NETStandard NuGet packages which is covered under the [OPC Foundation Redistributables licence](https://opcfoundation.org/license/redistributables/1.3/index.html). If a user chooses the version that links directly to the  UA-.NETStandard submodule then the license the UA-.NETStandard [dual license](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/LICENSE.txt) applies. 
+The ModelCompiler code is [MIT license](https://github.com/OPCFoundation/UA-ModelCompiler/blob/master/license.md), however, it links to the UA-.NETStandard NuGet packages which is covered under the [OPC Foundation Redistributables licence](https://opcfoundation.org/license/redistributables/1.3/index.html). 
 
 ## Docker Build
 

diff --git a/Schemas/UANodeSet.xsd b/Schemas/UANodeSet.xsd
@@ -177,9 +177,7 @@
   </xs:complexType>
 
   <xs:simpleType name="ModelVersion">
-    <xs:restriction base="xs:token">
-      <xs:pattern value="^(0|[1-9]+[0-9]*)\.(0|[1-9]+[0-9]*)\.(0|[1-9]+[0-9]*)(-(0|[1-9A-Za-z-][0-9A-Za-z-]*)(\.[0-9A-Za-z-]+)*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$" />
-    </xs:restriction>
+    <xs:restriction base="xs:string" />
   </xs:simpleType>
 
   <xs:simpleType name="NodeId">

diff --git a/Stack b/Stack
diff --git a/Tests/DemoModel/BuildModel.bat b/Tests/DemoModel/BuildModel.bat
@@ -1,7 +1,7 @@
 @ECHO off
 SETLOCAL
 
-set MODELCOMPILER=..\..\..\build\bin\Release\net6.0\Opc.Ua.ModelCompiler.exe
+set MODELCOMPILER=..\..\..\build\bin\Release\net8.0\Opc.Ua.ModelCompiler.exe
 set MODEL=DemoModel
 set VERSION=v105
 set EXCLUDE=Draft

diff --git a/Tests/DemoModel/DemoModel.Debug.csproj b/Tests/DemoModel/DemoModel.Debug.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>DemoModel</AssemblyName>
     <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
     <RootNamespace>DemoModel</RootNamespace>

diff --git a/Tests/DemoModel/DemoModel.csproj b/Tests/DemoModel/DemoModel.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>DemoModel</AssemblyName>
     <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
     <RootNamespace>DemoModel</RootNamespace>

diff --git a/UpdateLicense.bat b/UpdateLicense.bat
@@ -2,7 +2,7 @@
 SETLOCAL
 
 set ROOT=%~dp0
-set MODELCOMPILER=%ROOT%build\bin\Release\net6.0\Opc.Ua.ModelCompiler.exe
+set MODELCOMPILER=%ROOT%build\bin\Release\net8.0\Opc.Ua.ModelCompiler.exe
 set OUTPUT=%1
 
 "%MODELCOMPILER%" update-headers -input %OUTPUT% -pattern *.xml -license MITXML -silent
-Original file line number
+Diff line change
@@ Expand Up / @@ -861,7 +861,7 @@ private Stream GetNodeSet2Schema() @@
                     }
                 }
-                throw new InvalidOperationException("Could not UANodeSet.xsd in assembly.");
+                throw new InvalidOperationException("Could not find UANodeSet.xsd in assembly.");
             }
             static void ValidationEventHandler(object sender, ValidationEventArgs e)
@@ Expand Down @@
+2 −0		Stack/Opc.Ua.Core/Schema/Opc.Ua.NodeSet2.xml
+1 −1		Stack/Opc.Ua.Core/Schema/UANodeSet.cs
+1 −3		Stack/Opc.Ua.Core/Schema/UANodeSet.xsd