Skip to content

Commit d4a7c18

Browse files
committed
update:latest version
1 parent 235d34c commit d4a7c18

File tree

6 files changed

+30
-29
lines changed

6 files changed

+30
-29
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ bld/
3333

3434
# Visual Studio 2015/2017 cache/options directory
3535
.vs/
36+
#idea options directory
37+
.idea/
3638
# Uncomment if you have tasks that create the project's static files in wwwroot
3739
#wwwroot/
3840

llcomNext/LLCOM/App.axaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
<Application xmlns="https://github.com/avaloniaui"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
x:Class="LLCOM.App"
4-
xmlns:local="using:LLCOM"
5-
RequestedThemeVariant="Default">
6-
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
1+
<Application
2+
RequestedThemeVariant="Default"
3+
x:Class="LLCOM.App"
4+
xmlns="https://github.com/avaloniaui"
5+
xmlns:local="using:LLCOM"
6+
xmlns:semi="https://irihi.tech/semi"
7+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
78

89
<Application.DataTemplates>
9-
<local:ViewLocator/>
10+
<local:ViewLocator />
1011
</Application.DataTemplates>
11-
12+
1213
<Application.Styles>
13-
<FluentTheme />
14+
<semi:SemiTheme Locale="zh-CN" />
1415
</Application.Styles>
1516
</Application>

llcomNext/LLCOM/LLCOM.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@
2020

2121

2222
<ItemGroup>
23-
<PackageReference Include="Avalonia" Version="11.2.3" />
24-
<PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
25-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
26-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
23+
<PackageReference Include="Avalonia" Version="11.2.5" />
24+
<PackageReference Include="Avalonia.Desktop" Version="11.2.5" />
25+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.5" />
2726
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
28-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.3" />
27+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.5" />
2928
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
29+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
3030
<PackageReference Include="NLua" Version="1.7.4" />
31+
<PackageReference Include="Semi.Avalonia" Version="11.2.1.5" />
3132
</ItemGroup>
3233
</Project>

llcomNext/LLCOM/ViewLocator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ namespace LLCOM
77
{
88
public class ViewLocator : IDataTemplate
99
{
10-
public Control Build(object data)
10+
public Control Build(object? data)
1111
{
12-
var name = data.GetType().FullName!.Replace("ViewModel", "View");
12+
var name = data!.GetType().FullName!.Replace("ViewModel", "View");
1313
var type = Type.GetType(name);
1414

1515
if (type != null)
@@ -20,7 +20,7 @@ public Control Build(object data)
2020
return new TextBlock { Text = "Not Found: " + name };
2121
}
2222

23-
public bool Match(object data)
23+
public bool Match(object? data)
2424
{
2525
return data is ViewModelBase;
2626
}
Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
<UserControl
2+
d:DesignHeight="800"
3+
d:DesignWidth="1200"
4+
mc:Ignorable="d"
25
x:Class="LLCOM.Views.MainView"
6+
x:DataType="vm:MainViewModel"
37
xmlns="https://github.com/avaloniaui"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
58
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
69
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
710
xmlns:vm="using:LLCOM.ViewModels"
8-
d:DesignHeight="450"
9-
d:DesignWidth="800"
10-
x:DataType="vm:MainViewModel"
11-
mc:Ignorable="d">
11+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
1212
<Grid>
13-
<TextBlock
14-
HorizontalAlignment="Center"
15-
VerticalAlignment="Center"
16-
Text="Welcome to Avalonia!" />
13+
<Button Content="test" />
1714
</Grid>
1815
</UserControl>

llcomNext/llcomTest/llcomTest.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
13-
<PackageReference Include="MSTest.TestAdapter" Version="3.7.2" />
14-
<PackageReference Include="MSTest.TestFramework" Version="3.7.2" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
14+
<PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
1515
<PackageReference Include="coverlet.collector" Version="6.0.4">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)