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

411 net 8 upgrade #413

Merged
merged 3 commits into from
Dec 4, 2024
Merged

411 net 8 upgrade #413

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
6c69e18
.Net 8 upgrade #411
amosekr Nov 28, 2024
20fe95a
Modus dropdown popup is not displaying under the dropdown control in …
amosekr Nov 28, 2024
a9b6ff4
.Net 8 upgrade #411 - updated .net 8 in job file
amosekr Nov 29, 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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Setup .NET 7
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
include-prerelease: true

- uses: actions/setup-java@v4
Expand All @@ -49,4 +49,4 @@ jobs:
run: dotnet restore Trimble.Modus.Components.sln

- name: Build MAUI Android
run: dotnet build Trimble.Modus.Components.sln -f net7.0-android -c Release --no-restore
run: dotnet build Trimble.Modus.Components.sln -f net8.0-android -c Release --no-restore
23 changes: 11 additions & 12 deletions DemoApp/DemoApp/DemoApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<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-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> -->
<OutputType>Exe</OutputType>
Expand All @@ -17,7 +17,7 @@
<!-- App Identifier -->
<ApplicationId>com.trimble.ModusMAUI</ApplicationId>
<ApplicationIdGuid>4ca86287-676e-49cb-9a5d-75d22c1b3771</ApplicationIdGuid>

<PackageVersion>1.0.0</PackageVersion>
<!-- Versions -->
<ApplicationDisplayVersion>0.1.2</ApplicationDisplayVersion>
<ApplicationVersion>3</ApplicationVersion>
Expand All @@ -30,19 +30,19 @@
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-android|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android|AnyCPU'">
<AndroidPackageFormat>apk</AndroidPackageFormat>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-android|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-maccatalyst|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-maccatalyst|AnyCPU'">
<CreatePackage>false</CreatePackage>
<CodesignKey>Mac Developer</CodesignKey>
<PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
Expand Down Expand Up @@ -93,10 +93,6 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Trimble.Modus.Components\Trimble.Modus.Components.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="Resources\Styles\DarkThemeColors.xaml.cs">
<DependentUpon>DarkThemeColors.xaml</DependentUpon>
Expand Down Expand Up @@ -258,4 +254,7 @@
<Folder Include="Helpers\" />
<Folder Include="Views\TopNavbar\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Trimble.Modus.Components\Trimble.Modus.Components.csproj" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Trimble.Modus.Components/Controls/Popup/Pages/PopupPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
private double _popupWidth = -1;
private double _padding = 10;
#endregion
public event EventHandler? BackgroundClicked;

Check warning on line 19 in Trimble.Modus.Components/Controls/Popup/Pages/PopupPage.cs

View workflow job for this annotation

GitHub Actions / Build 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

internal Task? AppearingTransactionTask { get; set; }

Check warning on line 21 in Trimble.Modus.Components/Controls/Popup/Pages/PopupPage.cs

View workflow job for this annotation

GitHub Actions / Build 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

internal Task? DisappearingTransactionTask { get; set; }

Expand Down Expand Up @@ -306,8 +306,8 @@

try
{
_popupHeight = popupPage.Content.Height;
_popupWidth = popupPage.Content.Width;
_popupHeight = popupPage.Content.HeightRequest;
_popupWidth = popupPage.Content.WidthRequest;
var locationFetcher = new Helpers.LocationFetcher();
var loc = locationFetcher.GetCoordinates(_anchorView);

Expand Down
2 changes: 1 addition & 1 deletion Trimble.Modus.Components/Controls/TMModal/TMModalContents.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Trimble.Modus.Components.Modal;

public partial class TMModalContents
internal partial class TMModalContents
{
#region Private fields

Expand Down
12 changes: 6 additions & 6 deletions Trimble.Modus.Components/Trimble.Modus.Components.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">
$(TargetFrameworks);net7.0-windows10.0.19041.0
$(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 -->
Expand Down Expand Up @@ -31,7 +31,7 @@
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<PackageId>Trimble.Modus.Components</PackageId>
<Title>Trimbel Modus</Title>
<Version>1.1.1.1</Version>
<Version>1.1.2.41</Version>
<Authors>Trimble Inc</Authors>
<Company>Trimble Inc</Company>
<Product>Trimble.Modus.Components</Product>
Expand All @@ -49,13 +49,13 @@
<PackageReleaseNotes>Visit https://github.com/trimble-oss/modus-mobile-maui-components/releases</PackageReleaseNotes>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
<MtouchLink>None</MtouchLink>
<MtouchUseLlvm>False</MtouchUseLlvm>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-ios|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
<MtouchLink>None</MtouchLink>
</PropertyGroup>

Expand All @@ -77,7 +77,7 @@
<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.1.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.4-preview.76" />
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.8" />
</ItemGroup>
<ItemGroup>
<MauiFont Include="Fonts\*" />
Expand Down
Loading