Skip to content

Commit 27ba8ad

Browse files
committed
chore!: update dotnet 10
1 parent 40c35bb commit 27ba8ad

File tree

3 files changed

+29
-23
lines changed

3 files changed

+29
-23
lines changed

BREAKING_CHANGES.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
<!-- Add a header (##) with the version and list the breaking changes.-->
44

55
## 4.0.x
6-
<!--
7-
- `Something` was removed.
8-
- `This` was renamed to `That`.
9-
-->
6+
- Updated target framework from .NET 8 to .NET 10.
7+
- Updated Uno.WinUI to 6.3.62.
8+
- Removed MacOS support in favor of Mac Catalyst.
109

1110
## 3.0.x
1211
- GeolocatorService.Reactive.Uno.WinUI was removed.

build/stage-build.yml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
steps:
1+
parameters:
2+
DotNetVersion: '10.0.100'
3+
UnoCheck_Version: '1.33.1'
4+
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/3bd81468f842eb34fe4760d1694baf8e4ba6edba/manifests/uno.ui.manifest.json'
5+
6+
steps:
27
- task: gitversion/setup@0
38
inputs:
49
versionSpec: '5.10.1'
@@ -10,19 +15,21 @@
1015
configFilePath: $(Build.SourcesDirectory)/build/gitversion.yml
1116
displayName: 'Calculate version'
1217

13-
- task: DotNetCoreCLI@2
14-
displayName: 'Install dotnet 8 workloads'
18+
- task: UseDotNet@2
19+
displayName: 'Use .NET SDK ${{ parameters.DotNetVersion }}'
20+
retryCountOnTaskFailure: 3
1521
inputs:
16-
command: 'custom'
17-
custom: 'workload'
18-
arguments: 'install android ios macos maccatalyst'
22+
packageType: sdk
23+
version: ${{ parameters.DotNetVersion }}
24+
includePreviewVersions: true
1925

20-
- task: JavaToolInstaller@0
21-
displayName: "Install Java SDK 11"
22-
inputs:
23-
versionSpec: '11'
24-
jdkArchitectureOption: 'x64'
25-
jdkSourceOption: 'PreInstalled'
26+
- powershell: |
27+
& dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
28+
& uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --skip androidsdk --skip androidemulator --manifest ${{ parameters.UnoCheck_Manifest }}
29+
displayName: Uno-check
30+
errorActionPreference: continue
31+
ignoreLASTEXITCODE: true
32+
retryCountOnTaskFailure: 3
2633

2734
- task: MSBuild@1
2835
displayName: 'Restore solution packages'

src/GeolocatorService.Uno.WinUI/GeolocatorService.Uno.WinUI.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net8.0-ios;net8.0-android;net8.0-windows10.0.22621.0;net8.0-macos</TargetFrameworks>
4-
<LangVersion>12.0</LangVersion>
3+
<TargetFrameworks>net10.0;net10.0-ios;net10.0-android;net10.0-windows10.0.22621.0;net10.0-maccatalyst</TargetFrameworks>
4+
<LangVersion>14.0</LangVersion>
55
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
66
<GenerateLibraryLayout>true</GenerateLibraryLayout>
77
<RootNamespace>GeolocatorService</RootNamespace>
@@ -25,23 +25,23 @@
2525
</PropertyGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
28+
<PackageReference Include="Uno.WinUI" Version="6.3.62" />
2929
</ItemGroup>
3030

3131
<ItemGroup>
3232
<!-- Needed for Source Link support -->
33-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
33+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.102" PrivateAssets="All" />
3434
</ItemGroup>
3535

36-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.22621.0'">
36+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0-windows10.0.22621.0'">
3737
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
3838
</ItemGroup>
3939

4040
<ItemGroup>
4141
<ProjectReference Include="..\GeolocatorService.Abstractions\GeolocatorService.Abstractions.csproj" />
4242
</ItemGroup>
4343

44-
<ItemGroup Condition="'$(TargetFramework)'!='net8.0-windows10.0.22621.0'">
44+
<ItemGroup Condition="'$(TargetFramework)'!='net10.0-windows10.0.22621.0'">
4545
<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
4646
<Compile Update="**\*.xaml.cs">
4747
<DependentUpon>%(Filename)</DependentUpon>

0 commit comments

Comments
 (0)