Skip to content

Commit 75a3dd2

Browse files
authored
.net 8 (#4)
* .net 8 *.net 6 because no maui support for it anymore
1 parent 39fb21e commit 75a3dd2

File tree

4 files changed

+21
-10
lines changed

4 files changed

+21
-10
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ jobs:
2121
- uses: actions/checkout@v2
2222
- uses: actions/setup-dotnet@v3
2323
with:
24-
dotnet-version: '7.x'
25-
dotnet-quality: 'preview'
24+
dotnet-version: '7.0.x'
25+
- uses: actions/setup-dotnet@v3
26+
with:
27+
dotnet-version: '8.0.x'
28+
2629
- name: Install maui
2730
run: dotnet workload install maui
2831

.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ jobs:
1616
- uses: actions/checkout@v2
1717
- uses: actions/setup-dotnet@v3
1818
with:
19-
dotnet-version: '7.x'
20-
dotnet-quality: 'preview'
19+
dotnet-version: '7.0.x'
20+
- uses: actions/setup-dotnet@v3
21+
with:
22+
dotnet-version: '8.0.x'
2123

2224
- name: Install maui
2325
run: dotnet workload install maui

src/TinyMvvm.Maui/TinyMvvm.Maui.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<UseMaui>true</UseMaui>
@@ -25,7 +25,7 @@
2525
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2626
<LangVersion>latest</LangVersion>
2727
<WarningLevel>4</WarningLevel>
28-
<DocumentationFile>bin\Debug\net6.0\TinyMvvm.Maui.xml</DocumentationFile>
28+
<DocumentationFile>bin\Debug\net8.0\TinyMvvm.Maui.xml</DocumentationFile>
2929
</PropertyGroup>
3030
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3131
<LangVersion>latest</LangVersion>
@@ -34,7 +34,10 @@
3434
<None Remove="CommunityToolkit.Mvvm" />
3535
</ItemGroup>
3636
<ItemGroup>
37-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
37+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
38+
</ItemGroup>
39+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
40+
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
3841
</ItemGroup>
3942
<ItemGroup>
4043
<None Include="..\..\logo.png" Pack="true" PackagePath="\" />

src/TinyMvvm.Sample/TinyMvvm.Sample.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
66
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
77
<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
88
<OutputType>Exe</OutputType>
@@ -36,7 +36,7 @@
3636
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3737
<LangVersion>latestmajor</LangVersion>
3838
</PropertyGroup>
39-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-ios|AnyCPU'">
39+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
4040
<CreatePackage>false</CreatePackage>
4141
</PropertyGroup>
4242
<ItemGroup>
@@ -80,4 +80,7 @@
8080
<ItemGroup>
8181
<ProjectReference Include="..\TinyMvvm.Maui\TinyMvvm.Maui.csproj" />
8282
</ItemGroup>
83+
<ItemGroup>
84+
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
85+
</ItemGroup>
8386
</Project>

0 commit comments

Comments
 (0)