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

Untracked: Upgrade to .net8 #75

Merged
merged 7 commits into from
Sep 22, 2024
Merged

Untracked: Upgrade to .net8 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
baf7915
Upgrade easy dependencies
davidlang42 Sep 22, 2024
536173d
Update logging dependencies
davidlang42 Sep 22, 2024
3b91a9a
Upgrade testing dependencies
davidlang42 Sep 22, 2024
81345cc
Upgrade entity framework
davidlang42 Sep 22, 2024
5a79950
Upgrade to .net 8
davidlang42 Sep 22, 2024
2ff8274
Upgrade Maui
davidlang42 Sep 22, 2024
eaf4833
Fix build scripts
davidlang42 Sep 22, 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
2 changes: 1 addition & 1 deletion CastingEngine/CastingEngine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<Deterministic>false</Deterministic>
<AssemblyName>Carmen.CastingEngine</AssemblyName>
Expand Down
8 changes: 4 additions & 4 deletions Desktop/Desktop.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>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<Nullable>enable</Nullable>
<ApplicationIcon>Icons\CarmenC.ico</ApplicationIcon>
Expand All @@ -19,9 +19,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="WpfMessageBox" Version="1.2.0" />
</ItemGroup>
<ItemGroup>
Expand Down
22 changes: 15 additions & 7 deletions Mobile/Mobile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<!-- You won't believe this, but in order to build for Android in Release mode on Windows using Visual Studio you need to untarget iOS -->
<!--<TargetFrameworks>net7.0-android;net7.0-maccatalyst</TargetFrameworks>-->
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<!--<TargetFrameworks>net8.0-android;net8.0-maccatalyst</TargetFrameworks>-->
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-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);net7.0-tizen</TargetFrameworks> -->
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->

<OutputType>Exe</OutputType>
<AssemblyName>Carmen.Mobile</AssemblyName>
Expand Down Expand Up @@ -55,7 +55,7 @@
<AndroidSigningStorePass>env:AndroidSigningPassword</AndroidSigningStorePass>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-maccatalyst|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-maccatalyst|AnyCPU'">
<MtouchLink>SdkOnly</MtouchLink>
<EnableCodeSigning>True</EnableCodeSigning>
<EnablePackageSigning>true</EnablePackageSigning>
Expand Down Expand Up @@ -96,8 +96,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -110,4 +110,12 @@
<_RequireCodeSigning>false</_RequireCodeSigning>
</PropertyGroup>
</Target>

<ItemGroup>
<PackageReference Update="Microsoft.Maui.Controls" Version="8.0.90" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.90" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Mobile/build_for_android.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@echo off
set /p AndroidSigningPassword=Password for keystore?
dotnet publish -f net7.0-android -c Release || goto :done
dotnet publish -f net8.0-android -c Release || goto :done
echo.
echo Signed APK and AAB can be found in .\bin\Release\net7.0-android\publish
echo Signed APK and AAB can be found in .\bin\Release\net8.0-android\publish
:done
pause
2 changes: 1 addition & 1 deletion Mobile/build_for_ios_adhoc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e
rm -r bin
rm -r obj
dotnet publish -f net7.0-ios -c Release -p:CodesignProvision="CARMEN (Ad-Hoc)"
dotnet publish -f net8.0-ios -c Release -p:CodesignProvision="CARMEN (Ad-Hoc)"
echo BUILT FOR AD-HOC DEPLOYMENT
echo Distribute using Apple Configurator: https://apps.apple.com/app/id1037126344
echo User guide: https://support.apple.com/en-au/guide/apple-configurator-mac/welcome/mac
4 changes: 2 additions & 2 deletions Mobile/build_for_ios_appstore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
set -e
rm -r bin
rm -r obj
dotnet publish -f net7.0-ios -c Release -p:CodesignProvision="CARMEN (App Store)"
IPA_FILE="`ls -1 ./bin/Release/net7.0-ios/ios-arm64/publish/Carmen.Mobile*.ipa | tail -n 1`"
dotnet publish -f net8.0-ios -c Release -p:CodesignProvision="CARMEN (App Store)"
IPA_FILE="`ls -1 ./bin/Release/net8.0-ios/ios-arm64/publish/Carmen.Mobile*.ipa | tail -n 1`"
echo Press ENTER to submit to Apple AppStore: $IPA_FILE
read
xcrun altool --upload-app -f $IPA_FILE -t ios --username davidlang42@gmail.com --apple-id davidlang42@gmail.com # this will prompt for an AppleID app specific password
Expand Down
4 changes: 2 additions & 2 deletions Mobile/build_for_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
dotnet publish -f net7.0-maccatalyst -c Release
PKG_FILE="`ls -1 ./bin/Release/net7.0-maccatalyst/publish/Carmen.Mobile*.pkg | tail -n 1`"
dotnet publish -f net8.0-maccatalyst -c Release
PKG_FILE="`ls -1 ./bin/Release/net8.0-maccatalyst/publish/Carmen.Mobile*.pkg | tail -n 1`"
echo Press ENTER to submit to Apple: $PKG_FILE
read
xcrun notarytool submit $PKG_FILE --wait --apple-id davidlang42@gmail.com --team-id 45435R99CA # this will prompt for an AppleID app specific password
Expand Down
2 changes: 1 addition & 1 deletion Mobile/build_for_win.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@echo off
dotnet publish -f net7.0-windows10.0.19041.0 -c Release -p:RuntimeIdentifierOverride=win10-x64
dotnet publish -f net8.0-windows10.0.19041.0 -c Release -p:RuntimeIdentifierOverride=win10-x64
pause
2 changes: 1 addition & 1 deletion Setup/Setup.vdproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F331B30318EE45C992DEB7C6F266D877"
{
"SourcePath" = "8:..\\Desktop\\obj\\Release\\net7.0-windows\\apphost.exe"
"SourcePath" = "8:..\\Desktop\\obj\\Release\\net8.0-windows\\apphost.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_6C9730BB8C4B45A3881433C0DE2D1DAF"
Expand Down
16 changes: 8 additions & 8 deletions ShowModel/ShowModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<Configurations>Debug;Release;Slow DB</Configurations>
<Deterministic>false</Deterministic>
Expand All @@ -15,15 +15,15 @@
<Compile Include="..\GlobalAssemblyInfo.cs" Link="GlobalAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CsvHelper" Version="27.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
<PackageReference Include="CsvHelper" Version="33.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.33" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.33">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.3" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.33" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.33" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.3" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
</ItemGroup>
</Project>
14 changes: 7 additions & 7 deletions UnitTests/UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<Deterministic>false</Deterministic>
Expand All @@ -13,12 +13,12 @@
<Compile Include="..\GlobalAssemblyInfo.cs" Link="GlobalAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CsvHelper" Version="27.1.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="CsvHelper" Version="33.0.1" />
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down