moved examples, added to vip

kleinsimon · May 13, 2023 · 6a75464 · 6a75464
1 parent 41cf491
commit 6a75464
Show file tree

Hide file tree

Showing 21 changed files with 32 additions and 21 deletions.
diff --git a/Example/Dual.vi b/Example/Dual.vi
diff --git a/Source/Example/Dual.vi b/Source/Example/Dual.vi
diff --git a/Example/WebView2 Demo Browser.vi → Source/Example/WebView2 Demo Browser.vi b/Example/WebView2 Demo Browser.vi → Source/Example/WebView2 Demo Browser.vi
diff --git a/Example/Webview2 Demo.lvproj → Source/Example/Webview2 Demo.lvproj b/Example/Webview2 Demo.lvproj → Source/Example/Webview2 Demo.lvproj
@@ -18,13 +18,14 @@
 		</Item>
 		<Item Name="Libs" Type="Folder">
 			<Item Name="x64" Type="Folder">
-				<Item Name="WebView2Loader.dll" Type="Document" URL="../../microsoft.web.webview2/build/native/x64/WebView2Loader.dll"/>
+				<Item Name="WebView2Loader.dll" Type="Document" URL="../../Source/microsoft.web.webview2/build/native/x64/WebView2Loader.dll"/>
 			</Item>
 			<Item Name="x86" Type="Folder">
-				<Item Name="WebView2Loader.dll" Type="Document" URL="../../microsoft.web.webview2/build/native/x86/WebView2Loader.dll"/>
+				<Item Name="WebView2Loader.dll" Type="Document" URL="../../Source/microsoft.web.webview2/build/native/x86/WebView2Loader.dll"/>
 			</Item>
-			<Item Name="Microsoft.Web.WebView2.Core.dll" Type="Document" URL="../../microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.Core.dll"/>
-			<Item Name="Microsoft.Web.WebView2.WinForms.dll" Type="Document" URL="../../microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.WinForms.dll"/>
+			<Item Name="Microsoft.Web.WebView2.Core.dll" Type="Document" URL="../../Source/microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.Core.dll"/>
+			<Item Name="Microsoft.Web.WebView2.WinForms.dll" Type="Document" URL="../../Source/microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.WinForms.dll"/>
+			<Item Name="Microsoft.Web.WebView2.Wpf.dll" Type="Document" URL="../../Source/microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.Wpf.dll"/>
 		</Item>
 		<Item Name="Dependencies" Type="Dependencies">
 			<Item Name="vi.lib" Type="Folder">
@@ -70,12 +71,12 @@
 				<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
 				<Item Name="XControlSupport.lvlib" Type="Library" URL="/&lt;vilib&gt;/_xctls/XControlSupport.lvlib"/>
 			</Item>
-			<Item Name="Microsoft.Web.WebView2.Core.dll" Type="Document" URL="../../Source/microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.Core.dll"/>
-			<Item Name="Microsoft.Web.WebView2.WinForms.dll" Type="Document" URL="../../Source/microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.WinForms.dll"/>
+			<Item Name="Microsoft.Web.WebView2.Core.dll" Type="Document" URL="../../microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.Core.dll"/>
+			<Item Name="Microsoft.Web.WebView2.WinForms.dll" Type="Document" URL="../../microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.WinForms.dll"/>
 			<Item Name="mscorlib" Type="VI" URL="mscorlib">
 				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
 			</Item>
-			<Item Name="WebView2 Control.xctl" Type="XControl" URL="../../Source/Webview2 Control/WebView2 Control.xctl"/>
+			<Item Name="WebView2 Control.xctl" Type="XControl" URL="../../Webview2 Control/WebView2 Control.xctl"/>
 		</Item>
 		<Item Name="Build Specifications" Type="Build">
 			<Item Name="LV Edge Browser" Type="EXE">
@@ -94,7 +95,7 @@
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{792C4A5E-FCFA-4267-863D-E6D846FFDCED}</Property>
-				<Property Name="Bld_version.build" Type="Int">5</Property>
+				<Property Name="Bld_version.build" Type="Int">7</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">LV Edge Browser.exe</Property>
 				<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/LV Edge Browser/LV Edge Browser.exe</Property>
@@ -103,22 +104,25 @@
 				<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
 				<Property Name="Destination[1].path" Type="Path">../builds/NI_AB_PROJECTNAME/LV Edge Browser/data</Property>
 				<Property Name="DestinationCount" Type="Int">2</Property>
-				<Property Name="Source[0].itemID" Type="Str">{05CBF14A-6FAF-432F-9449-3352CD04539D}</Property>
+				<Property Name="Source[0].itemID" Type="Str">{814A5EE0-9FEE-4112-AE27-01DE27683117}</Property>
 				<Property Name="Source[0].type" Type="Str">Container</Property>
 				<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
-				<Property Name="Source[1].itemID" Type="Ref">/My Computer/Libs/Microsoft.Web.WebView2.Core.dll</Property>
-				<Property Name="Source[1].sourceInclusion" Type="Str">Include</Property>
+				<Property Name="Source[1].itemID" Type="Ref">/My Computer/Examples/WebView2 Demo Browser.vi</Property>
+				<Property Name="Source[1].sourceInclusion" Type="Str">TopLevel</Property>
+				<Property Name="Source[1].type" Type="Str">VI</Property>
 				<Property Name="Source[2].destinationIndex" Type="Int">0</Property>
-				<Property Name="Source[2].itemID" Type="Ref">/My Computer/Libs/Microsoft.Web.WebView2.WinForms.dll</Property>
+				<Property Name="Source[2].itemID" Type="Ref">/My Computer/Libs/x86/WebView2Loader.dll</Property>
 				<Property Name="Source[2].sourceInclusion" Type="Str">Include</Property>
 				<Property Name="Source[3].destinationIndex" Type="Int">0</Property>
-				<Property Name="Source[3].itemID" Type="Ref">/My Computer/Libs/x64/WebView2Loader.dll</Property>
+				<Property Name="Source[3].itemID" Type="Ref">/My Computer/Libs/Microsoft.Web.WebView2.Core.dll</Property>
 				<Property Name="Source[3].sourceInclusion" Type="Str">Include</Property>
 				<Property Name="Source[4].destinationIndex" Type="Int">0</Property>
-				<Property Name="Source[4].itemID" Type="Ref">/My Computer/Examples/WebView2 Demo Browser.vi</Property>
-				<Property Name="Source[4].sourceInclusion" Type="Str">TopLevel</Property>
-				<Property Name="Source[4].type" Type="Str">VI</Property>
-				<Property Name="SourceCount" Type="Int">5</Property>
+				<Property Name="Source[4].itemID" Type="Ref">/My Computer/Libs/Microsoft.Web.WebView2.WinForms.dll</Property>
+				<Property Name="Source[4].sourceInclusion" Type="Str">Include</Property>
+				<Property Name="Source[5].destinationIndex" Type="Int">0</Property>
+				<Property Name="Source[5].itemID" Type="Ref">/My Computer/Libs/Microsoft.Web.WebView2.Wpf.dll</Property>
+				<Property Name="Source[5].sourceInclusion" Type="Str">Include</Property>
+				<Property Name="SourceCount" Type="Int">6</Property>
 				<Property Name="TgtF_companyName" Type="Str">KNIPEX-Werk C. Gustav Putsch KG</Property>
 				<Property Name="TgtF_fileDescription" Type="Str">LV Edge Browser</Property>
 				<Property Name="TgtF_internalName" Type="Str">LV Edge Browser</Property>

diff --git a/Source/Webview2 Control/Data.ctl b/Source/Webview2 Control/Data.ctl
diff --git a/Source/Webview2 Control/Events Read 5.vi b/Source/Webview2 Control/Events Read 5.vi
diff --git a/Source/Webview2 Control/Facade.vi b/Source/Webview2 Control/Facade.vi
diff --git a/Source/Webview2 Control/Go Back.vi b/Source/Webview2 Control/Go Back.vi
diff --git a/Source/Webview2 Control/Go Forward.vi b/Source/Webview2 Control/Go Forward.vi
diff --git a/Source/Webview2 Control/Init Core.vi b/Source/Webview2 Control/Init Core.vi
diff --git a/Source/Webview2 Control/Init.vi b/Source/Webview2 Control/Init.vi
diff --git a/Source/Webview2 Control/Paths Read 2.vi b/Source/Webview2 Control/Paths Read 2.vi
diff --git a/Source/Webview2 Control/Register Events.vi b/Source/Webview2 Control/Register Events.vi
diff --git a/Source/Webview2 Control/Reload.vi b/Source/Webview2 Control/Reload.vi
diff --git a/Source/Webview2 Control/Run Javascript.vi b/Source/Webview2 Control/Run Javascript.vi
diff --git a/Source/Webview2 Control/Site Info Read 4.vi b/Source/Webview2 Control/Site Info Read 4.vi
diff --git a/Source/Webview2 Control/State.ctl b/Source/Webview2 Control/State.ctl
diff --git a/Source/Webview2 Control/URL Read 3.vi b/Source/Webview2 Control/URL Read 3.vi
diff --git a/Source/Webview2 Control/URL Write 3.vi b/Source/Webview2 Control/URL Write 3.vi
diff --git a/Source/Webview2 Control/Uninit.vi b/Source/Webview2 Control/Uninit.vi
diff --git a/WebView2.vipb b/WebView2.vipb
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="2020.1" Created_Date="2022-10-23 10:00:43" Modified_Date="2023-04-02 12:27:50" Creator="KLEINS" Comments="" ID="57bc84fa1a87dc8b96cb550fa48dce66">
+<VI_Package_Builder_Settings Version="2020.1" Created_Date="2022-10-23 10:00:43" Modified_Date="2023-05-13 09:01:52" Creator="KLEINS" Comments="" ID="229f15955589abf08d6127bc7854302e">
   <Library_General_Settings>
     <Package_File_Name>sklein_lib_WebView2</Package_File_Name>
-    <Library_Version>1.0.1.4</Library_Version>
+    <Library_Version>1.0.1.5</Library_Version>
     <Auto_Increment_Version>false</Auto_Increment_Version>
     <Library_Source_Folder>Source</Library_Source_Folder>
     <Library_Output_Folder>.</Library_Output_Folder>
@@ -105,6 +105,12 @@ The needed library from nuget is included. Please see the LICENSE.txt for lincen
         <Additional_Destination>false</Additional_Destination>
         <Additional_Destination_Index>0</Additional_Destination_Index>
       </Destination_Overrides>
+      <Destination_Overrides>
+        <Path>Example</Path>
+        <Destination>1</Destination>
+        <Additional_Destination>false</Additional_Destination>
+        <Additional_Destination_Index>0</Additional_Destination_Index>
+      </Destination_Overrides>
       <Password_Overrides>
         <Path>.</Path>
         <Password/>
@@ -161,7 +167,7 @@ The needed library from nuget is included. Please see the LICENSE.txt for lincen
       <Windows_Vista>true</Windows_Vista>
       <Windows_XP>true</Windows_XP>
       <Mac_OS>false</Mac_OS>
-      <Linux>false</Linux>
+      <Linux>true</Linux>
       <Built_LV_Version>false</Built_LV_Version>
       <Built_LV_Version_or_greater>true</Built_LV_Version_or_greater>
       <Windows_8>true</Windows_8>
@@ -174,6 +180,7 @@ The needed library from nuget is included. Please see the LICENSE.txt for lincen
       <close_labview_before_install>false</close_labview_before_install>
       <restart_labview_after_install>false</restart_labview_after_install>
       <skip_mass_compile_after_install>false</skip_mass_compile_after_install>
+      <install_into_global_environment>false</install_into_global_environment>
     </LabVIEW>
     <VI_Docs>
       <Edit_VI_Description>false</Edit_VI_Description>
@@ -217,7 +224,7 @@ The needed library from nuget is included. Please see the LICENSE.txt for lincen
         <Path>Source\Webview2 Control\WebView2 Control.xctl</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>D1457BB203CDEE59B228295C202A56B6</GUID>
+      <GUID>E8D45CAE336CCD5BECAD3026474411B9</GUID>
     </Controls_Palette_Data>
   </Library_Palette_Definition>
 </VI_Package_Builder_Settings>