Skip to content

Commit 808a8e4

Browse files
committed
Update to .NET9
1 parent b31c4ca commit 808a8e4

File tree

4 files changed

+35
-22
lines changed

4 files changed

+35
-22
lines changed

.github/workflows/build.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,40 @@ name: CI
22

33
on: [push]
44

5+
env:
6+
xcodeVersion: 16.2
7+
dotnetVersion: 9.0.200
8+
59
jobs:
610
build:
7-
8-
runs-on: macos-14
11+
runs-on: macos-15
912

1013
steps:
11-
- uses: actions/checkout@v1
14+
- name: Checkout
15+
uses: actions/checkout@v2
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Select Xcode ${{ env.xcodeVersion }}
20+
run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app
1221

13-
- name: Setup .NET 8
14-
uses: actions/setup-dotnet@v1
22+
- name: Setup .NET ${{ env.dotnetVersion }}
23+
uses: actions/setup-dotnet@v4
1524
with:
16-
dotnet-version: 8.0.x
25+
dotnet-version: ${{ env.dotnetVersion }}
1726

1827
- name: Install iOS workload
19-
run: dotnet workload install maui ios maccatalyst
28+
run: dotnet workload install maui ios maccatalyst --version $dotnetVersion
29+
env:
30+
dotnetVersion: ${{ env.dotnetVersion }}
2031

2132
- name: Restore dotnet tools
2233
run: dotnet tool restore
2334

2435
- name: Run the Cake script
2536
run: dotnet cake
2637

27-
- uses: actions/upload-artifact@master
38+
- uses: actions/upload-artifact@v4
2839
with:
2940
name: NugetPackage
3041
path: artifacts

BTProgressHUD/BTProgressHUD.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.Net.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0-ios;net7.0-maccatalyst;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
3+
<TargetFrameworks>net8.0-ios;net8.0-maccatalyst;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
44
<AssemblyName>BTProgressHUD</AssemblyName>
55
<RootNamespace>BigTed</RootNamespace>
66
<PackageId>BTProgressHUD</PackageId>
77
<Description>BTProgressHUD is a clean and easy-to-use HUD meant to display the progress of an ongoing task.</Description>
88
<Nullable>enable</Nullable>
99
<NoNFloatUsing>true</NoNFloatUsing>
1010

11-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
11+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
1212
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
1313

1414
</PropertyGroup>
@@ -18,4 +18,4 @@
1818
<None Include="..\LICENSE" Pack="true" PackagePath="" />
1919
</ItemGroup>
2020

21-
</Project>
21+
</Project>

BTProgressHUDDemo/BTProgressHUDDemo.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
4+
<TargetFrameworks>net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>BTProgressHUDDemo</RootNamespace>
77
<UseMaui>true</UseMaui>
@@ -15,15 +15,12 @@
1515
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
1616
<ApplicationVersion>1</ApplicationVersion>
1717

18-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
18+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
1919
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
2020
<IsPackable>False</IsPackable>
2121

2222
</PropertyGroup>
2323

24-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
25-
<CreatePackage>false</CreatePackage>
26-
</PropertyGroup>
2724
<ItemGroup>
2825
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
2926
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
@@ -34,5 +31,6 @@
3431

3532
<ItemGroup>
3633
<ProjectReference Include="..\BTProgressHUD\BTProgressHUD.csproj" />
34+
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
3735
</ItemGroup>
3836
</Project>

Directory.Build.props

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
55
<PackageProjectUrl>https://github.com/redth-org/BTProgressHUD</PackageProjectUrl>
66
<PackageIcon>icon.png</PackageIcon>
7+
<PackageReadmeFile>README.md</PackageReadmeFile>
78
<Authors>nicwise</Authors>
89
<Owners>nicwise,ravensorb,redth,cheesebaron</Owners>
910
<PackageTags>Xamarin, iOS, Progress, BTProgressHUD</PackageTags>
@@ -24,16 +25,18 @@
2425
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
2526
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
2627
<Deterministic>true</Deterministic>
28+
29+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
30+
31+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
32+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
33+
34+
<DebugType>embedded</DebugType>
2735
</PropertyGroup>
2836

2937
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3038
<GenerateDocumentationFile>true</GenerateDocumentationFile>
3139
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
32-
33-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
34-
<!-- <IncludeSymbols>true</IncludeSymbols> -->
35-
<!-- <EmbedUntrackedSources>true</EmbedUntrackedSources> -->
36-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
3740
</PropertyGroup>
3841

3942
<ItemGroup>
@@ -42,5 +45,6 @@
4245

4346
<ItemGroup>
4447
<None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath=""/>
48+
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath=""/>
4549
</ItemGroup>
46-
</Project>
50+
</Project>

0 commit comments

Comments
 (0)