Mass compile to LabVIEW 2020, add 2023 build (#44)

* Mass compile with LV 2020 * Remove 2019 from build, add 2023, and update readme
ni · Dec 8, 2022 · 775b75c · 775b75c
1 parent e3dd2ed
commit 775b75c
Show file tree

Hide file tree

Showing 243 changed files with 1,435 additions and 1,432 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,8 +3,8 @@
 @Library('vs-build-tools') _
 
 def lvVersions = [
-  32 : ['2019', '2020'],
-  64 : ['2021']
+  32 : ['2020'],
+  64 : ['2021', '2023']
 ]
 
 diffPipeline(lvVersions)

diff --git a/ProjectTemplate/Source/NI VeriStand/Custom Device/Consolidated Custom Device.lvproj b/ProjectTemplate/Source/NI VeriStand/Custom Device/Consolidated Custom Device.lvproj
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<Project Type="Project" LVVersion="19008000">
+<Project Type="Project" LVVersion="20008000">
 	<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
 	<Property Name="NI.Project.Description" Type="Str"></Property>
 	<Property Name="SMProvider.SMVersion" Type="Int">201310</Property>

diff --git a/...ctTemplate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Action.ctl b/...ctTemplate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Action.ctl
diff --git a/...e/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Add Item - Type.ctl b/...e/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Add Item - Type.ctl
diff --git a/...e/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/AfterPage2_GenCD.vi b/...e/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/AfterPage2_GenCD.vi
diff --git a/...Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Build Spec Engine.ctl b/...Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Build Spec Engine.ctl
diff --git a/.../Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Build Spec Engine.vi b/.../Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Build Spec Engine.vi
diff --git a/... VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Build Spec System Explorer.ctl b/... VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Build Spec System Explorer.ctl
diff --git a/...I VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Build Spec System Explorer.vi b/...I VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Build Spec System Explorer.vi
diff --git a/...e/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD Engine lvlib.ctl b/...e/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD Engine lvlib.ctl
diff --git a/...te/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD Engine lvlib.vi b/...te/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD Engine lvlib.vi
diff --git a/...e/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD Shared lvlib.ctl b/...e/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD Shared lvlib.ctl
diff --git a/...te/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD Shared lvlib.vi b/...te/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD Shared lvlib.vi
diff --git a/...NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD System Explorer lvlib.ctl b/...NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD System Explorer lvlib.ctl
diff --git a/.../NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD System Explorer lvlib.vi b/.../NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CD System Explorer lvlib.vi
diff --git a/...plate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CDW_SpecPage.vi b/...plate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/CDW_SpecPage.vi
diff --git a/...tom Device/NIVS_Consolidated_CDW_MetaDataObj/Call HTML Help Generation Functions Async.vi b/...tom Device/NIVS_Consolidated_CDW_MetaDataObj/Call HTML Help Generation Functions Async.vi
diff --git a/...ource/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Change Constants VI.vi b/...ource/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Change Constants VI.vi
diff --git a/...iStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Change Copy LLB to NI VeriStand.vi b/...iStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Change Copy LLB to NI VeriStand.vi
diff --git a/...Device/NIVS_Consolidated_CDW_MetaDataObj/Change Engine Library Placeholders in project.vi b/...Device/NIVS_Consolidated_CDW_MetaDataObj/Change Engine Library Placeholders in project.vi
diff --git a/...ource/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Common Information.ctl b/...ource/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Common Information.ctl
diff --git a/...ctTemplate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Common.ctl b/...ctTemplate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Common.ctl
diff --git a/...ectTemplate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Common.vi b/...ectTemplate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Common.vi
diff --git a/...ate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Constants Main.vi b/...ate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Constants Main.vi
diff --git a/...Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Copy VI and disconnect it from library.vi b/...Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Copy VI and disconnect it from library.vi
diff --git a/...mplate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Create GUID.vi b/...mplate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Create GUID.vi
diff --git a/...NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Create XML-file - States.ctl b/...NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Create XML-file - States.ctl
diff --git a/...om Device/NIVS_Consolidated_CDW_MetaDataObj/Create new LVLIB and add it to target item.vi b/...om Device/NIVS_Consolidated_CDW_MetaDataObj/Create new LVLIB and add it to target item.vi
diff --git a/...Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Custom Device CORE.vi b/...Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Custom Device CORE.vi
diff --git a/...riStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Custom Device Wizard - Action.ctl b/...riStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Custom Device Wizard - Action.ctl
diff --git a/...e/NIVS_Consolidated_CDW_MetaDataObj/Engine - Copy & Script PPLTemplates (Inline-Async).vi b/...e/NIVS_Consolidated_CDW_MetaDataObj/Engine - Copy & Script PPLTemplates (Inline-Async).vi
diff --git a/...nd/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Engine - Copy & Script PPLTemplates.vi b/...nd/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Engine - Copy & Script PPLTemplates.vi
diff --git a/...Stand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Engine - Copy & Script Templates.vi b/...Stand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Engine - Copy & Script Templates.vi
diff --git a/...te/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Execution Mode.ctl b/...te/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Execution Mode.ctl
diff --git a/...NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Extra Page Name and GUID.ctl b/...NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Extra Page Name and GUID.ctl
diff --git a/...ate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Internal data.ctl b/...ate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Internal data.ctl
diff --git a/...Custom Device/NIVS_Consolidated_CDW_MetaDataObj/NIVS_Consolidated_CDW_MetaDataObj.lvclass b/...Custom Device/NIVS_Consolidated_CDW_MetaDataObj/NIVS_Consolidated_CDW_MetaDataObj.lvclass
diff --git a/...e/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Read CD Template.vi b/...e/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Read CD Template.vi
diff --git a/...ource/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Read Spec Page Path.vi b/...ource/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Read Spec Page Path.vi
diff --git a/...ource/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Replace Stub SubVIs.vi b/...ource/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Replace Stub SubVIs.vi
diff --git a/...I VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Replace Template Async Ref.vi b/...I VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Replace Template Async Ref.vi
diff --git a/...NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Replace Template Clusters.vi b/...NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Replace Template Clusters.vi
diff --git a/...te/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Save VI by path.vi b/...te/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Save VI by path.vi
diff --git a/...riStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Script Property Global into VI.vi b/...riStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Script Property Global into VI.vi
diff --git a/...VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Set BD string constant value.vi b/...VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Set BD string constant value.vi
diff --git a/...solidated_CDW_MetaDataObj/System Explorer - Add PPL content to System Explorer library.vi b/...solidated_CDW_MetaDataObj/System Explorer - Add PPL content to System Explorer library.vi
diff --git a/..._Consolidated_CDW_MetaDataObj/System Explorer - Add content to System Explorer library.vi b/..._Consolidated_CDW_MetaDataObj/System Explorer - Add content to System Explorer library.vi
diff --git a/...solidated_CDW_MetaDataObj/System Explorer - Add extra pages to System Explorer library.vi b/...solidated_CDW_MetaDataObj/System Explorer - Add extra pages to System Explorer library.vi
diff --git a/...S_Consolidated_CDW_MetaDataObj/System Explorer - Copy PPLTemplates for System Explorer.vi b/...S_Consolidated_CDW_MetaDataObj/System Explorer - Copy PPLTemplates for System Explorer.vi
diff --git a/...NIVS_Consolidated_CDW_MetaDataObj/System Explorer - Copy Templates for System Explorer.vi b/...NIVS_Consolidated_CDW_MetaDataObj/System Explorer - Copy Templates for System Explorer.vi
diff --git a/...plate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Target Type.ctl b/...plate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Target Type.ctl
diff --git a/...te/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Utility folder.ctl b/...te/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Utility folder.ctl
diff --git a/...ate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Utility folder.vi b/...ate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Utility folder.vi
diff --git a/.../Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Write CD Template.vi b/.../Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/Write CD Template.vi
diff --git a/...rce/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML - Create XML file.vi b/...rce/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML - Create XML file.vi
diff --git a/...e/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML - Get XML file name.vi b/...e/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML - Get XML file name.vi
diff --git a/...vice/NIVS_Consolidated_CDW_MetaDataObj/XML - Get absolute RT Driver VI path for TARGET.vi b/...vice/NIVS_Consolidated_CDW_MetaDataObj/XML - Get absolute RT Driver VI path for TARGET.vi
diff --git a/...Stand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML - Get extra pages XML string.vi b/...Stand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML - Get extra pages XML string.vi
diff --git a/...Device/NIVS_Consolidated_CDW_MetaDataObj/XML - Get relative Configuration LLB_PPL path.vi b/...Device/NIVS_Consolidated_CDW_MetaDataObj/XML - Get relative Configuration LLB_PPL path.vi
diff --git a/...d/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML - Get relative RT Driver VI path.vi b/...d/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML - Get relative RT Driver VI path.vi
diff --git a/...Template/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML File.ctl b/...Template/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML File.ctl
diff --git a/...tTemplate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML File.vi b/...tTemplate/Source/NI VeriStand/Custom Device/NIVS_Consolidated_CDW_MetaDataObj/XML File.vi
diff --git a/ProjectTemplate/Source/NI VeriStand/Custom Device/Null.lvproj b/ProjectTemplate/Source/NI VeriStand/Custom Device/Null.lvproj
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<Project Type="Project" LVVersion="19008000">
+<Project Type="Project" LVVersion="20008000">
 	<Property Name="SMProvider.SMVersion" Type="Int">201310</Property>
 	<Item Name="My Computer" Type="My Computer">
 		<Property Name="IOScan.Faults" Type="Str"></Property>

diff --git a/...urce/NI VeriStand/Custom Device/PPL Template files/Engine/Initialize VeriStand Globals.vi b/...urce/NI VeriStand/Custom Device/PPL Template files/Engine/Initialize VeriStand Globals.vi
diff --git a/...NI VeriStand/Custom Device/PPL Template files/Engine/Initialize VeriStand Globals_stub.vi b/...NI VeriStand/Custom Device/PPL Template files/Engine/Initialize VeriStand Globals_stub.vi
diff --git a/...Template/Source/NI VeriStand/Custom Device/PPL Template files/Engine/PPL Example.Async.vi b/...Template/Source/NI VeriStand/Custom Device/PPL Template files/Engine/PPL Example.Async.vi
diff --git a/...urce/NI VeriStand/Custom Device/PPL Template files/Engine/PPL RT Driver VI_InlineAsync.vi b/...urce/NI VeriStand/Custom Device/PPL Template files/Engine/PPL RT Driver VI_InlineAsync.vi
diff --git a/.../Source/NI VeriStand/Custom Device/PPL Template files/Engine/PPL RT Driver VI_InlineHW.vi b/.../Source/NI VeriStand/Custom Device/PPL Template files/Engine/PPL RT Driver VI_InlineHW.vi
diff --git a/...late/Source/NI VeriStand/Custom Device/PPL Template files/Engine/PPL RTStateVariables.ctl b/...late/Source/NI VeriStand/Custom Device/PPL Template files/Engine/PPL RTStateVariables.ctl
diff --git a/...tTemplate/Source/NI VeriStand/Custom Device/PPL Template files/PPLTemplate Project.lvproj b/...tTemplate/Source/NI VeriStand/Custom Device/PPL Template files/PPLTemplate Project.lvproj
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<Project Type="Project" LVVersion="19008000">
+<Project Type="Project" LVVersion="20008000">
 	<Property Name="SMProvider.SMVersion" Type="Int">201310</Property>
 	<Item Name="My Computer" Type="My Computer">
 		<Property Name="IOScan.Faults" Type="Str"></Property>
@@ -19,22 +19,23 @@
 		<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
 		<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
 		<Property Name="specify.custom.address" Type="Bool">false</Property>
+		<Item Name="%UtilityFolderName%" Type="Folder">
+			<Item Name="%XMLUpdaterFolderName%" Type="Folder">
+				<Item Name="%XMLUpdaterLibraryFileName%" Type="Library" URL="../%UtilityFolderName%/%XMLUpdaterFolderName%/%XMLUpdaterLibraryFileName%"/>
+			</Item>
+			<Item Name="%PPLCHMPreBuildFileName%" Type="VI" URL="../%UtilityFolderName%/%PPLCHMPreBuildFileName%"/>
+			<Item Name="%PPLXMLUpdaterFileName%" Type="VI" URL="../%UtilityFolderName%/%PPLXMLUpdaterFileName%"/>
+		</Item>
 		<Item Name="NI VeriStand APIs" Type="Folder">
 			<Item Name="Custom Device API.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI VeriStand/Custom Device API/Custom Device API.lvlib"/>
 			<Item Name="Custom Device Utility Library.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI VeriStand/Custom Device Tools/Custom Device Utility Library/Custom Device Utility Library.lvlib"/>
 		</Item>
-		<Item Name="%UtilityFolderName%" Type="Folder">
-         <Item Name="%XMLUpdaterFolderName%" Type="Folder">
-            <Item Name="%XMLUpdaterLibraryFileName%" Type="Library" URL="../%UtilityFolderName%/%XMLUpdaterFolderName%/%XMLUpdaterLibraryFileName%"/>
-         </Item>
-			<Item Name="%PPLXMLUpdaterFileName%" Type="VI" URL="../%UtilityFolderName%/%PPLXMLUpdaterFileName%"/>
-			<Item Name="%PPLCHMPreBuildFileName%" Type="VI" URL="../%UtilityFolderName%/%PPLCHMPreBuildFileName%"/>
-		</Item>
-		<Item Name="%XMLCustomDeviceFileName%" Type="Document" URL="../%XMLCustomDeviceFileName%"/>
 		<Item Name="%EngineLibraryFileName%" Type="Library" URL="../%EngineLibraryFolderName%/%EngineLibraryFileName%"/>
 		<Item Name="%SharedLibraryFileName%" Type="Library" URL="../%SharedLibraryFolderName%/%SharedLibraryFileName%"/>
 		<Item Name="%SystemExplorerLibraryFileName%" Type="Library" URL="../%SystemExplorerLibraryFolderName%/%SystemExplorerLibraryFileName%"/>
+		<Item Name="%XMLCustomDeviceFileName%" Type="Document" URL="../%XMLCustomDeviceFileName%"/>
 		<Item Name="Dependencies" Type="Dependencies">
+			<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
 			<Item Name="vi.lib" Type="Folder">
 				<Item Name="BuildHelpPath.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/BuildHelpPath.vi"/>
 				<Item Name="Check Special Tags.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Check Special Tags.vi"/>
@@ -74,8 +75,7 @@
 			<Item Name="NationalInstruments.VeriStand.SystemStorage" Type="Document" URL="NationalInstruments.VeriStand.SystemStorage">
 				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
 			</Item>
-				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
-			</Item>
+		</Item>
 		<Item Name="Build Specifications" Type="Build">
 			<Item Name="Configuration Release PPL" Type="Packed Library">
 				<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
@@ -166,7 +166,7 @@
 				<Property Name="TgtF_versionIndependent" Type="Bool">true</Property>
 			</Item>
 		</Item>
-   </Item>
+	</Item>
 	<Item Name="RT PXI Target" Type="RT PXI Chassis">
 		<Property Name="alias.name" Type="Str">RT PXI Target</Property>
 		<Property Name="alias.value" Type="Str">0.0.0.0</Property>
@@ -219,16 +219,15 @@
 		<Item Name="NI VeriStand APIs" Type="Folder">
 			<Item Name="Custom Device API.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI VeriStand/Custom Device API/Custom Device API.lvlib"/>
 		</Item>
-      <Item Name="%SharedLibraryFileName%" Type="Library" URL="../%SharedLibraryFolderName%/%SharedLibraryFileName%"/>
-      <Item Name="%EngineLibraryFileName%" Type="Library" URL="../%EngineLibraryFolderName%/%EngineLibraryFileName%"/>
+		<Item Name="%EngineLibraryFileName%" Type="Library" URL="../%EngineLibraryFolderName%/%EngineLibraryFileName%"/>
+		<Item Name="%SharedLibraryFileName%" Type="Library" URL="../%SharedLibraryFolderName%/%SharedLibraryFileName%"/>
 		<Item Name="Dependencies" Type="Dependencies">
 			<Item Name="vi.lib" Type="Folder">
 				<Item Name="BuildHelpPath.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/BuildHelpPath.vi"/>
 				<Item Name="Check Special Tags.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Check Special Tags.vi"/>
 				<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
 				<Item Name="Convert property node font to graphics font.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Convert property node font to graphics font.vi"/>
 				<Item Name="Custom Device Utility Library.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI VeriStand/Custom Device Tools/Custom Device Utility Library/Custom Device Utility Library.lvlib"/>
-				<Item Name="Data Access Engine.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/NIVS Inline Async API/_Data Access Engine/Data Access Engine.lvlib"/>
 				<Item Name="Details Display Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Details Display Dialog.vi"/>
 				<Item Name="DialogType.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/DialogType.ctl"/>
 				<Item Name="DialogTypeEnum.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/DialogTypeEnum.ctl"/>
@@ -247,7 +246,6 @@
 				<Item Name="Longest Line Length in Pixels.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Longest Line Length in Pixels.vi"/>
 				<Item Name="LVBoundsTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVBoundsTypeDef.ctl"/>
 				<Item Name="LVRectTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVRectTypeDef.ctl"/>
-				<Item Name="NI_SystemLogging.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/SystemLogging/NI_SystemLogging.lvlib"/>
 				<Item Name="NI_WebDAV.lvlib" Type="Library" URL="/&lt;vilib&gt;/WebDAVClient/NI_WebDAV.lvlib"/>
 				<Item Name="NIVeristand_DataServices.dll" Type="Document" URL="/&lt;vilib&gt;/NI VeriStand/Custom Device API/data/NIVeristand_DataServices.dll"/>
 				<Item Name="Not Found Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Not Found Dialog.vi"/>
@@ -259,17 +257,11 @@
 				<Item Name="Three Button Dialog CORE.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Three Button Dialog CORE.vi"/>
 				<Item Name="Three Button Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Three Button Dialog.vi"/>
 				<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
-				<Item Name="VS Inline Async API.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/NIVS Inline Async API/_VS Inline Async API/VS Inline Async API.lvlib"/>
 				<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
 			</Item>
-			<Item Name="LV Config Read String.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Read String.vi"/>
 			<Item Name="NationalInstruments.VeriStand.SystemStorage" Type="Document" URL="NationalInstruments.VeriStand.SystemStorage">
 				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
 			</Item>
-			<Item Name="systemLogging.dll" Type="Document" URL="systemLogging.dll">
-				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
-			</Item>
-			<Item Name="TemplatePPL Shared.lvlib" Type="Library" URL="../Shared/TemplatePPL Shared.lvlib"/>
 		</Item>
 		<Item Name="Build Specifications" Type="Build">
 			<Item Name="Engine Release PPL" Type="Packed Library">

diff --git a/...ource/NI VeriStand/Custom Device/PPL Template files/System Explorer/Clear RTDriver VIs.vi b/...ource/NI VeriStand/Custom Device/PPL Template files/System Explorer/Clear RTDriver VIs.vi
diff --git a/.../NI VeriStand/Custom Device/PPL Template files/System Explorer/Clear RTDriver VIs_stub.vi b/.../NI VeriStand/Custom Device/PPL Template files/System Explorer/Clear RTDriver VIs_stub.vi
diff --git a/...eriStand/Custom Device/PPL Template files/System Explorer/PPL Export Configuration RTM.vi b/...eriStand/Custom Device/PPL Template files/System Explorer/PPL Export Configuration RTM.vi
diff --git a/...ource/NI VeriStand/Custom Device/PPL Template files/System Explorer/PPL Load Help File.vi b/...ource/NI VeriStand/Custom Device/PPL Template files/System Explorer/PPL Load Help File.vi
diff --git a/.../NI VeriStand/Custom Device/PPL Template files/System Explorer/PPL Load Help File_stub.vi b/.../NI VeriStand/Custom Device/PPL Template files/System Explorer/PPL Load Help File_stub.vi
diff --git a/...ce/NI VeriStand/Custom Device/PPL Template files/System Explorer/PPL_ActionVIOnCompile.vi b/...ce/NI VeriStand/Custom Device/PPL Template files/System Explorer/PPL_ActionVIOnCompile.vi
diff --git a/...and/Custom Device/PPL Template files/System Explorer/PPL_ActionVIOnCompile_InlineAsync.vi b/...and/Custom Device/PPL Template files/System Explorer/PPL_ActionVIOnCompile_InlineAsync.vi
diff --git a/...ce/NI VeriStand/Custom Device/PPL Template files/System Explorer/PPL_Initialization VI.vi b/...ce/NI VeriStand/Custom Device/PPL Template files/System Explorer/PPL_Initialization VI.vi
diff --git a/...and/Custom Device/PPL Template files/System Explorer/PPL_Initialization VI_InlineAsync.vi b/...and/Custom Device/PPL Template files/System Explorer/PPL_Initialization VI_InlineAsync.vi
diff --git a/...ate/Source/NI VeriStand/Custom Device/PPL Template files/System Explorer/PPL_Main Page.vi b/...ate/Source/NI VeriStand/Custom Device/PPL Template files/System Explorer/PPL_Main Page.vi
diff --git a/...I VeriStand/Custom Device/PPL Template files/System Explorer/PPL_Main Page_InlineAsync.vi b/...I VeriStand/Custom Device/PPL Template files/System Explorer/PPL_Main Page_InlineAsync.vi
diff --git a/...VeriStand/Custom Device/PPL Template files/System Explorer/Set RTDriver VIs File Paths.vi b/...VeriStand/Custom Device/PPL Template files/System Explorer/Set RTDriver VIs File Paths.vi
diff --git a/...tand/Custom Device/PPL Template files/System Explorer/Set RTDriver VIs File Paths_stub.vi b/...tand/Custom Device/PPL Template files/System Explorer/Set RTDriver VIs File Paths_stub.vi
diff --git a/...stom Device/PPL Template files/Utility/LVLIBP CD XML Updater/Error Handling/Error 7001.vi b/...stom Device/PPL Template files/Utility/LVLIBP CD XML Updater/Error Handling/Error 7001.vi
diff --git a/...stom Device/PPL Template files/Utility/LVLIBP CD XML Updater/Error Handling/Error 7002.vi b/...stom Device/PPL Template files/Utility/LVLIBP CD XML Updater/Error Handling/Error 7002.vi
diff --git a/...stom Device/PPL Template files/Utility/LVLIBP CD XML Updater/Error Handling/Error 7003.vi b/...stom Device/PPL Template files/Utility/LVLIBP CD XML Updater/Error Handling/Error 7003.vi