Skip to content

Commit 8f4e07c

Browse files
DevTKSSDevTKSS
committed
refactor: adjust paths and vs code launch + tasks
1 parent a380640 commit 8f4e07c

11 files changed

Lines changed: 88 additions & 70 deletions

File tree

src/.vscode/launch.json renamed to .vscode/launch.json

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,29 @@
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
1017
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/main/debugger-launchjson.md
1118
"name": "Uno Platform Desktop Debug (MvuxGallery)",
1219
"type": "coreclr",
1320
"request": "launch",
14-
"preLaunchTask": "build-desktop",
21+
"preLaunchTask": "build-desktop-MvuxGallery",
1522
// If you have changed target frameworks, make sure to update the program path.
16-
"program": "${workspaceFolder}/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": [],
18-
"launchSettingsProfile": "DevTKSS.Uno.SampleApps.MvuxGallery (Desktop)",
25+
"launchSettingsProfile": "DevTKSS MvuxGallery (Desktop)",
1926
"env": {
2027
"DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
2128
},
22-
"cwd": "${workspaceFolder}/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
@@ -31,15 +38,15 @@
3138
"name": "Uno Platform Desktop Debug (XamlNavigationApp)",
3239
"type": "coreclr",
3340
"request": "launch",
34-
"preLaunchTask": "build-desktop",
41+
"preLaunchTask": "build-desktop-XamlNavigationApp",
3542
// If you have changed target frameworks, make sure to update the program path.
36-
"program": "${workspaceFolder}/DevTKSS.Uno.XamlNavigationApp-1/bin/Debug/net9.0-desktop/DevTKSS.Uno.XamlNavigationApp.dll",
43+
"program": "${workspaceFolder}/src/DevTKSS.Uno.XamlNavigationApp-1/bin/Debug/net9.0-desktop/DevTKSS.Uno.XamlNavigationApp.dll",
3744
"args": [],
3845
"launchSettingsProfile": "DevTKSS.Uno.XamlNavigationApp (Desktop)",
3946
"env": {
4047
"DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
4148
},
42-
"cwd": "${workspaceFolder}/DevTKSS.Uno.XamlNavigationApp-1",
49+
"cwd": "${workspaceFolder}/src/DevTKSS.Uno.XamlNavigationApp-1",
4350
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
4451
"console": "internalConsole",
4552
"stopAtEntry": false
@@ -51,15 +58,15 @@
5158
"name": "Uno Platform Desktop Debug (MvuxListApp)",
5259
"type": "coreclr",
5360
"request": "launch",
54-
"preLaunchTask": "build-desktop",
61+
"preLaunchTask": "build-desktop-MvuxListApp",
5562
// If you have changed target frameworks, make sure to update the program path.
56-
"program": "${workspaceFolder}/DevTKSS.Uno.MvuxListApp/bin/Debug/net9.0-desktop/DevTKSS.Uno.MvuxListApp.dll",
63+
"program": "${workspaceFolder}/src/DevTKSS.Uno.MvuxListApp/bin/Debug/net9.0-desktop/DevTKSS.Uno.MvuxListApp.dll",
5764
"args": [],
5865
"launchSettingsProfile": "DevTKSS.Uno.MvuxListApp (Desktop)",
5966
"env": {
6067
"DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
6168
},
62-
"cwd": "${workspaceFolder}/DevTKSS.Uno.MvuxListApp",
69+
"cwd": "${workspaceFolder}/src/DevTKSS.Uno.MvuxListApp",
6370
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
6471
"console": "internalConsole",
6572
"stopAtEntry": false

‎.vscode/settings.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"files.associations": {
3-
"*.tmpl*": "mustache"
3+
"*.tmpl*": "mustache",
4+
"global.json": "jsonc"
45
},
56
"markdownlint.lintWorkspaceGlobs": [
67
"**/*.{md,mkd,mdwn,mdown,markdown,markdn,mdtxt,mdtext,workbook}",
@@ -10,5 +11,10 @@
1011
"!**/.git",
1112
"!**/vendor",
1213
"!**/copilot-instructions.md"
13-
]
14+
],
15+
"explorer.fileNesting.enabled": true,
16+
"explorer.fileNesting.expand": false,
17+
"explorer.fileNesting.patterns": {
18+
"*.xaml": "$(capture).xaml.cs"
19+
}
1420
}

src/.vscode/tasks.json renamed to .vscode/tasks.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,77 +2,77 @@
22
"version": "2.0.0",
33
"tasks": [
44
{
5-
"label": "build-desktop MvuxGallery",
5+
"label": "build-desktop-MvuxGallery",
66
"command": "dotnet",
77
"type": "process",
88
"args": [
99
"build",
10-
"${workspaceFolder}/DevTKSS.Uno.SampleApps.MvuxGallery/DevTKSS.Uno.SampleApps.MvuxGallery.csproj",
10+
"${workspaceFolder}/src/DevTKSS.Uno.Samples.MvuxGallery/DevTKSS.Uno.Samples.MvuxGallery.csproj",
1111
"/property:GenerateFullPaths=true",
1212
"/property:TargetFramework=net9.0-desktop",
1313
"/consoleloggerparameters:NoSummary"
1414
],
1515
"problemMatcher": "$msCompile"
1616
},
1717
{
18-
"label": "publish-desktop MvuxGallery",
18+
"label": "publish-desktop-MvuxGallery",
1919
"command": "dotnet",
2020
"type": "process",
2121
"args": [
2222
"publish",
23-
"${workspaceFolder}/DevTKSS.Uno.SampleApps.MvuxGallery/DevTKSS.Uno.SampleApps.MvuxGallery.csproj",
23+
"${workspaceFolder}/src/DevTKSS.Uno.Samples.MvuxGallery/DevTKSS.Uno.Samples.MvuxGallery.csproj",
2424
"/property:GenerateFullPaths=true",
2525
"/property:TargetFramework=net9.0-desktop",
2626
"/consoleloggerparameters:NoSummary"
2727
],
2828
"problemMatcher": "$msCompile"
2929
},
3030
{
31-
"label": "build-desktop XamlNavigationApp",
31+
"label": "build-desktop-XamlNavigationApp",
3232
"command": "dotnet",
3333
"type": "process",
3434
"args": [
3535
"build",
36-
"${workspaceFolder}/DevTKSS.Uno.XamlNavigationApp-1/DevTKSS.Uno.XamlNavigationApp.csproj",
36+
"${workspaceFolder}/src/DevTKSS.Uno.XamlNavigationApp-1/DevTKSS.Uno.XamlNavigationApp.csproj",
3737
"/property:GenerateFullPaths=true",
3838
"/property:TargetFramework=net9.0-desktop",
3939
"/consoleloggerparameters:NoSummary"
4040
],
4141
"problemMatcher": "$msCompile"
4242
},
4343
{
44-
"label": "publish-desktop XamlNavigationApp",
44+
"label": "publish-desktop-XamlNavigationApp",
4545
"command": "dotnet",
4646
"type": "process",
4747
"args": [
4848
"publish",
49-
"${workspaceFolder}/DevTKSS.Uno.XamlNavigationApp-1/DevTKSS.Uno.XamlNavigationApp.csproj",
49+
"${workspaceFolder}/src/DevTKSS.Uno.XamlNavigationApp-1/DevTKSS.Uno.XamlNavigationApp.csproj",
5050
"/property:GenerateFullPaths=true",
5151
"/property:TargetFramework=net9.0-desktop",
5252
"/consoleloggerparameters:NoSummary"
5353
],
5454
"problemMatcher": "$msCompile"
5555
},
5656
{
57-
"label": "build-desktop MvuxListApp",
57+
"label": "build-desktop-MvuxListApp",
5858
"command": "dotnet",
5959
"type": "process",
6060
"args": [
6161
"build",
62-
"${workspaceFolder}/DevTKSS.Uno.MvuxListApp/DevTKSS.Uno.MvuxListApp.csproj",
62+
"${workspaceFolder}/src/DevTKSS.Uno.MvuxListApp/DevTKSS.Uno.MvuxListApp.csproj",
6363
"/property:GenerateFullPaths=true",
6464
"/property:TargetFramework=net9.0-desktop",
6565
"/consoleloggerparameters:NoSummary"
6666
],
6767
"problemMatcher": "$msCompile"
6868
},
6969
{
70-
"label": "publish-desktop MvuxListApp",
70+
"label": "publish-desktop-MvuxListApp",
7171
"command": "dotnet",
7272
"type": "process",
7373
"args": [
7474
"publish",
75-
"${workspaceFolder}/DevTKSS.Uno.MvuxListApp/DevTKSS.Uno.MvuxListApp.csproj",
75+
"${workspaceFolder}/src/DevTKSS.Uno.MvuxListApp/DevTKSS.Uno.MvuxListApp.csproj",
7676
"/property:GenerateFullPaths=true",
7777
"/property:TargetFramework=net9.0-desktop",
7878
"/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/.vscode/extensions.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/.vscode/settings.json‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎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: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,16 @@
3636
<UnoFeatures>
3737
Material;
3838
Dsp;
39-
Hosting;
4039
Toolkit;
4140
Logging;
4241
MVUX;
4342
Configuration;
4443
Localization;
4544
Navigation;
4645
ThemeService;
47-
Serialization;
4846
Storage;
4947
</UnoFeatures>
48+
5049
</PropertyGroup>
5150
<ItemGroup>
5251
<PackageReference Include="CommunityToolkit.WinUI.Converters" />
@@ -59,5 +58,4 @@
5958
<ItemGroup>
6059
<ProjectReference Include="..\DevTKSS.Extensions.Uno.Storage\DevTKSS.Extensions.Uno.Storage.csproj" />
6160
</ItemGroup>
62-
6361
</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>

0 commit comments

Comments
 (0)