Skip to content

Commit

Permalink
MVVM community toolkit Migration (#3)
Browse files Browse the repository at this point in the history
* Use MVVM Community Toolkit

Also update packages, upgrade to .NET 8 and change attribute name convention

* Set version to .NET 8
  • Loading branch information
Mingel authored Feb 17, 2024
1 parent 566b84e commit 21e48c7
Show file tree
Hide file tree
Showing 25 changed files with 1,105 additions and 1,230 deletions.
10 changes: 5 additions & 5 deletions JishoTangoAssistant.Tests/JishoTangoAssistant.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
Expand All @@ -10,10 +10,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
13 changes: 7 additions & 6 deletions JishoTangoAssistant/JishoTangoAssistant.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<Nullable>enable</Nullable>
<TrimMode>copyused</TrimMode>
Expand All @@ -13,11 +13,12 @@
<TrimmableAssembly Include="Avalonia.Themes.Default" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.4" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.4" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.4" />
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.4" />
<PackageReference Include="Avalonia" Version="11.0.9" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.9" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.9" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>
25 changes: 25 additions & 0 deletions JishoTangoAssistant/JishoTangoAssistant.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.002.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JishoTangoAssistant", "JishoTangoAssistant.csproj", "{2D2F8CA0-1736-4FBA-BCE1-EE45D072DDF2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2D2F8CA0-1736-4FBA-BCE1-EE45D072DDF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D2F8CA0-1736-4FBA-BCE1-EE45D072DDF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D2F8CA0-1736-4FBA-BCE1-EE45D072DDF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D2F8CA0-1736-4FBA-BCE1-EE45D072DDF2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C8BE2A97-D240-42F8-A6DC-3EEEA12019CB}
EndGlobalSection
EndGlobal
Loading

0 comments on commit 21e48c7

Please sign in to comment.