Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating for .NET 8 #13

Merged
merged 3 commits into from
Jan 26, 2024
Merged

Updating for .NET 8 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e968638
chore: bump version
dansiegel Jan 26, 2024
aefaefa
feat: update for .net8
dansiegel Jan 26, 2024
2bc7b8b
ci: updating pipelines
dansiegel Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ root = true
indent_style = space
end_of_line = lf

[*.{csproj,props,targets}]
indent_size = 2

[*.json]
indent_size = 2

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ on:
jobs:
build:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
permissions:
statuses: write
checks: write
with:
name: MauiMicroMvvm
solution-path: build.slnf
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ on:
jobs:
build:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
permissions:
statuses: write
checks: write
pull-requests: write
contents: write
with:
name: MauiMicroMvvm
solution-path: build.slnf
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/start-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
jobs:
build:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master
permissions:
statuses: write
checks: write
with:
name: MauiMicroMvvm
solution-path: build.slnf
Expand Down
8 changes: 6 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>

<PropertyGroup>
<DotNetVersion>net8.0</DotNetVersion>
</PropertyGroup>

<!-- CI Helper -->
<PropertyGroup>
<ContinuousIntegrationBuild>$(CI)</ContinuousIntegrationBuild>
Expand All @@ -34,11 +38,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.108">
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
185 changes: 95 additions & 90 deletions MauiMicroMvvm.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,95 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32714.290
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CAF06AA9-3F4E-4E07-A7A8-726097784A21}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiMicroMvvm", "src\MauiMicroMvvm\MauiMicroMvvm.csproj", "{4094C24B-1A79-46FF-BC6C-33639A824BBE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{B8FC7CB8-399C-41C6-8D6D-0358D7E4CC25}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiMicroSample", "sample\MauiMicroSample\MauiMicroSample.csproj", "{66C0C28B-59E4-40B6-A6C1-BEECC107378E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiMicroMvvm.Rx", "src\MauiMicroMvvm.Rx\MauiMicroMvvm.Rx.csproj", "{45A4D349-2170-4500-B076-E877DA6E015C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiMicroMvvm.Templates", "src\MauiMicroMvvm.Templates\MauiMicroMvvm.Templates.csproj", "{0803D0BA-65AB-4111-8202-B1E466347A65}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|x64.ActiveCfg = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|x64.Build.0 = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|x86.ActiveCfg = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|x86.Build.0 = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|Any CPU.Build.0 = Release|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|x64.ActiveCfg = Release|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|x64.Build.0 = Release|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|x86.ActiveCfg = Release|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|x86.Build.0 = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|x64.ActiveCfg = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|x64.Build.0 = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|x86.ActiveCfg = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|x86.Build.0 = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|Any CPU.Build.0 = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|x64.ActiveCfg = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|x64.Build.0 = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|x86.ActiveCfg = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|x86.Build.0 = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|x64.ActiveCfg = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|x64.Build.0 = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|x86.ActiveCfg = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|x86.Build.0 = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|Any CPU.Build.0 = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|x64.ActiveCfg = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|x64.Build.0 = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|x86.ActiveCfg = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|x86.Build.0 = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|x64.ActiveCfg = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|x64.Build.0 = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|x86.ActiveCfg = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|x86.Build.0 = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|Any CPU.Build.0 = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|x64.ActiveCfg = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|x64.Build.0 = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|x86.ActiveCfg = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4094C24B-1A79-46FF-BC6C-33639A824BBE} = {CAF06AA9-3F4E-4E07-A7A8-726097784A21}
{66C0C28B-59E4-40B6-A6C1-BEECC107378E} = {B8FC7CB8-399C-41C6-8D6D-0358D7E4CC25}
{45A4D349-2170-4500-B076-E877DA6E015C} = {CAF06AA9-3F4E-4E07-A7A8-726097784A21}
{0803D0BA-65AB-4111-8202-B1E466347A65} = {CAF06AA9-3F4E-4E07-A7A8-726097784A21}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {88111A1A-CBF1-447E-B8AF-0EF9432C51AC}
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32714.290
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CAF06AA9-3F4E-4E07-A7A8-726097784A21}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiMicroMvvm", "src\MauiMicroMvvm\MauiMicroMvvm.csproj", "{4094C24B-1A79-46FF-BC6C-33639A824BBE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{B8FC7CB8-399C-41C6-8D6D-0358D7E4CC25}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiMicroSample", "sample\MauiMicroSample\MauiMicroSample.csproj", "{66C0C28B-59E4-40B6-A6C1-BEECC107378E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiMicroMvvm.Rx", "src\MauiMicroMvvm.Rx\MauiMicroMvvm.Rx.csproj", "{45A4D349-2170-4500-B076-E877DA6E015C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiMicroMvvm.Templates", "src\MauiMicroMvvm.Templates\MauiMicroMvvm.Templates.csproj", "{0803D0BA-65AB-4111-8202-B1E466347A65}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{58DDD03C-E4B7-431A-8BC4-B8A8199C3DCD}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|x64.ActiveCfg = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|x64.Build.0 = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|x86.ActiveCfg = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Debug|x86.Build.0 = Debug|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|Any CPU.Build.0 = Release|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|x64.ActiveCfg = Release|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|x64.Build.0 = Release|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|x86.ActiveCfg = Release|Any CPU
{4094C24B-1A79-46FF-BC6C-33639A824BBE}.Release|x86.Build.0 = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|x64.ActiveCfg = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|x64.Build.0 = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|x86.ActiveCfg = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Debug|x86.Build.0 = Debug|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|Any CPU.Build.0 = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|x64.ActiveCfg = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|x64.Build.0 = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|x86.ActiveCfg = Release|Any CPU
{66C0C28B-59E4-40B6-A6C1-BEECC107378E}.Release|x86.Build.0 = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|x64.ActiveCfg = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|x64.Build.0 = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|x86.ActiveCfg = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Debug|x86.Build.0 = Debug|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|Any CPU.Build.0 = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|x64.ActiveCfg = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|x64.Build.0 = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|x86.ActiveCfg = Release|Any CPU
{45A4D349-2170-4500-B076-E877DA6E015C}.Release|x86.Build.0 = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|x64.ActiveCfg = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|x64.Build.0 = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|x86.ActiveCfg = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Debug|x86.Build.0 = Debug|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|Any CPU.Build.0 = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|x64.ActiveCfg = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|x64.Build.0 = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|x86.ActiveCfg = Release|Any CPU
{0803D0BA-65AB-4111-8202-B1E466347A65}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4094C24B-1A79-46FF-BC6C-33639A824BBE} = {CAF06AA9-3F4E-4E07-A7A8-726097784A21}
{66C0C28B-59E4-40B6-A6C1-BEECC107378E} = {B8FC7CB8-399C-41C6-8D6D-0358D7E4CC25}
{45A4D349-2170-4500-B076-E877DA6E015C} = {CAF06AA9-3F4E-4E07-A7A8-726097784A21}
{0803D0BA-65AB-4111-8202-B1E466347A65} = {CAF06AA9-3F4E-4E07-A7A8-726097784A21}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {88111A1A-CBF1-447E-B8AF-0EF9432C51AC}
EndGlobalSection
EndGlobal
10 changes: 5 additions & 5 deletions sample/MauiMicroSample/MauiMicroSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>$(DotNetVersion)-android;$(DotNetVersion)-ios;$(DotNetVersion)-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(DotNetVersion)-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
<!-- <TargetFrameworks>$(TargetFrameworks);$(DotNetVersion)-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType>
<RootNamespace>MauiMicroSample</RootNamespace>
<UseMaui>true</UseMaui>
Expand Down Expand Up @@ -49,8 +49,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="Refit" Version="6.3.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Refit" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFramework>$(DotNetVersion)</TargetFramework>
<UseMaui>true</UseMaui>
<ImplicitUsings>enable</ImplicitUsings>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
Expand All @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ReactiveUI" Version="18.4.22" />
<PackageReference Include="ReactiveUI" Version="19.5.39" />
</ItemGroup>

<ItemGroup>
Expand Down
24 changes: 3 additions & 21 deletions src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,10 @@
"defaultValue": "net7.0",
"description": "Target Framework",
"choices": [
{
"choice": "net6.0",
"displayName": ".NET 6.0 (Long Term Support)",
"description": "Target .NET 6.0 (Long Term Support)"
},
{
"choice": "net7.0",
"displayName": ".NET 7.0 (Standard Term Support)",
"description": "Target .NET 7.0 (Standard Term Support)"
},
{
"choice": "net8.0",
"displayName": ".NET 8.0 (Preview)",
"description": "Target .NET 8.0 (Preview)"
"displayName": ".NET 8.0 (Long Term Support)",
"description": "Target .NET 8.0 (Long Term Support)"
}
]
},
Expand All @@ -70,17 +60,9 @@
"evaluator": "C++",
"datatype": "string",
"cases": [
{
"condition": "(TargetFramework == 'net6.0')",
"value": "6.0.0"
},
{
"condition": "(TargetFramework == 'net7.0')",
"value": "7.0.0"
},
{
"condition": "(TargetFramework == 'net8.0')",
"value": "8.0.0-preview.1.23110.8"
"value": "8.0.0"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/MauiMicroApp.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<!--#if Reactive -->
<Using Include="ReactiveUI" />
<Using Include="ReactiveUI.Fody.Helpers" />
<PackageReference Include="ReactiveUI.Fody" Version="18.4.22" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.39" />
<PackageReference Include="AvantiPoint.MauiMicroMvvm.Rx" Version="$MauiMicroVersion$" />
<!--#else -->
<PackageReference Include="AvantiPoint.MauiMicroMvvm" Version="$MauiMicroVersion$" />
Expand Down
6 changes: 5 additions & 1 deletion src/MauiMicroMvvm/MauiMicroMvvm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFramework>$(DotNetVersion)</TargetFramework>
<UseMaui>true</UseMaui>
<ImplicitUsings>enable</ImplicitUsings>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
Expand All @@ -11,4 +11,8 @@
<Title>MauiMicroMvvm</Title>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/MauiMicroMvvm/MauiMicroViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace MauiMicroMvvm;

public abstract class MauiMicroViewModel : INotifyPropertyChanging, INotifyPropertyChanged, IViewModelActivation, IViewLifecycle, IAppLifecycle, IQueryAttributable
{
private readonly Dictionary<string, object> _properties = new ();
private readonly Dictionary<string, object> _properties = [];
private readonly Lazy<ILogger> _lazyLogger;

protected MauiMicroViewModel(ViewModelContext context)
Expand Down
15 changes: 4 additions & 11 deletions src/MauiMicroMvvm/ViewModelContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,9 @@

namespace MauiMicroMvvm;

public class ViewModelContext
public class ViewModelContext(ILoggerFactory logger, INavigation navigation, IPageDialogs pageDialogs)
{
public ViewModelContext(ILoggerFactory logger, INavigation navigation, IPageDialogs pageDialogs)
{
Logger = logger;
Navigation = navigation;
PageDialogs = pageDialogs;
}

public ILoggerFactory Logger { get; }
public INavigation Navigation { get; }
public IPageDialogs PageDialogs { get; }
public ILoggerFactory Logger { get; } = logger;
public INavigation Navigation { get; } = navigation;
public IPageDialogs PageDialogs { get; } = pageDialogs;
}
Loading
Loading