Skip to content

Commit f61cd0f

Browse files
DevTKSSDevTKSS
committed
refactor: adjust paths and vs code launch + tasks
1 parent ad0e9c1 commit f61cd0f

File tree

8 files changed

+98
-69
lines changed

8 files changed

+98
-69
lines changed

‎.vscode/launch.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/main/debugger-launchjson.md
55
"version": "0.2.0",
66
"configurations": [
7+
{
8+
"name": "Uno Platform MvuxGallery Desktop Debug",
9+
"type": "Uno",
10+
"request": "launch",
11+
// any Uno* task will do, this is simply to satisfy vscode requirement when a launch.json is present
12+
"preLaunchTask": "Uno: net9.0-desktop | Debug"
13+
},
714
{
815
// Use IntelliSense to find out which attributes exist for C# debugging
916
// Use hover for the description of the existing attributes
@@ -13,13 +20,13 @@
1320
"request": "launch",
1421
"preLaunchTask": "build-desktop-MvuxGallery",
1522
// If you have changed target frameworks, make sure to update the program path.
16-
"program": "${workspaceFolder}/src/DevTKSS.Uno.SampleApps.MvuxGallery/bin/Debug/net9.0-desktop/DevTKSS.Uno.SampleApps.MvuxGallery.dll",
23+
"program": "${workspaceFolder}/src/DevTKSS.Uno.Samples.MvuxGallery/bin/Debug/net9.0-desktop/DevTKSS.Uno.Samples.MvuxGallery.dll",
1724
"args": [],
1825
"launchSettingsProfile": "DevTKSS MvuxGallery (Desktop)",
1926
"env": {
2027
"DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
2128
},
22-
"cwd": "${workspaceFolder}/src/DevTKSS.Uno.SampleApps.MvuxGallery",
29+
"cwd": "${workspaceFolder}/src/DevTKSS.Uno.Samples.MvuxGallery",
2330
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
2431
"console": "internalConsole",
2532
"stopAtEntry": false
@@ -48,7 +55,7 @@
4855
"name": "Uno Platform Desktop Debug (MvuxListApp)",
4956
"type": "coreclr",
5057
"request": "launch",
51-
"preLaunchTask": "build-desktop",
58+
"preLaunchTask": "build-desktop-MvuxListApp",
5259
// If you have changed target frameworks, make sure to update the program path.
5360
"program": "${workspaceFolder}/src/DevTKSS.Uno.MvuxListApp/bin/Debug/net9.0-desktop/DevTKSS.Uno.MvuxListApp.dll",
5461
"args": [],

‎.vscode/tasks.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,52 +53,53 @@
5353
],
5454
"problemMatcher": "$msCompile"
5555
},
56-
{
57-
"label": "build-desktop-SimpleMemberSelectionApp",
56+
57+
{
58+
"label": "build-desktop-MvuxListApp",
5859
"command": "dotnet",
5960
"type": "process",
6061
"args": [
6162
"build",
62-
"${workspaceFolder}/src/DevTKSS.Uno.SimpleMemberSelectionApp/DevTKSS.Uno.SimpleMemberSelectionApp.csproj",
63+
"${workspaceFolder}/src/DevTKSS.Uno.MvuxListApp/DevTKSS.Uno.MvuxListApp.csproj",
6364
"/property:GenerateFullPaths=true",
6465
"/property:TargetFramework=net9.0-desktop",
6566
"/consoleloggerparameters:NoSummary"
6667
],
6768
"problemMatcher": "$msCompile"
6869
},
6970
{
70-
"label": "publish-desktop-SimpleMemberSelectionApp",
71+
"label": "publish-desktop-MvuxListApp",
7172
"command": "dotnet",
7273
"type": "process",
7374
"args": [
7475
"publish",
75-
"${workspaceFolder}/src/DevTKSS.Uno.SimpleMemberSelectionApp/DevTKSS.Uno.SimpleMemberSelectionApp.csproj",
76+
"${workspaceFolder}/src/DevTKSS.Uno.MvuxListApp/DevTKSS.Uno.MvuxListApp.csproj",
7677
"/property:GenerateFullPaths=true",
7778
"/property:TargetFramework=net9.0-desktop",
7879
"/consoleloggerparameters:NoSummary"
7980
],
8081
"problemMatcher": "$msCompile"
8182
},
8283
{
83-
"label": "build-desktop MvuxListApp",
84+
"label": "build-desktop-SimpleMemberSelectionApp",
8485
"command": "dotnet",
8586
"type": "process",
8687
"args": [
8788
"build",
88-
"${workspaceFolder}/src/DevTKSS.Uno.MvuxListApp/DevTKSS.Uno.MvuxListApp.csproj",
89+
"${workspaceFolder}/src/DevTKSS.Uno.SimpleMemberSelectionApp/DevTKSS.Uno.SimpleMemberSelectionApp.csproj",
8990
"/property:GenerateFullPaths=true",
9091
"/property:TargetFramework=net9.0-desktop",
9192
"/consoleloggerparameters:NoSummary"
9293
],
9394
"problemMatcher": "$msCompile"
9495
},
9596
{
96-
"label": "publish-desktop MvuxListApp",
97+
"label": "publish-desktop-SimpleMemberSelectionApp",
9798
"command": "dotnet",
9899
"type": "process",
99100
"args": [
100101
"publish",
101-
"${workspaceFolder}/src/DevTKSS.Uno.MvuxListApp/DevTKSS.Uno.MvuxListApp.csproj",
102+
"${workspaceFolder}/src/DevTKSS.Uno.SimpleMemberSelectionApp/DevTKSS.Uno.SimpleMemberSelectionApp.csproj",
102103
"/property:GenerateFullPaths=true",
103104
"/property:TargetFramework=net9.0-desktop",
104105
"/consoleloggerparameters:NoSummary"

‎src/.run/UnoHotDesignApp1.run.xml‎

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="DevTKSS.Uno.SampleApps.MvuxGallery (Desktop)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
3-
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/DevTKSS.Uno.SampleApps.MvuxGallery/DevTKSS.Uno.SampleApps.MvuxGallery.csproj" />
3+
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/src/DevTKSS.Uno.Samples.MvuxGallery/DevTKSS.Uno.Samples.MvuxGallery.csproj" />
44
<option name="LAUNCH_PROFILE_TFM" value="net9.0-desktop" />
5-
<option name="LAUNCH_PROFILE_NAME" value="DevTKSS.Uno.SampleApps.MvuxGallery (Desktop)" />
5+
<option name="LAUNCH_PROFILE_NAME" value="DevTKSS MvuxGallery (Desktop)" />
66
<option name="USE_EXTERNAL_CONSOLE" value="0" />
77
<option name="USE_MONO" value="0" />
88
<option name="RUNTIME_ARGUMENTS" value="" />
@@ -14,10 +14,42 @@
1414
<option name="Build" />
1515
</method>
1616
</configuration>
17-
<configuration default="false" name="DevTKSS.Uno.SampleApps.MvuxGallery (WinAppSDK Unpackaged)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
18-
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/DevTKSS.Uno.SampleApps.MvuxGallery/DevTKSS.Uno.SampleApps.MvuxGallery.csproj" />
17+
<configuration default="false" name="DevTKSS MvuxGallery (WinAppSDK Unpackaged)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
18+
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/src/DevTKSS.Uno.Samples.MvuxGallery/DevTKSS.Uno.Samples.MvuxGallery.csproj" />
1919
<option name="LAUNCH_PROFILE_TFM" value="net9.0-windows10.0.26100.0" />
20-
<option name="LAUNCH_PROFILE_NAME" value="DevTKSS.Uno.SampleApps.MvuxGallery (WinAppSDK Unpackaged)" />
20+
<option name="LAUNCH_PROFILE_NAME" value="DevTKSS MvuxGallery (WinAppSDK Unpackaged)" />
21+
<option name="USE_EXTERNAL_CONSOLE" value="0" />
22+
<option name="USE_MONO" value="0" />
23+
<option name="RUNTIME_ARGUMENTS" value="" />
24+
<option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
25+
<option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
26+
<option name="SEND_DEBUG_REQUEST" value="1" />
27+
<option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
28+
<method v="2">
29+
<option name="Build" />
30+
</method>
31+
</configuration>
32+
<!-- MvuxListApp (Desktop) -->
33+
<configuration default="false" name="DevTKSS.Uno.MvuxListApp (Desktop)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
34+
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/src/DevTKSS.Uno.MvuxListApp/DevTKSS.Uno.MvuxListApp.csproj" />
35+
<option name="LAUNCH_PROFILE_TFM" value="net9.0-desktop" />
36+
<option name="LAUNCH_PROFILE_NAME" value="DevTKSS.Uno.MvuxListApp (Desktop)" />
37+
<option name="USE_EXTERNAL_CONSOLE" value="0" />
38+
<option name="USE_MONO" value="0" />
39+
<option name="RUNTIME_ARGUMENTS" value="" />
40+
<option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
41+
<option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
42+
<option name="SEND_DEBUG_REQUEST" value="1" />
43+
<option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
44+
<method v="2">
45+
<option name="Build" />
46+
</method>
47+
</configuration>
48+
<!-- XamlNavigationApp (Desktop) -->
49+
<configuration default="false" name="DevTKSS.Uno.XamlNavigationApp (Desktop)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
50+
<option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/src/DevTKSS.Uno.XamlNavigationApp-1/DevTKSS.Uno.XamlNavigationApp.csproj" />
51+
<option name="LAUNCH_PROFILE_TFM" value="net9.0-desktop" />
52+
<option name="LAUNCH_PROFILE_NAME" value="DevTKSS.Uno.XamlNavigationApp (Desktop)" />
2153
<option name="USE_EXTERNAL_CONSOLE" value="0" />
2254
<option name="USE_MONO" value="0" />
2355
<option name="RUNTIME_ARGUMENTS" value="" />

‎src/DevTKSS.Uno.Samples.MvuxGallery/App.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</ResourceDictionary>
2020
</utum:MaterialToolkitTheme.FontOverrideDictionary> -->
2121
</utum:MaterialToolkitTheme>
22-
<ResourceDictionary Source="ms-appx:///Styles/GalleryTemplates.xaml"/>
22+
<ResourceDictionary Source="ms-appx:///DataTemplates/GalleryTemplates.xaml"/>
2323
</ResourceDictionary.MergedDictionaries>
2424

2525
<!-- Add resources here -->

‎src/DevTKSS.Uno.Samples.MvuxGallery/App.xaml.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,6 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
9090
.AddKeyedSingletonCodeService("CounterSamples")
9191
)
9292
.UseNavigation(ReactiveViewModelMappings.ViewModelMappings, RegisterRoutes)
93-
.UseSerialization((context, services) =>
94-
services
95-
.AddContentSerializer(context)
96-
.AddJsonTypeInfo(CodeSampleOptionsContext.Default.CodeSample)
97-
.AddJsonTypeInfo(CodeSampleOptionsContext.Default.Lines)
98-
.AddJsonTypeInfo(CodeSampleOptionsContext.Default.CodeSampleArray)
99-
.AddJsonTypeInfo(CodeSampleOptionsContext.Default.LinesArray)
100-
.AddJsonTypeInfo(CodeSampleOptionsContext.Default.CodeSampleOptions)
101-
102-
.AddSingleton(new JsonSerializerOptions { PropertyNameCaseInsensitive = true })
103-
)
10493
);
10594
MainWindow = builder.Window;
10695

‎src/DevTKSS.Uno.Samples.MvuxGallery/DevTKSS.Uno.Samples.MvuxGallery.csproj‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,37 +29,36 @@
2929
-->
3030
<!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> -->
3131

32-
<!--
33-
UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use.
34-
https://aka.platform.uno/singleproject-features
35-
-->
36-
<UnoFeatures>
37-
Material;
38-
Dsp;
39-
Toolkit;
40-
Logging;
41-
MVUX;
42-
Configuration;
43-
Localization;
44-
Navigation;
45-
ThemeService;
46-
Serialization;
47-
Storage;
48-
</UnoFeatures>
49-
</PropertyGroup>
32+
<!--
33+
UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use.
34+
https://aka.platform.uno/singleproject-features
35+
-->
36+
<UnoFeatures>
37+
Material;
38+
Dsp;
39+
Toolkit;
40+
Logging;
41+
MVUX;
42+
Configuration;
43+
Localization;
44+
Navigation;
45+
ThemeService;
46+
Storage;
47+
</UnoFeatures>
48+
</PropertyGroup>
5049

51-
<ItemGroup>
52-
<PackageReference Include="CommunityToolkit.WinUI.Converters" />
53-
</ItemGroup>
50+
<ItemGroup>
51+
<PackageReference Include="CommunityToolkit.WinUI.Converters" />
52+
</ItemGroup>
5453

55-
<ItemGroup>
56-
<UnoImage Include="Assets\Images\*" />
57-
<Resource Include="Assets\Samples\*.txt" CopyToOutputDirectory="PreserveNewest" />
58-
<UnoSplashScreen Include="Assets\SplashScreens\*" />
59-
</ItemGroup>
54+
<ItemGroup>
55+
<UnoImage Include="Assets\Images\*" />
56+
<Resource Include="Assets\Samples\*.txt" CopyToOutputDirectory="PreserveNewest" />
57+
<UnoSplashScreen Include="Assets\SplashScreens\*" />
58+
</ItemGroup>
6059

61-
<ItemGroup>
62-
<ProjectReference Include="..\DevTKSS.Extensions.Uno.Storage\DevTKSS.Extensions.Uno.Storage.csproj" />
63-
</ItemGroup>
60+
<ItemGroup>
61+
<ProjectReference Include="..\DevTKSS.Extensions.Uno.Storage\DevTKSS.Extensions.Uno.Storage.csproj" />
62+
</ItemGroup>
6463

6564
</Project>

‎src/DevTKSS.Uno.Samples.MvuxGallery/Presentation/Views/MainPage.xaml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,21 @@
1111
NavigationCacheMode="Required"
1212
Background="{ThemeResource BackgroundBrush}">
1313

14-
<Page.Resources>
15-
<ctk:BoolNegationConverter x:Name="InvertBoolConv"/>
16-
<Thickness x:Key="NavigationViewHeaderMargin">20,20,20,20</Thickness>
17-
<!--Would expect this to be not needed when setting IsTitleBarAutoPaddingEnabled to false, but that does not do anything, so use this instead.
18-
https://learn.microsoft.com/de-de/windows/apps/design/controls/navigationview#top-whitespace-->
19-
</Page.Resources>
20-
<Grid x:Name="MainContentGrid"
21-
uen:Region.Attached="True"
22-
utu:SafeArea.Insets="VisibleBounds">
14+
<Page.Resources>
15+
<ctk:BoolNegationConverter x:Name="InvertBoolConv"/>
16+
<Thickness x:Key="NavigationViewHeaderMargin">20,20,20,20</Thickness>
17+
<!--Would expect this to be not needed when setting IsTitleBarAutoPaddingEnabled to false, but that does not do anything, so use this instead.
18+
https://learn.microsoft.com/de-de/windows/apps/design/controls/navigationview#top-whitespace-->
19+
</Page.Resources>
20+
<Grid x:Name="MainContentGrid"
21+
uen:Region.Attached="True"
22+
utu:SafeArea.Insets="VisibleBounds">
2323
<Grid.RowDefinitions>
2424
<RowDefinition Height="*" />
2525
<RowDefinition Height="Auto"/>
2626
</Grid.RowDefinitions>
27-
<NavigationView Grid.Row="0"
27+
<NavigationView OpenPaneLength="250"
28+
Grid.Row="0"
2829
IsBackButtonVisible="Collapsed"
2930
IsTitleBarAutoPaddingEnabled="True"
3031
IsPaneToggleButtonVisible="True"
@@ -93,4 +94,4 @@
9394
</Expander>
9495
</Grid>
9596

96-
</Page>
97+
</Page>

src/DevTKSS.Uno.Samples.MvuxGallery/DataTemplates/GalleryTemplates.xaml renamed to src/DevTKSS.Uno.Samples.MvuxGallery/Templates/GalleryTemplates.xaml

File renamed without changes.

0 commit comments

Comments
 (0)