Skip to content

Commit a612e11

Browse files
ShortDevelopmentShortDevelopment
committed
Cleanup
1 parent 54af6a3 commit a612e11

19 files changed

+237
-174
lines changed

‎Directory.Build.props

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
<Project>
22
<PropertyGroup>
3-
<LangVersion>12</LangVersion>
3+
<LangVersion>preview</LangVersion>
44
<Nullable Condition=" '$(Nullable)' == '' ">enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
</PropertyGroup>
77

88
<PropertyGroup>
99
<UseUwp>true</UseUwp>
1010
<UseUwpTools>true</UseUwpTools>
11+
<EnableXamlCompilerTargetsForUwpApps Condition=" '$(EnableXamlCompilerTargetsForUwpApps)' == '' ">false</EnableXamlCompilerTargetsForUwpApps>
12+
</PropertyGroup>
13+
14+
<PropertyGroup>
15+
<Platforms>x86;x64;arm64</Platforms>
16+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
1117
</PropertyGroup>
1218
</Project>

‎Microsoft.UI.Xaml/WinUI2.csproj

-30
This file was deleted.

‎ShortDev.Uwp.Compose/ComposeApp.cs ‎ShortDev.Uwp.Compose/App.cs

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
using Microsoft.UI.Xaml.Markup;
1+
using Microsoft.UI.Xaml.XamlTypeInfo;
22
using ShortDev.Uwp.FullTrust.Xaml;
33
using Windows.ApplicationModel.Activation;
44
using Windows.UI.Xaml;
55
using Windows.UI.Xaml.Markup;
66

77
namespace ShortDev.Uwp.Compose;
88

9-
internal sealed class ComposeApp : FullTrustApplication
9+
sealed partial class App : FullTrustApplication, IXamlMetadataProvider
1010
{
11-
public ComposeApp()
11+
public App()
1212
{
1313
UnhandledException += ComposeApp_UnhandledException;
1414
}
@@ -25,12 +25,18 @@ private void ComposeApp_UnhandledException(object sender, Windows.UI.Xaml.Unhand
2525
protected override void OnActivated(IActivatedEventArgs args)
2626
{
2727
// Resources = new Microsoft.UI.Xaml.Controls.XamlControlsResources();
28+
2829
Window.Current.Content = ContentFactory();
2930
Window.Current.Activate();
3031
}
3132

32-
protected override IReadOnlyList<IXamlMetadataProvider> MetadataProviders { get; } = [
33-
// new Microsoft.UI.Xaml.XamlTypeInfo.XamlControlsXamlMetaDataProvider(),
34-
new ReflectionXamlMetadataProvider()
35-
];
33+
readonly XamlControlsXamlMetaDataProvider _provider = new();
34+
public IXamlType GetXamlType(Type type)
35+
=> _provider.GetXamlType(type);
36+
37+
public IXamlType GetXamlType(string fullName)
38+
=> _provider.GetXamlType(fullName);
39+
40+
public XmlnsDefinition[] GetXmlnsDefinitions()
41+
=> _provider.GetXmlnsDefinitions();
3642
}

‎ShortDev.Uwp.Compose/Bindings/RefValue.cs

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
1-
using Windows.UI.Xaml;
1+
using System.ComponentModel;
22

33
namespace ShortDev.Uwp.Compose.Bindings;
44

5-
public sealed class RefValue<T> : DependencyObject
5+
public sealed partial class RefValue<T> : INotifyPropertyChanged, INotifyPropertyChanging
66
{
77
public RefValue(T defaultValue)
88
=> Value = defaultValue;
99

1010
public T Value
1111
{
12-
get => (T)GetValue(ValueProperty);
13-
set => SetValue(ValueProperty, value);
12+
get => field;
13+
set
14+
{
15+
PropertyChanging?.Invoke(this, PropertyChangingEventArgs);
16+
field = value;
17+
PropertyChanged?.Invoke(this, PropertyChangedEventArgs);
18+
}
1419
}
1520

16-
internal static DependencyProperty ValueProperty { get; } = DependencyProperty.Register(nameof(Value), typeof(T), typeof(RefValue<T>), new(default));
21+
public event PropertyChangedEventHandler? PropertyChanged;
22+
public event PropertyChangingEventHandler? PropertyChanging;
23+
24+
static readonly PropertyChangedEventArgs PropertyChangedEventArgs = new(nameof(Value));
25+
static readonly PropertyChangingEventArgs PropertyChangingEventArgs = new(nameof(Value));
1726
}

‎ShortDev.Uwp.Compose/ComposerExtensions.cs

+14-13
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,25 @@ public static T Apply<T>(this T @this, Action<T> action) where T : UIElement
1313
return @this;
1414
}
1515

16-
public static T Bind<T, TBindingValue>(this T @this, DependencyProperty target, RefValue<TBindingValue> refValue, BindingMode mode = BindingMode.OneWay, Func<TBindingValue, object>? converterFn = null, IValueConverter? converter = null) where T : UIElement
16+
public static T Bind<T, TValue>(this T @this, DependencyProperty target, RefValue<TValue> refValue, IValueConverter converter) where T : UIElement
17+
=> @this.Bind(target, refValue, x => converter.Convert(x, typeof(TValue), null, null));
18+
19+
public static T Bind<T, TValue>(this T @this, DependencyProperty target, RefValue<TValue> refValue, Func<TValue, object> converter) where T : UIElement
1720
{
18-
if (converterFn != null)
19-
converter = new SimpleLambdaConverter<TBindingValue>(converterFn);
21+
SetValue(null, null);
22+
refValue.PropertyChanged += SetValue;
23+
return @this;
2024

21-
Binding binding = new()
25+
void SetValue(object? sender, EventArgs? e)
2226
{
23-
Source = refValue,
24-
Path = new("Value"),
25-
Mode = mode,
26-
Converter = converter
27-
};
28-
BindingOperations.SetBinding(@this, target, binding);
29-
30-
return @this;
27+
if (converter is null)
28+
@this.SetValue(target, refValue.Value);
29+
else
30+
@this.SetValue(target, converter(refValue.Value));
31+
}
3132
}
3233

33-
private sealed partial class SimpleLambdaConverter<TBindingValue>(Func<TBindingValue, object> converter) : IValueConverter
34+
private sealed partial class LambdaValueConverter<TBindingValue>(Func<TBindingValue, object> converter) : IValueConverter
3435
{
3536
public object Convert(object value, Type targetType, object parameter, string language)
3637
{

‎ShortDev.Uwp.Compose/Package.appxmanifest

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<Package
4+
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
5+
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
6+
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
7+
IgnorableNamespaces="uap mp">
8+
9+
<Identity
10+
Name="e6ce6602-e790-4e7d-afd3-bd422c19df1f"
11+
Publisher="CN=lukas"
12+
Version="1.0.0.0" />
13+
14+
<mp:PhoneIdentity PhoneProductId="e6ce6602-e790-4e7d-afd3-bd422c19df1f" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
15+
16+
<Properties>
17+
<DisplayName>App1</DisplayName>
18+
<PublisherDisplayName>lukas</PublisherDisplayName>
19+
<Logo>Assets\StoreLogo.png</Logo>
20+
</Properties>
21+
22+
<Dependencies>
23+
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="12.0.0.0" />
24+
</Dependencies>
25+
26+
<Resources>
27+
<Resource Language="x-generate"/>
28+
</Resources>
29+
30+
<Applications>
31+
<Application Id="App"
32+
Executable="$targetnametoken$.exe"
33+
EntryPoint="App1.App">
34+
<uap:VisualElements
35+
DisplayName="App1"
36+
Square150x150Logo="Assets\Square150x150Logo.png"
37+
Square44x44Logo="Assets\Square44x44Logo.png"
38+
Description="App1"
39+
BackgroundColor="transparent">
40+
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
41+
<uap:SplashScreen Image="Assets\SplashScreen.png" />
42+
</uap:VisualElements>
43+
</Application>
44+
</Applications>
45+
46+
<Capabilities>
47+
<Capability Name="internetClient" />
48+
</Capabilities>
49+
</Package>

‎ShortDev.Uwp.Compose/Program.cs

+15-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using ShortDev.Uwp.Compose;
2-
using ShortDev.Uwp.FullTrust.Core;
3-
using Windows.Storage.Pickers;
42
using Windows.UI;
53
using Windows.UI.Xaml.Controls;
64
using Windows.UI.Xaml.Media;
@@ -9,7 +7,7 @@
97
Run(() =>
108
{
119
TextBlock tb = null!;
12-
var counter = Ref(0L);
10+
var counter = Ref(1L);
1311

1412
return new StackPanel()
1513
{
@@ -20,7 +18,7 @@
2018
{
2119
new TextBlock()
2220
.Ref(ref tb)
23-
.Bind(TextBlock.TextProperty, counter, converterFn: x => $"Some Text: {x} clicks"),
21+
.Bind(TextBlock.TextProperty, counter, static x => $"Some Text: {x} clicks"),
2422

2523
new Button()
2624
{
@@ -31,10 +29,18 @@
3129
counter.Value++;
3230
tb.Foreground = Brush(Color.FromArgb(255, 255, 100, 100));
3331

34-
FolderPicker picker = new();
35-
picker.InitializeWithCoreWindow();
36-
await picker.PickSingleFolderAsync();
37-
})
32+
//FolderPicker picker = new();
33+
//picker.InitializeWithCoreWindow();
34+
//await picker.PickSingleFolderAsync();
35+
36+
ContentDialog dialog = new() {
37+
Content = new TextBox(),
38+
XamlRoot = tb.XamlRoot
39+
};
40+
await dialog.ShowAsync();
41+
}),
42+
43+
new TextBox()
3844
}
3945
};
40-
});
46+
});

‎ShortDev.Uwp.Compose/ShortDev.Uwp.Compose.csproj

+16-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,29 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
5+
<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
6+
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
7+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
8+
<UseUwp>true</UseUwp>
9+
<UseUwpTools>true</UseUwpTools>
10+
<EnableMsixTooling>true</EnableMsixTooling>
11+
<EnableXamlCompilerTargetsForUwpApps>true</EnableXamlCompilerTargetsForUwpApps>
12+
<ApplicationManifest>app.manifest</ApplicationManifest>
613
</PropertyGroup>
714

815
<ItemGroup>
9-
<PackageReference Include="Microsoft.UI.Xaml" Version="2.8.6" />
16+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.8.7-prerelease.241119001" />
17+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
1018
</ItemGroup>
1119

1220
<ItemGroup>
1321
<ProjectReference Include="..\ShortDev.Uwp.FullTrust\ShortDev.Uwp.FullTrust.csproj" />
1422
</ItemGroup>
1523

24+
<ItemGroup>
25+
<None Update="Package.appxmanifest">
26+
<SubType>Designer</SubType>
27+
</None>
28+
</ItemGroup>
29+
1630
</Project>

‎ShortDev.Uwp.Compose/Utils.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@ public static Thickness Thickness(double uniformLength)
7676
=> new(uniformLength);
7777

7878
public static void Run(Func<UIElement> contentFactory)
79-
=> FullTrustApplication.Start(p => _ = new ComposeApp() { ContentFactory = contentFactory });
79+
=> FullTrustApplication.Start(p => _ = new App() { ContentFactory = contentFactory });
8080
}

‎ShortDev.Uwp.Compose/app.manifest

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
4+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
5+
<security>
6+
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
7+
<!-- UAC Manifest Options
8+
If you want to change the Windows User Account Control level replace the
9+
requestedExecutionLevel node with one of the following.
10+
11+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
12+
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
13+
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
14+
15+
Specifying requestedExecutionLevel element will disable file and registry virtualization.
16+
Remove this element if your application requires this virtualization for backwards
17+
compatibility.
18+
-->
19+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
20+
</requestedPrivileges>
21+
</security>
22+
</trustInfo>
23+
24+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
25+
<application>
26+
<!-- A list of the Windows versions that this application has been tested on
27+
and is designed to work with. Uncomment the appropriate elements
28+
and Windows will automatically select the most compatible environment. -->
29+
30+
<!-- Windows Vista -->
31+
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
32+
33+
<!-- Windows 7 -->
34+
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
35+
36+
<!-- Windows 8 -->
37+
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
38+
39+
<!-- Windows 8.1 -->
40+
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
41+
42+
<!-- Windows 10 -->
43+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
44+
45+
</application>
46+
</compatibility>
47+
48+
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
49+
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
50+
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
51+
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config.
52+
53+
Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
54+
<!--
55+
<application xmlns="urn:schemas-microsoft-com:asm.v3">
56+
<windowsSettings>
57+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
58+
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
59+
</windowsSettings>
60+
</application>
61+
-->
62+
63+
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
64+
<!--
65+
<dependency>
66+
<dependentAssembly>
67+
<assemblyIdentity
68+
type="win32"
69+
name="Microsoft.Windows.Common-Controls"
70+
version="6.0.0.0"
71+
processorArchitecture="*"
72+
publicKeyToken="6595b64144ccf1df"
73+
language="*"
74+
/>
75+
</dependentAssembly>
76+
</dependency>
77+
-->
78+
79+
</assembly>

0 commit comments

Comments
 (0)