Skip to content

Commit c18290a

Browse files
committed
fix(CodeSampleService): Build failures in vs code, resolved missing usings and reverted Type changes of arguments
1 parent 822d286 commit c18290a

File tree

7 files changed

+16
-6
lines changed

7 files changed

+16
-6
lines changed

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"type": "Uno",
1010
"request": "launch",
1111
// 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"
12+
"preLaunchTask": "build-desktop-MvuxGallery"
1313
},
1414
{
1515
// Use IntelliSense to find out which attributes exist for C# debugging

DevTKSS.Uno.SampleApps.slnx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,13 @@
2626
<Folder Name="/Extensions/">
2727
<Project Path="src/DevTKSS.Extensions.Uno.Storage/DevTKSS.Extensions.Uno.Storage.csproj" />
2828
</Folder>
29+
<Folder Name="/Gallery/">
30+
<Project Path="src/DevTKSS.Uno.Samples.MvuxGallery/DevTKSS.Uno.Samples.MvuxGallery.csproj">
31+
<Deploy />
32+
</Project>
2933
<Folder Name="/Tutorials/">
30-
<Project Path="src/DevTKSS.Uno.Samples.MvuxGallery/DevTKSS.Uno.Samples.MvuxGallery.csproj" />
3134
<Project Path="src/DevTKSS.Uno.XamlNavigationApp/DevTKSS.Uno.XamlNavigationApp.csproj" />
35+
<Project Path="src/DevTKSS.Uno.MvuxListApp/DevTKSS.Uno.MvuxListApp.csproj" />
3236
<Project Path="src/DevTKSS.Uno.SimpleMemberSelectionApp/DevTKSS.Uno.SimpleMemberSelectionApp.csproj" />
3337
</Folder>
3438
</Solution>

src/DevTKSS.Uno.SampleApps-Tutorials.slnf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"path": "..\\DevTKSS.Uno.SampleApps.slnx",
44
"projects": [
55
"DevTKSS.Uno.XamlNavigationApp\\DevTKSS.Uno.XamlNavigationApp.csproj",
6-
"DevTKSS.Uno.MvuxListApp\\DevTKSS.Uno.MvuxListApp.csproj"
6+
"DevTKSS.Uno.MvuxListApp\\DevTKSS.Uno.MvuxListApp.csproj",
7+
"DevTKSS.Uno.SimpleMemberSelectionApp\\DevTKSS.Uno.SimpleMemberSelectionApp.csproj",
78
]
89
}
910
}

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:///DataTemplates/GalleryTemplates.xaml"/>
22+
<ResourceDictionary Source="ms-appx:///Templates/GalleryTemplates.xaml"/>
2323
</ResourceDictionary.MergedDictionaries>
2424

2525
<!-- Add resources here -->
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
global using System.Collections.Immutable;
22
global using System.Text.Json.Serialization;
3+
34
global using DevTKSS.Extensions.Uno.Storage;
45
global using DevTKSS.Uno.Samples.MvuxGallery.Models;
56
global using DevTKSS.Uno.Samples.MvuxGallery.Models.CodeSamples;
67
global using DevTKSS.Uno.Samples.MvuxGallery.Models.GalleryImages;
78
global using DevTKSS.Uno.Samples.MvuxGallery.Presentation;
89
global using DevTKSS.Uno.Samples.MvuxGallery.Presentation.ViewModels;
910
global using DevTKSS.Uno.Samples.MvuxGallery.Presentation.Views;
11+
global using DevTKSS.Uno.Samples.MvuxGallery.Services;
12+
1013
global using Microsoft.Extensions.DependencyInjection;
1114
global using Microsoft.Extensions.Hosting;
1215
global using Microsoft.Extensions.Localization;
1316
global using Microsoft.Extensions.Logging;
1417
global using Microsoft.Extensions.Options;
1518
global using Microsoft.UI.Xaml.Data;
19+
1620
global using Uno.Extensions.Reactive.Commands;
21+
1722
global using ApplicationExecutionState = Windows.ApplicationModel.Activation.ApplicationExecutionState;
1823
[assembly: Uno.Extensions.Reactive.Config.BindableGenerationTool(3)]

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/ServiceProviderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static CodeSampleService ConfigureCodeSampleService(this IServiceProvider
2222
var logger = serviceProvider.GetRequiredService<ILogger<CodeSampleService>>();
2323
var storage = serviceProvider.GetRequiredService<IStorage>();
2424
logger.LogInformation("ConfigureCodeSampleService -> Name: {serviceName}", serviceName);
25-
return new (serviceName, options, logger, storage);
25+
return new CodeSampleService(serviceName, options, logger, storage);
2626

2727
}
2828
}

src/DevTKSS.Uno.Samples.MvuxGallery/Services/CodeSampleService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public partial record CodeSampleService : ICodeSampleService
1010

1111
public CodeSampleService(
1212
string name,
13-
IOptionsSnapshot<CodeSampleOptions> options,
13+
IOptionsMonitor<CodeSampleOptions> options,
1414
ILogger<CodeSampleService> logger,
1515
IStorage storage)
1616
{

0 commit comments

Comments
 (0)