Skip to content

Commit 78d419b

Browse files
pictosPedro Jesus
andauthored
update to net10 (#10)
* update to net10 * just try * test windows target again * add -f on windows again * bump mac agent * bump macos image --------- Co-authored-by: Pedro Jesus <pedrojesus@Pedros-MacBook-Pro.local>
1 parent 149d0c7 commit 78d419b

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

.github/workflows/dotnet-macos.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ env:
1515
jobs:
1616
build:
1717

18-
runs-on: macos-15
18+
runs-on: macos-26
1919

2020
steps:
2121
- uses: actions/checkout@v4
2222

2323
- name: Setup .NET
2424
uses: actions/setup-dotnet@v4
2525
with:
26-
dotnet-version: 9.0.x
26+
dotnet-version: 10.0.x
2727

2828
- name: Setup Xcode
2929
uses: maxim-lobanov/setup-xcode@v1
3030
with:
31-
xcode-version: '16.4'
31+
xcode-version: '26.1'
3232

3333
- name: Workload install
3434
run: dotnet workload install maui
@@ -40,7 +40,7 @@ jobs:
4040
run: dotnet restore ${{env.SAMPLE_CSPROJ}}
4141

4242
- name: Build library
43-
run: dotnet build ${{env.LIB_CSPROJ}} -c Release -f net9.0-ios --no-restore
43+
run: dotnet build ${{env.LIB_CSPROJ}} -c Release -f net10.0-ios --no-restore
4444

4545
- name: Build Sample app
46-
run: dotnet build ${{env.SAMPLE_CSPROJ}} -c Release -f net9.0-ios --no-restore
46+
run: dotnet build ${{env.SAMPLE_CSPROJ}} -c Release -f net10.0-ios --no-restore

.github/workflows/dotnet-windows.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup .NET
3232
uses: actions/setup-dotnet@v4
3333
with:
34-
dotnet-version: 9.0.x
34+
dotnet-version: 10.0.x
3535

3636
- name: Get Nuget version and Name for PR
3737
if: ${{ github.event_name == 'pull_request' }}
@@ -49,25 +49,25 @@ jobs:
4949

5050
- name: Build library (Windows)
5151
run: |
52-
dotnet build ${{env.LIB_CSPROJ}} -c Release -f net9.0-windows10.0.19041.0 -p:WindowsPackageType=None -p:RuntimeIdentifier=win-x64 -p:PackageVersion=${{ env.NugetPackageVersion }} -p:Version=${{ env.NugetPackageVersion }}
52+
dotnet build ${{env.LIB_CSPROJ}} -c Release -f net10.0-windows10.0.19041.0 -p:PackageVersion=${{ env.NugetPackageVersion }} -p:Version=${{ env.NugetPackageVersion }}
5353
5454
shell: cmd
5555

5656
- name: Build Sample app (Windows)
5757
run: |
58-
dotnet build ${{env.SAMPLE_CSPROJ}} -c Release -f net9.0-windows10.0.19041.0 -p:WindowsPackageType=None -p:RuntimeIdentifier=win-x64 -p:SelfContained=false
58+
dotnet build ${{env.SAMPLE_CSPROJ}} -c Release -f net10.0-windows10.0.19041.0
5959
shell: cmd
6060

6161
# Android builds using dotnet build
6262

6363
- name: Build library (Android)
64-
run: dotnet build ${{env.LIB_CSPROJ}} -c Release -f net9.0-android -p:PackageVersion=${{ env.NugetPackageVersion }} -p:Version=${{ env.NugetPackageVersion }} --no-restore
64+
run: dotnet build ${{env.LIB_CSPROJ}} -c Release -f net10.0-android -p:PackageVersion=${{ env.NugetPackageVersion }} -p:Version=${{ env.NugetPackageVersion }} --no-restore
6565

6666
- name: Restore sample dependencies
6767
run: dotnet restore ${{env.SAMPLE_CSPROJ}}
6868

6969
- name: Build Sample app (Android)
70-
run: dotnet build ${{env.SAMPLE_CSPROJ}} -c Release -f net9.0-android --no-restore
70+
run: dotnet build ${{env.SAMPLE_CSPROJ}} -c Release -f net10.0-android --no-restore
7171

7272
# NuGet packaging - this will package all platforms that were built
7373
- name: Create Nuget

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<NetVersion>net9.0</NetVersion>
4-
<MauiPackageVersion>9.0.100</MauiPackageVersion>
3+
<NetVersion>net10.0</NetVersion>
4+
<MauiPackageVersion>10.0.10</MauiPackageVersion>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>preview</LangVersion>

samples/PJ.ContextActions.Sample/PJ.ContextActions.Sample.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0-android;net9.0-ios;</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0-android;net10.0-ios;</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
66
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
77
<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
88

@@ -60,8 +60,8 @@
6060
</ItemGroup>
6161

6262
<ItemGroup>
63-
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)" />
64-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
63+
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)" />
64+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
6565
</ItemGroup>
6666

6767
<ItemGroup>

0 commit comments

Comments
 (0)