Sync with member-only repository.

Author: randy-armstrong

.dockerignore

@@ -1,2 +1 @@
 **/.git
-**/Test

.editorconfig

@@ -1,4 +1,4 @@
 [*.cs]
-
-# Default severity for analyzer diagnostics with category 'Globalization'
 dotnet_analyzer_diagnostic.category-Globalization.severity = none
+dotnet_diagnostic.CA5362.severity = none
+dotnet_diagnostic.CA1859.severity = none

.github/workflows/docker-image.yml

@@ -29,10 +29,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Set up .NET 9
+    - name: Set up .NET 8.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '9.x'
+        dotnet-version: '8.x'
 
     # Install the cosign tool except on PR
     # https://github.com/sigstore/cosign-installer
@@ -79,8 +79,8 @@ jobs:
     - name: Only use preview tag if no github tag info
       if: github.ref_type == 'branch'
       run: |
-        echo TAG_BRANCH= >> $GITHUB_ENV
-        echo TAG_LATEST=$(echo ${{ env.IMAGE_REPOSITORY }}:preview${{ env.IMAGE_BRANCH }}) >> $GITHUB_ENV
+        echo TAG_BRANCH=$(echo ${{ env.IMAGE_REPOSITORY }}:preview${{ env.IMAGE_BRANCH }}) >> $GITHUB_ENV
+        echo TAG_LATEST=$(echo ,${{ env.IMAGE_REPOSITORY }}:latest${{ env.IMAGE_BRANCH }}) >> $GITHUB_ENV
 
     # Extract metadata (tags, labels) for Docker
     # https://github.com/docker/metadata-action
@@ -101,6 +101,7 @@ jobs:
         tags: ${{ env.TAG_BRANCH }} ${{ env.TAG_LATEST }}
         platforms: linux/amd64
         file: ./Dockerfile
+        provenance: false
         labels: ${{ steps.meta.outputs.labels }}
         cache-from: type=gha
         cache-to: type=gha,mode=max

.github/workflows/dotnet.yml

@@ -18,21 +18,22 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
+        token: ${{ secrets.DOCKER_UPLOAD }}
         fetch-depth: 0
         submodules: true
 
-    - name: Set up .NET 9
-      uses: actions/setup-dotnet@v3
+    - name: Set up .NET 8.0
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '9.x'
+        dotnet-version: '8.x'
 
     - name: Restore dependencies
-      run: dotnet restore "ModelCompiler.sln" 
+      run: dotnet restore "ModelCompiler.slnx"
 
     - name: Build
-      run: dotnet build --no-restore --configuration Docker "ModelCompiler.sln" 
+      run: dotnet build --no-restore --configuration Docker "ModelCompiler.slnx" 
 
 
 

.gitignore

@@ -23,8 +23,6 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
-/Published
-/publish
 
 # Visual Studio 2015 cache/options directory
 .vs/

BuildStandardTypes.bat

@@ -103,7 +103,6 @@ MOVE /Y "%OUTPUT%\Schema\Opc.Ua.DataTypes.cs" "%OUTPUT%\DotNet\Opc.Ua.DataTypes.
 MOVE /Y "%OUTPUT%\Schema\Opc.Ua.PredefinedNodes.cs" "%OUTPUT%\DotNet\Opc.Ua.PredefinedNodes.cs"
 MOVE /Y "%OUTPUT%\Schema\Opc.Ua.PredefinedNodes.uanodes" "%OUTPUT%\DotNet\Opc.Ua.PredefinedNodes.uanodes"
 MOVE /Y "%OUTPUT%\Schema\Opc.Ua.PredefinedNodes.xml" "%OUTPUT%\DotNet\Opc.Ua.PredefinedNodes.xml"
-MOVE /Y "%OUTPUT%\Schema\Opc.Ua.NodeSet.xml" "%OUTPUT%\DotNet\Opc.Ua.NodeSet.xml"
 MOVE /Y "%OUTPUT%\DotNet\Opc.Ua.Services.wsdl" "%OUTPUT%\Schema\Opc.Ua.Services.wsdl"
 MOVE /Y "%OUTPUT%\DotNet\Opc.Ua.Endpoints.wsdl" "%OUTPUT%\Schema\Opc.Ua.Endpoints.wsdl"
 @ECHO OFF
@@ -152,22 +151,22 @@ IF "%DOTNET_TARGET%" NEQ "" (
 	ECHO Copying .NET code to %DOTNET_TARGET%
 
 	COPY "%OUTPUT%\Schema\NodeIds.csv" "%DOTNET_TARGET%\Schema\NodeIds.csv"
-	COPY "%OUTPUT%\Schema\AttributeIds.csv" "%DOTNET_TARGET%\Schema\AttributeIds.csv"
-	COPY "%OUTPUT%\Schema\ServerCapabilities.csv" "%DOTNET_TARGET%\Schema\ServerCapabilities.csv"
-	COPY "%OUTPUT%\Schema\StatusCode.csv" "%DOTNET_TARGET%\Schema\Opc.Ua.StatusCodes.csv"
-	COPY "%SCHEMAINPUT%\UANodeSet.xsd" "%DOTNET_TARGET%\Schema\UANodeSet.xsd"
-	COPY "%SCHEMAINPUT%\SecuredApplication.xsd" "%DOTNET_TARGET%\Schema\SecuredApplication.xsd"
-	COPY "%SCHEMAINPUT%\OPCBinarySchema.xsd" "%DOTNET_TARGET%\Types\Schemas\OPCBinarySchema.xsd"
-
-	CD "%DOTNET_TARGET%\Schema\"
+	REM COPY "%OUTPUT%\Schema\AttributeIds.csv" "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\AttributeIds.csv"
+	REM COPY "%OUTPUT%\Schema\ServerCapabilities.csv" "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\ServerCapabilities.csv"
+	REM COPY "%OUTPUT%\Schema\StatusCode.csv" "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\Opc.Ua.StatusCodes.csv"
+	COPY "%SCHEMAINPUT%\UANodeSet.xsd" "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\UANodeSet.xsd"
+	REM COPY "%SCHEMAINPUT%\SecuredApplication.xsd" "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\SecuredApplication.xsd"
+	REM COPY "%SCHEMAINPUT%\OPCBinarySchema.xsd" "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\OPCBinarySchema.xsd"
+
+	CD "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\"
 	CALL BuildSchema
 	CD %~dp0
 
 	COPY "%OUTPUT%\Schema\Opc.Ua.NodeSet2.xml" "%DOTNET_TARGET%\Schema\Opc.Ua.NodeSet2.xml"
-	COPY "%OUTPUT%\Schema\Opc.Ua.Types.bsd" "%DOTNET_TARGET%\Schema\Opc.Ua.Types.bsd"
-	COPY "%OUTPUT%\Schema\Opc.Ua.Types.xsd" "%DOTNET_TARGET%\Schema\Opc.Ua.Types.xsd"
-	COPY "%OUTPUT%\Schema\Opc.Ua.Endpoints.wsdl" "%DOTNET_TARGET%\Schema\Opc.Ua.Endpoints.wsdl"
-	COPY "%OUTPUT%\Schema\Opc.Ua.Services.wsdl" "%DOTNET_TARGET%\Schema\Opc.Ua.Services.wsdl"
+	COPY "%OUTPUT%\Schema\Opc.Ua.Types.xsd" "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\Opc.Ua.Types.xsd"
+	REM COPY "%OUTPUT%\Schema\Opc.Ua.Types.bsd" "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\Opc.Ua.Types.bsd"
+	REM COPY "%OUTPUT%\Schema\Opc.Ua.Endpoints.wsdl" "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\Opc.Ua.Endpoints.wsdl"
+	REM COPY "%OUTPUT%\Schema\Opc.Ua.Services.wsdl" "%DOTNET_TARGET%\..\Opc.Ua.Types\Schema\Opc.Ua.Services.wsdl"
 	COPY "%OUTPUT%\DotNet\Opc.Ua.Channels.cs" "%DOTNET_TARGET%\Stack\Generated\Opc.Ua.Channels.cs"
 	COPY "%OUTPUT%\DotNet\Opc.Ua.Client.cs" "%DOTNET_TARGET%\Stack\Generated\Opc.Ua.Client.cs"
 	COPY "%OUTPUT%\DotNet\Opc.Ua.Endpoints.cs" "%DOTNET_TARGET%\Stack\Generated\Opc.Ua.Endpoints.cs"
@@ -179,7 +178,7 @@ IF "%DOTNET_TARGET%" NEQ "" (
 	COPY "%OUTPUT%\DotNet\Opc.Ua.Classes.cs" "%DOTNET_TARGET%\Stack\Generated\Opc.Ua.Classes.cs"
 	COPY "%OUTPUT%\DotNet\Opc.Ua.Constants.cs" "%DOTNET_TARGET%\Stack\Generated\Opc.Ua.Constants.cs"
 	COPY "%OUTPUT%\DotNet\Opc.Ua.DataTypes.cs" "%DOTNET_TARGET%\Stack\Generated\Opc.Ua.DataTypes.cs"
-	COPY "%OUTPUT%\DotNet\Opc.Ua.PredefinedNodes.cs" "%DOTNET_TARGET%\Stack\Generated\Opc.Ua.PredefinedNodes.cs"
+	REM COPY "%OUTPUT%\DotNet\Opc.Ua.PredefinedNodes.cs" "%DOTNET_TARGET%\Stack\Generated\Opc.Ua.PredefinedNodes.cs"
 	COPY "%OUTPUT%\DotNet\Opc.Ua.PredefinedNodes.uanodes" "%DOTNET_TARGET%\Stack\Generated\Opc.Ua.PredefinedNodes.uanodes"
 	COPY "%OUTPUT%\DotNet\Opc.Ua.PredefinedNodes.xml" "%DOTNET_TARGET%\Stack\Generated\Opc.Ua.PredefinedNodes.xml"
 )
@@ -210,16 +209,16 @@ IF "%GDS_TARGET%" NEQ "" (
 
 IF NOT "%3"=="DI" GOTO skipDI
 CALL PublishModel OpcUaDiModel DI %1 %2
-CALL PublishModel OpcUaDiSoftwarePackageModel DI %1 %2
+CALL PublishModel OpcUaDiPackageMetadataModel DI %1 %2
 CALL UpdateLicense "%OUTPUT%\DI"
 
 IF EXIST "%OUTPUT%\DI\Constants" RMDIR /S /Q "%OUTPUT%\DI\Constants"
 IF EXIST "%OUTPUT%\DI\Generated" RMDIR /S /Q "%OUTPUT%\DI\Generated"
 
-ECHO %MODELCOMPILER% compile-nodesets -input "%OUTPUT%" -uri "http://opcfoundation.org/UA/DI/SoftwarePackage/" -prefix "UAModel.DI.SoftwarePackage" -o2 "%OUTPUT%\DI\Generated"
-%MODELCOMPILER% compile-nodesets -input "%OUTPUT%" -uri "http://opcfoundation.org/UA/DI/SoftwarePackage/" -prefix "UAModel.DI.SoftwarePackage" -o2 "%OUTPUT%\DI\Generated"
+ECHO %MODELCOMPILER% compile-nodesets -input "%OUTPUT%" -uri "http://opcfoundation.org/UA/DI/PackageMetadata/" -prefix "UAModel.DI.PackageMetadata" -o2 "%OUTPUT%\DI\Generated"
+%MODELCOMPILER% compile-nodesets -input "%OUTPUT%" -uri "http://opcfoundation.org/UA/DI/PackageMetadata/" -prefix "UAModel.DI.PackageMetadata" -o2 "%OUTPUT%\DI\Generated"
 
-COPY "%OUTPUT%\DI\Generated\DI\*.json" "%OUTPUT%\DI"
+COPY "%OUTPUT%\DI\Generated\*.json" "%OUTPUT%\DI\"
 RMDIR /S /Q "%OUTPUT%\DI\Generated"
 DEL /F /Q "%OUTPUT%\DI\*.cs"
 DEL /F /Q "%OUTPUT%\DI\*.uanodes"

ModelCompiler Debug.slnx

@@ -20,8 +20,10 @@
     <Project Path="Stack/Libraries/Opc.Ua.Security.Certificates/Opc.Ua.Security.Certificates.csproj" />
     <Project Path="Stack/Libraries/Opc.Ua.Server/Opc.Ua.Server.csproj" />
     <Project Path="Stack/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj" />
+    <Project Path="Stack/Stack/Opc.Ua.Types/Opc.Ua.Types.csproj" />
   </Folder>
   <Project Path="Opc.Ua.ModelCompiler.Tool/Opc.Ua.ModelCompiler.Tool.Debug.csproj" />
   <Project Path="Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.Debug.csproj" />
   <Project Path="Tests/DemoModel/DemoModel.Debug.csproj" />
+  <Project Path="Tests/SchemaGeneration.Tests/SchemaGeneration.Tests.csproj" />
 </Solution>

ModelCompiler.slnx

@@ -24,7 +24,4 @@
     <Build Solution="Docker|*" Project="false" />
   </Project>
   <Project Path="Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.csproj" />
-  <Project Path="Opc.Ua.SourceGenerator/Opc.Ua.SourceGenerator.csproj" Id="8d812557-9f53-47c0-a97d-18b947bf6d53">
-    <Build Solution="Docker|*" Project="false" />
-  </Project>
 </Solution>

Opc.Ua.ModelCompiler.Tool/GlobalSuppressions.cs

@@ -0,0 +1,13 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Maintainability", "CA1515:Consider making public types internal")]
+[assembly: SuppressMessage("Design", "CA1056:URI-like properties should not be strings")]
+[assembly: SuppressMessage("Naming", "CA1711:Identifiers should not have incorrect suffix")]
+[assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types")]
+[assembly: SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters")]
+[assembly: SuppressMessage("Design", "CA1014: Mark assemblies with CLSCompliantAttribute")]