Skip to content

Commit a0a5b5f

Browse files
jeremyknight-mejeremyknight-me
committed
upgraded to dotnet9
1 parent 984f63d commit a0a5b5f

File tree

7 files changed

+62
-37
lines changed

7 files changed

+62
-37
lines changed

‎src/Directory.Build.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
<PropertyGroup>
3+
<LangVersion>13.0</LangVersion>
4+
<TargetFramework>net9.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
8+
9+
<Authors>Jeremy Knight</Authors>
10+
<Company>Jeremy Knight</Company>
11+
<Copyright>Copyright Jeremy Knight. All rights reserved.</Copyright>
12+
<PackageProjectUrl>https://github.com/jeremyknight-me/tip-calc</PackageProjectUrl>
13+
<RepositoryUrl>https://github.com/jeremyknight-me/tip-calc</RepositoryUrl>
14+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15+
</PropertyGroup>
16+
</Project>

‎src/Directory.Packages.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
4+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
5+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
6+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
7+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.10" />
8+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
9+
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.10" />
10+
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.10" />
11+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
12+
<PackageVersion Include="System.Net.Http.Json" Version="9.0.0" />
13+
<PackageVersion Include="xunit" Version="2.9.2" />
14+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
15+
</ItemGroup>
16+
</Project>

‎src/JK.TipCalc.Common.Tests/JK.TipCalc.Common.Tests.csproj‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<IsPackable>false</IsPackable>
5+
</PropertyGroup>
96

10-
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
12-
<PackageReference Include="xunit" Version="2.7.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
<PrivateAssets>all</PrivateAssets>
16-
</PackageReference>
17-
<PackageReference Include="coverlet.collector" Version="6.0.2">
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19-
<PrivateAssets>all</PrivateAssets>
20-
</PackageReference>
21-
</ItemGroup>
7+
<ItemGroup>
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
9+
<PackageReference Include="xunit" />
10+
<PackageReference Include="xunit.runner.visualstudio">
11+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12+
<PrivateAssets>all</PrivateAssets>
13+
</PackageReference>
14+
<PackageReference Include="coverlet.collector">
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
<PrivateAssets>all</PrivateAssets>
17+
</PackageReference>
18+
</ItemGroup>
2219

23-
<ItemGroup>
24-
<ProjectReference Include="..\JK.TipCalc.Common\JK.TipCalc.Common.csproj" />
25-
</ItemGroup>
20+
<ItemGroup>
21+
<ProjectReference Include="..\JK.TipCalc.Common\JK.TipCalc.Common.csproj" />
22+
</ItemGroup>
2623

2724
</Project>

‎src/JK.TipCalc.Common/JK.TipCalc.Common.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@
33
<PropertyGroup>
44
<AssemblyName>JK.TipCalc.Common</AssemblyName>
55
<RootNamespace>JK.TipCalc.Common</RootNamespace>
6-
<TargetFramework>net8.0</TargetFramework>
7-
<Nullable>enable</Nullable>
8-
<ImplicitUsings>enable</ImplicitUsings>
96
</PropertyGroup>
107

118
<ItemGroup>
129
<SupportedPlatform Include="browser" />
1310
</ItemGroup>
1411

1512
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.3" />
13+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
1714
</ItemGroup>
1815

1916
</Project>

‎src/TipCalc.Maui/TipCalc.Maui.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0-android</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0-android</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
66

77
<OutputType>Exe</OutputType>
88
<RootNamespace>JK.TipCalc.Maui</RootNamespace>
99
<UseMaui>true</UseMaui>
1010
<SingleProject>true</SingleProject>
11-
<ImplicitUsings>enable</ImplicitUsings>
1211
<EnableDefaultCssItems>false</EnableDefaultCssItems>
13-
<Nullable>enable</Nullable>
1412

1513
<!-- Display name -->
1614
<ApplicationTitle>TipCalc</ApplicationTitle>
@@ -46,10 +44,10 @@
4644
</ItemGroup>
4745

4846
<ItemGroup>
49-
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
50-
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
51-
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
52-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
47+
<PackageReference Include="Microsoft.Maui.Controls" VersionOverride="$(MauiVersion)" />
48+
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" VersionOverride="$(MauiVersion)" />
49+
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" VersionOverride="$(MauiVersion)" />
50+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
5351
</ItemGroup>
5452

5553
<ItemGroup>

‎src/TipCalc.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{73F05E25-0B42-4C97-A355-9F0F405D2DFB}"
99
ProjectSection(SolutionItems) = preProject
1010
.editorconfig = .editorconfig
11+
Directory.Build.props = Directory.Build.props
12+
Directory.Packages.props = Directory.Packages.props
1113
EndProjectSection
1214
EndProject
1315
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JK.TipCalc.Common", "JK.TipCalc.Common\JK.TipCalc.Common.csproj", "{48CCF409-4E8B-4854-8BF0-F56FC245A9AA}"

‎src/TipCalc/TipCalc.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<AssemblyName>JK.TipCalc</AssemblyName>
55
<RootNamespace>JK.TipCalc</RootNamespace>
6-
<TargetFramework>net8.0</TargetFramework>
76
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
87
</PropertyGroup>
98

@@ -12,9 +11,9 @@
1211
</ItemGroup>
1312

1413
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.3" PrivateAssets="all" />
17-
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" PrivateAssets="all" />
16+
<PackageReference Include="System.Net.Http.Json" />
1817
</ItemGroup>
1918

2019
<ItemGroup>

0 commit comments

Comments
 (0)