[rst-commit] r151 - in /redwax-signtext-windows/trunk: Redwax SignText (WinUI3)/ Redwax SignText (WinUI3)/Redwax SignText/Redwax SignText (MSI Package)/ Redwax SignText (WinUI3)/Redwax SignText/Redwax SignText/ Redwax SignText/

[rst-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Sat Jun  8 17:59:31 2024
New Revision: 151

Log:
Move the WinUI3 attempt out of the way

Added:
    redwax-signtext-windows/trunk/Redwax SignText (WinUI3)/
      - copied from r150, redwax-signtext-windows/trunk/Redwax SignText/
Removed:
    redwax-signtext-windows/trunk/Redwax SignText/
Modified:
    redwax-signtext-windows/trunk/Redwax SignText (WinUI3)/Redwax SignText/Redwax SignText (MSI Package)/NativeComponents.wxs
    redwax-signtext-windows/trunk/Redwax SignText (WinUI3)/Redwax SignText/Redwax SignText/Redwax SignText.vcxproj

Modified: redwax-signtext-windows/trunk/Redwax SignText (WinUI3)/Redwax SignText/Redwax SignText (MSI Package)/NativeComponents.wxs
==============================================================================
--- redwax-signtext-windows/trunk/Redwax SignText (WinUI3)/Redwax SignText/Redwax SignText (MSI Package)/NativeComponents.wxs	(original)
+++ redwax-signtext-windows/trunk/Redwax SignText (WinUI3)/Redwax SignText/Redwax SignText (MSI Package)/NativeComponents.wxs	Sat Jun  8 17:59:31 2024
@@ -13,6 +13,105 @@
       <Component>
         <File Source="Redwax_SignText.exe" />
       </Component>
+		<Component>
+			<File Source="Microsoft.Windows.Widgets.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.WindowsAppRuntime.Bootstrap.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.WindowsAppRuntime.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.WindowsAppRuntime.Insights.Resource.dll" />
+		</Component>
+		<Component>
+			<File Source="MRM.dll" />
+		</Component>
+		<Component>
+			<File Source="PushNotificationsLongRunningTask.ProxyStub.dll" />
+		</Component>
+		<Component>
+			<File Source="WindowsAppSdk.AppxDeploymentExtensions.Desktop.dll" />
+		</Component>
+		<Component>
+			<File Source="WindowsAppSdk.AppxDeploymentExtensions.Desktop-EventLog-Instrumentation.dll" />
+		</Component>
+		<Component>
+			<File Source="WinUIEdit.dll" />
+		</Component>
+		<Component>
+			<File Source="wuceffectsi.dll" />
+		</Component>
+		<Component>
+			<File Source="CoreMessagingXP.dll" />
+		</Component>
+		<Component>
+			<File Source="dcompi.dll" />
+		</Component>
+		<Component>
+			<File Source="dwmcorei.dll" />
+		</Component>
+		<Component>
+			<File Source="DwmSceneI.dll" />
+		</Component>
+		<Component>
+			<File Source="DWriteCore.dll" />
+		</Component>
+		<Component>
+			<File Source="marshal.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.DirectManipulation.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.Graphics.Display.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.InputStateManager.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.Internal.FrameworkUdk.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.UI.Composition.OSSupport.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.UI.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.UI.Input.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.UI.Windowing.Core.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.UI.Windowing.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.UI.Xaml.Controls.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.ui.xaml.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.UI.Xaml.Internal.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.UI.Xaml.Phone.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.ui.xaml.resources.19h1.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.ui.xaml.resources.common.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.Web.WebView2.Core.dll" />
+		</Component>
+		<Component>
+			<File Source="Microsoft.Windows.ApplicationModel.Resources.dll" />
+		</Component>
 	</ComponentGroup>
   </Fragment>
 </Wix>

Modified: redwax-signtext-windows/trunk/Redwax SignText (WinUI3)/Redwax SignText/Redwax SignText/Redwax SignText.vcxproj
==============================================================================
--- redwax-signtext-windows/trunk/Redwax SignText (WinUI3)/Redwax SignText/Redwax SignText/Redwax SignText.vcxproj	(original)
+++ redwax-signtext-windows/trunk/Redwax SignText (WinUI3)/Redwax SignText/Redwax SignText/Redwax SignText.vcxproj	Sat Jun  8 17:59:31 2024
@@ -24,6 +24,11 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
     <UseWinUI>true</UseWinUI>
+	<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+	<SelfContained>true</SelfContained>
+	<EnableMsixTooling>true</EnableMsixTooling>
+    <WindowsPackageType>None</WindowsPackageType>
+    <OutputType>WinExe</OutputType>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ItemGroup Label="ProjectConfigurations">
@@ -161,4 +166,9 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.1.4.230913002\build\native\Microsoft.WindowsAppSDK.targets'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
+	<Target Name="_RemoveFrameworkReferences" BeforeTargets="_ConvertItems;_CalculateInputsForGenerateCurrentProjectAppxManifest">
+		<ItemGroup>
+			<FrameworkSdkReference Remove="@(FrameworkSdkReference)" Condition="$([System.String]::Copy('%(FrameworkSdkReference.SDKName)').StartsWith('Microsoft.WindowsAppRuntime.'))" />
+		</ItemGroup>
+	</Target>
 </Project>