Merge pull request #1614 from OPCFoundation/master

Merge master for release build
OPCFoundation · Dec 3, 2021 · cc1b368 · cc1b368
2 parents 58bbc0c + edadaa8
commit cc1b368
Show file tree

Hide file tree

Showing 62 changed files with 6,012 additions and 59,456 deletions.
diff --git a/.azurepipelines/ci.yml b/.azurepipelines/ci.yml
@@ -38,18 +38,12 @@ jobs:
     inputs:
       targetType: filePath
       filePath: ./.azurepipelines/set-version.ps1
-  - task: DotNetCoreCLI@2
-    displayName: Release Restore
-    inputs:
-      command: restore
-      projects: '**/@(Console|NetCore)*.csproj'
-      arguments: '--framework ${{ parameters.framework }} --configuration Release ${{ parameters.buildoption }}'
   - task: DotNetCoreCLI@2
     displayName: Release Build
     inputs:
       command: build
       projects: '**/@(Console|NetCore)*.csproj'
-      arguments: '--framework ${{ parameters.framework }} --no-restore --configuration Release ${{ parameters.buildoption }}'
+      arguments: '--framework ${{ parameters.framework }} --configuration Release ${{ parameters.buildoption }} /p:RCS=true'
   - task: DotNetCoreCLI@2
     displayName: Release Pack 
     condition: eq(variables['poolImage'], 'windows-2022')
@@ -58,18 +52,12 @@ jobs:
       packagesToPack:  '**/Opc.Ua.*.csproj'
       configuration: Release
       configurationToPack: Release
-  - task: DotNetCoreCLI@2
-    displayName: Debug Restore
-    inputs:
-      command: restore
-      projects: '**/@(Console|NetCore)*.csproj'
-      arguments: '--framework ${{ parameters.framework }} --configuration Debug ${{ parameters.buildoption }}'
   - task: DotNetCoreCLI@2
     displayName: Debug Build
     inputs:
       command: build
       projects: '**/@(Console|NetCore)*.csproj'
-      arguments: '--framework ${{ parameters.framework }} --no-restore --configuration Debug ${{ parameters.buildoption }}'
+      arguments: '--framework ${{ parameters.framework }} --configuration Debug ${{ parameters.buildoption }} /p:RCS=true'
   - task: DotNetCoreCLI@2
     displayName: Debug Pack 
     condition: eq(variables['poolImage'], 'windows-2022')

diff --git a/Applications/ClientControls.Net4/Configuration/CertificateStoreCtrl.cs b/Applications/ClientControls.Net4/Configuration/CertificateStoreCtrl.cs
@@ -198,7 +198,7 @@ private void StorePathCB_DropDown(object sender, EventArgs e)
 
                     foreach (string item in StorePathCB.Items)
                     {
-                        if (String.Compare(storePath, item, StringComparison.OrdinalIgnoreCase) == 0)
+                        if (String.Equals(storePath, item, StringComparison.OrdinalIgnoreCase))
                         {
                             found = true;
                             break;
@@ -265,7 +265,7 @@ private void BrowseStoreBTN_Click(object sender, EventArgs e)
 
                 for (int ii = 0; ii < StorePathCB.Items.Count; ii++)
                 {
-                    if (String.Compare(storePath, StorePathCB.Items[ii] as string, StringComparison.OrdinalIgnoreCase) == 0)
+                    if (String.Equals(storePath, StorePathCB.Items[ii] as string, StringComparison.OrdinalIgnoreCase))
                     {
                         StorePathCB.SelectedIndex = ii;
                         found = true;

diff --git a/Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj b/Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj
@@ -32,7 +32,7 @@
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
   </ItemGroup>

diff --git a/Applications/Quickstarts.Servers/Boiler/Boiler.Classes.cs b/Applications/Quickstarts.Servers/Boiler/Boiler.Classes.cs
diff --git a/Applications/Quickstarts.Servers/Boiler/Boiler.NodeSet.xml b/Applications/Quickstarts.Servers/Boiler/Boiler.NodeSet.xml
@@ -1492,6 +1492,15 @@
             <Identifier>ns=1;i=1039</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>i=2426</Identifier>
+          </TargetId>
+        </ReferenceNode>
         <ReferenceNode>
           <ReferenceTypeId>
             <Identifier>i=37</Identifier>
@@ -1537,6 +1546,15 @@
             <Identifier>ns=1;i=1039</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>i=2427</Identifier>
+          </TargetId>
+        </ReferenceNode>
         <ReferenceNode>
           <ReferenceTypeId>
             <Identifier>i=37</Identifier>
@@ -1582,6 +1600,15 @@
             <Identifier>ns=1;i=1039</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>i=2428</Identifier>
+          </TargetId>
+        </ReferenceNode>
         <ReferenceNode>
           <ReferenceTypeId>
             <Identifier>i=37</Identifier>
@@ -1627,6 +1654,15 @@
             <Identifier>ns=1;i=1039</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>i=2429</Identifier>
+          </TargetId>
+        </ReferenceNode>
         <ReferenceNode>
           <ReferenceTypeId>
             <Identifier>i=37</Identifier>
@@ -1672,6 +1708,15 @@
             <Identifier>ns=1;i=1039</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>i=2430</Identifier>
+          </TargetId>
+        </ReferenceNode>
         <ReferenceNode>
           <ReferenceTypeId>
             <Identifier>i=37</Identifier>
@@ -8833,6 +8878,15 @@
             <Identifier>ns=1;i=1178</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>ns=1;i=1095</Identifier>
+          </TargetId>
+        </ReferenceNode>
         <ReferenceNode>
           <ReferenceTypeId>
             <Identifier>i=37</Identifier>
@@ -8878,6 +8932,15 @@
             <Identifier>ns=1;i=1178</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>ns=1;i=1096</Identifier>
+          </TargetId>
+        </ReferenceNode>
         <ReferenceNode>
           <ReferenceTypeId>
             <Identifier>i=37</Identifier>
@@ -8923,6 +8986,15 @@
             <Identifier>ns=1;i=1178</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>ns=1;i=1097</Identifier>
+          </TargetId>
+        </ReferenceNode>
         <ReferenceNode>
           <ReferenceTypeId>
             <Identifier>i=37</Identifier>
@@ -8968,6 +9040,15 @@
             <Identifier>ns=1;i=1178</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>ns=1;i=1098</Identifier>
+          </TargetId>
+        </ReferenceNode>
         <ReferenceNode>
           <ReferenceTypeId>
             <Identifier>i=37</Identifier>
@@ -9013,6 +9094,15 @@
             <Identifier>ns=1;i=1178</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>ns=1;i=1099</Identifier>
+          </TargetId>
+        </ReferenceNode>
         <ReferenceNode>
           <ReferenceTypeId>
             <Identifier>i=37</Identifier>
@@ -9058,6 +9148,15 @@
             <Identifier>ns=1;i=1287</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>ns=1;i=1095</Identifier>
+          </TargetId>
+        </ReferenceNode>
       </References>
       <Executable>true</Executable>
       <UserExecutable>true</UserExecutable>
@@ -9094,6 +9193,15 @@
             <Identifier>ns=1;i=1287</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>ns=1;i=1096</Identifier>
+          </TargetId>
+        </ReferenceNode>
       </References>
       <Executable>true</Executable>
       <UserExecutable>true</UserExecutable>
@@ -9130,6 +9238,15 @@
             <Identifier>ns=1;i=1287</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>ns=1;i=1097</Identifier>
+          </TargetId>
+        </ReferenceNode>
       </References>
       <Executable>true</Executable>
       <UserExecutable>true</UserExecutable>
@@ -9166,6 +9283,15 @@
             <Identifier>ns=1;i=1287</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>ns=1;i=1098</Identifier>
+          </TargetId>
+        </ReferenceNode>
       </References>
       <Executable>true</Executable>
       <UserExecutable>true</UserExecutable>
@@ -9202,6 +9328,15 @@
             <Identifier>ns=1;i=1287</Identifier>
           </TargetId>
         </ReferenceNode>
+        <ReferenceNode>
+          <ReferenceTypeId>
+            <Identifier>i=40</Identifier>
+          </ReferenceTypeId>
+          <IsInverse>false</IsInverse>
+          <TargetId>
+            <Identifier>ns=1;i=1099</Identifier>
+          </TargetId>
+        </ReferenceNode>
       </References>
       <Executable>true</Executable>
       <UserExecutable>true</UserExecutable>

diff --git a/Applications/Quickstarts.Servers/Boiler/Boiler.NodeSet2.xml b/Applications/Quickstarts.Servers/Boiler/Boiler.NodeSet2.xml
@@ -5,7 +5,7 @@
   </NamespaceUris>
   <Models>
     <Model ModelUri="http://opcfoundation.org/UA/Boiler/">
-      <RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.04.10" PublicationDate="2021-09-15T00:00:00Z" />
+      <RequiredModel ModelUri="http://opcfoundation.org/UA/" XmlSchemaUri="http://opcfoundation.org/UA/2008/02/Types.xsd" Version="1.04.10" PublicationDate="2021-09-15T00:00:00Z" />
     </Model>
   </Models>
   <Aliases>

diff --git a/Applications/Quickstarts.Servers/Boiler/Boiler.PredefinedNodes.uanodes b/Applications/Quickstarts.Servers/Boiler/Boiler.PredefinedNodes.uanodes