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

build: Update to .NET 9 SDK RC1 #17930

Merged
merged 33 commits into from
Sep 13, 2024
Merged

build: Update to .NET 9 SDK RC1 #17930

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
adf8fc8
build: Update to .NET 9 SDK Preview 7
Youssef1313 Aug 13, 2024
6a92428
chore: Remove skip sdk
Youssef1313 Aug 17, 2024
8cb48dd
chore: Update to dev 17
Youssef1313 Aug 19, 2024
34efecc
chore: Revert back
Youssef1313 Aug 20, 2024
080c226
chore: Fix versions
Youssef1313 Aug 21, 2024
2084d7a
chore: Adjust
Youssef1313 Aug 27, 2024
6630d53
chore: Temporary
Youssef1313 Aug 27, 2024
411fb96
chore: List installed workloads
jeromelaban Aug 27, 2024
04ea426
chore: Workload update
jeromelaban Aug 27, 2024
e766c4c
chore: Adjust workload restore
jeromelaban Aug 27, 2024
96d491e
chore: Adjust workload install
jeromelaban Aug 27, 2024
147369d
chore: publish binlogs
jeromelaban Aug 27, 2024
c0aa982
chore: Update log path
jeromelaban Aug 27, 2024
7d3b13a
chore: Restore with dotnet restore
Youssef1313 Aug 28, 2024
d5fcaff
chore: Publish doc directory
Youssef1313 Aug 28, 2024
e8414a2
chore: Update to rc1
jeromelaban Sep 10, 2024
0de2530
chore: Update uno.check
Youssef1313 Sep 10, 2024
978e553
chore: Update upload-artifact to v4
Youssef1313 Sep 11, 2024
0875d73
chore: Include workaround for #43339
jeromelaban Sep 11, 2024
dd036de
chore: Enable workaround for template tests
jeromelaban Sep 11, 2024
cf141ab
chore: Skip unused androidsdk validation, adjust nuget lib validation
jeromelaban Sep 12, 2024
03e1ba0
chore: Adjust android test for windows
jeromelaban Sep 12, 2024
700b657
chore: Adjust wpf lookup for rc
jeromelaban Sep 12, 2024
ec24144
chore: Adjust for rc
jeromelaban Sep 12, 2024
1213ecc
chore: Adjust preview
jeromelaban Sep 12, 2024
5edccc7
chore: Adjust formatting
jeromelaban Sep 12, 2024
43de90e
chore: Disable android 35 msbuild build
jeromelaban Sep 12, 2024
11b3c14
chore: Adjust rc1 workaround for samples
jeromelaban Sep 12, 2024
5991eeb
chore: Disable android for msbuild builds
jeromelaban Sep 12, 2024
bc9f1ae
chore: Adjust blank template android
jeromelaban Sep 12, 2024
dbdd0e8
chore: Adjust for all mobile targets
jeromelaban Sep 12, 2024
cb4bf7f
chore: Adjust more mobile build
jeromelaban Sep 12, 2024
92d852d
chore: Disable monochromatic test for net9 rc1
jeromelaban Sep 13, 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
18 changes: 15 additions & 3 deletions .github/workflows/uwp-autoconvert.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:
cancel-in-progress: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
UnoCheck_Version: '1.26.0-dev.6'
UnoCheck_Version: '1.26.0-dev.28'

jobs:
build:
Expand Down Expand Up @@ -69,18 +69,23 @@ jobs:
& dotnet tool update --global uno.check --version $env:UnoCheck_Version --add-source https://api.nuget.org/v3/index.json
name: Install Uno Check
- run: |
& uno-check -v --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
& uno-check -v --ci --non-interactive --fix --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
name: Run uno-check

- name: Convert source tree to UWP
run: |
cd $env:GITHUB_WORKSPACE\src\Uno.WinUIRevert
dotnet run "$env:GITHUB_WORKSPACE"

- name: Workloads list
run: |
dotnet workload list

- name: Run API Sync Tool
run: |
cd $env:GITHUB_WORKSPACE\build
msbuild Uno.UI.Build.csproj /v:m "/p:CombinedConfiguration=Release|AnyCPU" /m /t:RunAPISyncTool /bl
msbuild Uno.UI.Build.csproj /v:m "/p:CombinedConfiguration=Release|AnyCPU" /m /t:RunAPISyncTool /bl:$env:GITHUB_WORKSPACE\artifacts-logs\msbuild.binlog

- name: Turn script debugging on
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
run: Set-PSDebug -Trace 1
Expand All @@ -95,3 +100,10 @@ jobs:
- name: Push to repository
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
run: git push origin $env:GITHUB_REF_NAME`:generated/$env:GITHUB_REF_NAME/uwp-autoconvert -f

- name: Upload Logs
uses: actions/upload-artifact@v4
if: always()
with:
name: logs
path: .\artifacts-logs
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<NetCurrent>net9.0</NetCurrent>
<NetPrevious>net8.0</NetPrevious>

<NetCurrentNetCoreMobile>$(NetCurrent)-android;$(NetCurrent)-ios17.2;$(NetCurrent)-maccatalyst17.2;$(NetCurrent)-macos14.2</NetCurrentNetCoreMobile>
<NetCurrentNetCoreMobile>$(NetCurrent)-android;$(NetCurrent)-ios17.5;$(NetCurrent)-maccatalyst17.5;$(NetCurrent)-macos14.5</NetCurrentNetCoreMobile>
<NetPreviousNetCoreMobile>$(NetPrevious)-android;$(NetPrevious)-ios17.0;$(NetPrevious)-maccatalyst17.0;$(NetPrevious)-macos14.0</NetPreviousNetCoreMobile>

<NetPreviousWpf>$(NetPrevious)-windows</NetPreviousWpf>
Expand Down
3 changes: 2 additions & 1 deletion build/Uno.UI.Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,10 @@
<!-- Restore the nuget packages for packages-* solution filters -->
<!-- These filters contain Uno.UI project and its dependencies, which are what needs to be restored -->
<!-- In addition, the reference project needs to be restored as well. -->
<Exec Command="dotnet restore filters\Uno.UI-top-projects-for-sync-gen.slnf -p:Configuration=Release -p:InformationalVersion=$(GITVERSION_InformationalVersion) -p:CI_Build=true -p:_IsCIBuild=true" />
<MSBuild
Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true"
Projects="filters\Uno.UI-top-projects-for-sync-gen.slnf;..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj;..\src\Uno.UWPSyncGenerator.Reference\Uno.UWPSyncGenerator.Reference.csproj"
Projects="..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj;..\src\Uno.UWPSyncGenerator.Reference\Uno.UWPSyncGenerator.Reference.csproj"
Targets="Restore;Clean"
RebaseOutputs="false"
BuildInParallel="true" />
Expand Down
8 changes: 8 additions & 0 deletions build/ci/.azure-devops-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,11 @@ jobs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: DocumentationArtifacts
ArtifactType: Container

- task: PublishBuildArtifacts@1
condition: always()
retryCountOnTaskFailure: 3
inputs:
PathtoPublish: $(Build.SourcesDirectory)/doc
ArtifactName: GeneratedDocDirectory
ArtifactType: Container
4 changes: 2 additions & 2 deletions build/ci/net9/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "9.0.100-preview.6.24328.19",
"version": "9.0.100-rc.1.24452.12",
"allowPrerelease": true,
"rollForward": "disable"
},
"tools": {
"dotnet": "9.0.100-preview.6.24328.19"
"dotnet": "9.0.100-rc.1.24452.12"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.44",
Expand Down
5 changes: 2 additions & 3 deletions build/ci/templates/dotnet-mobile-install-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
UnoCheck_Version: '1.26.0-dev.6'
UnoCheck_Version: '1.26.0-dev.28'

steps:

Expand All @@ -17,7 +17,6 @@ steps:

- bash: |
dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
# androidsdk disabled for https://github.com/unoplatform/uno.check/issues/241
uno-check --ci --non-interactive --fix --skip androidsdk --skip gtk3 --pre-major
uno-check --ci --non-interactive --fix --skip gtk3 --pre-major
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
displayName: Install .NET Workloads
retryCountOnTaskFailure: 3
4 changes: 2 additions & 2 deletions build/ci/templates/dotnet-mobile-install-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
UnoCheck_Version: '1.26.0-dev.6'
UnoCheck_Version: '1.26.0-dev.28'

steps:

Expand All @@ -9,7 +9,7 @@ steps:

- powershell: |
& dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
& uno-check -v --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
& uno-check -v --ci --non-interactive --fix --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
displayName: Install .NET Workloads
errorActionPreference: continue
ignoreLASTEXITCODE: true
Expand Down
4 changes: 2 additions & 2 deletions build/ci/templates/dotnet-mobile-install-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
UnoCheck_Version: '1.26.0-dev.6'
UnoCheck_Version: '1.26.0-dev.28'

steps:

Expand All @@ -9,7 +9,7 @@ steps:

- powershell: |
& dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
& uno-check -v --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
& uno-check -v --ci --non-interactive --fix --skip androidemulator --skip xcode --skip gtk3 --skip vswin --skip vsmac --pre-major
displayName: Install .NET Workloads
errorActionPreference: continue
ignoreLASTEXITCODE: true
Expand Down
24 changes: 12 additions & 12 deletions build/nuget/Uno.WinUI.DevServer.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,26 @@
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.3.2" />
</group>

<!-- net9.0-ios17.2 -->
<group targetFramework="net9.0-ios17.2">
<!-- net9.0-ios17.5 -->
<group targetFramework="net9.0-ios17.5">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
<dependency id="Uno.WinUI.DevServer.Messaging" version="1.29.0-dev.93" />

<dependency id="Newtonsoft.Json" version="13.0.2" />
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.3.2" />
</group>

<!-- net9.0-maccatalyst17.2 -->
<group targetFramework="net9.0-maccatalyst17.2">
<!-- net9.0-maccatalyst17.5 -->
<group targetFramework="net9.0-maccatalyst17.5">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
<dependency id="Uno.WinUI.DevServer.Messaging" version="1.29.0-dev.93" />

<dependency id="Newtonsoft.Json" version="13.0.2" />
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.3.2" />
</group>

<!-- net9.0-macos14.2 -->
<group targetFramework="net9.0-macos14.2">
<!-- net9.0-macos14.5 -->
<group targetFramework="net9.0-macos14.5">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
<dependency id="Uno.WinUI.DevServer.Messaging" version="1.29.0-dev.93" />

Expand Down Expand Up @@ -145,14 +145,14 @@
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-android\Uno.UI.RemoteControl.dll" target="lib\net9.0-android" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-android\Uno.UI.RemoteControl.pdb" target="lib\net9.0-android" />

<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-ios17.2\Uno.UI.RemoteControl.dll" target="lib\net9.0-ios17.2" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-ios17.2\Uno.UI.RemoteControl.pdb" target="lib\net9.0-ios17.2" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-ios17.5\Uno.UI.RemoteControl.dll" target="lib\net9.0-ios17.5" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-ios17.5\Uno.UI.RemoteControl.pdb" target="lib\net9.0-ios17.5" />

<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.RemoteControl.dll" target="lib\net9.0-maccatalyst17.2" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.RemoteControl.pdb" target="lib\net9.0-maccatalyst17.2" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst17.5\Uno.UI.RemoteControl.dll" target="lib\net9.0-maccatalyst17.5" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst17.5\Uno.UI.RemoteControl.pdb" target="lib\net9.0-maccatalyst17.5" />

<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos14.2\Uno.UI.RemoteControl.dll" target="lib\net9.0-macos14.2" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos14.2\Uno.UI.RemoteControl.pdb" target="lib\net9.0-macos14.2" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos14.5\Uno.UI.RemoteControl.dll" target="lib\net9.0-macos14.5" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos14.5\Uno.UI.RemoteControl.pdb" target="lib\net9.0-macos14.5" />

<!-- Processors -->
<file src="..\..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\net8.0\*.dll" target="tools\rc\processors\net8.0" />
Expand Down
16 changes: 8 additions & 8 deletions build/nuget/Uno.WinUI.Lottie.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,23 +72,23 @@
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Newtonsoft.Json" version="13.0.2" />
</group>
<group targetFramework="net9.0-ios17.2">
<group targetFramework="net9.0-ios17.5">
<dependency id="SkiaSharp.Skottie" version="2.88.7" />
<dependency id="SkiaSharp.Views.Uno" version="2.88.7" />
<dependency id="SkiaSharp.NativeAssets.ios" version="2.88.7" />

<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="net9.0-maccatalyst17.2">
<group targetFramework="net9.0-maccatalyst17.5">
<dependency id="SkiaSharp.Skottie" version="2.88.7" />
<dependency id="SkiaSharp.Views.Uno" version="2.88.7" />
<dependency id="SkiaSharp.NativeAssets.maccatalyst" version="2.88.7" />

<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="net9.0-macos14.2">
<group targetFramework="net9.0-macos14.5">
<dependency id="SkiaSharp.Skottie" version="2.88.7" />
<dependency id="SkiaSharp.Views.Uno" version="2.88.7" />
<dependency id="SkiaSharp.NativeAssets.macos" version="2.88.7" />
Expand All @@ -111,13 +111,13 @@
<group targetFramework="net8.0-android">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net9.0-ios17.2">
<group targetFramework="net9.0-ios17.5">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net9.0-maccatalyst17.2">
<group targetFramework="net9.0-maccatalyst17.5">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net9.0-macos14.2">
<group targetFramework="net9.0-macos14.5">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net9.0-android">
Expand All @@ -142,8 +142,8 @@
<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.Lottie.dll" target="lib\net8.0-maccatalyst17.0" />

<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net9.0-android\Uno.UI.Lottie.dll" target="lib\net9.0-android" />
<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net9.0-ios17.2\Uno.UI.Lottie.dll" target="lib\net9.0-ios17.2" />
<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.Lottie.dll" target="lib\net9.0-maccatalyst17.2" />
<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net9.0-ios17.5\Uno.UI.Lottie.dll" target="lib\net9.0-ios17.5" />
<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net9.0-maccatalyst17.5\Uno.UI.Lottie.dll" target="lib\net9.0-maccatalyst17.5" />

<!-- Build targets -->
<file src="..\..\src\AddIns\Uno.UI.Lottie\buildTransitive\*" target="buildTransitive" />
Expand Down
12 changes: 6 additions & 6 deletions build/nuget/Uno.WinUI.MSAL.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.61.3" />
</group>
<group targetFramework="net9.0-ios17.2">
<group targetFramework="net9.0-ios17.5">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.61.3" />
</group>
<group targetFramework="net9.0-maccatalyst17.2">
<group targetFramework="net9.0-maccatalyst17.5">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.61.3" />
</group>
<group targetFramework="net9.0-macos14.2">
<group targetFramework="net9.0-macos14.5">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.61.3" />
</group>
Expand All @@ -89,9 +89,9 @@
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-macos14.0\Uno.UI.MSAL.*" target="lib\net8.0-macos14.0" />

<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-android\Uno.UI.MSAL.*" target="lib\net9.0-android" />
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-ios17.2\Uno.UI.MSAL.*" target="lib\net9.0-ios17.2" />
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.MSAL.*" target="lib\net9.0-maccatalyst17.2" />
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-macos14.2\Uno.UI.MSAL.*" target="lib\net9.0-macos14.2" />
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-ios17.5\Uno.UI.MSAL.*" target="lib\net9.0-ios17.5" />
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-maccatalyst17.5\Uno.UI.MSAL.*" target="lib\net9.0-maccatalyst17.5" />
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-macos14.5\Uno.UI.MSAL.*" target="lib\net9.0-macos14.5" />

<!-- Build targets -->
<file src="..\..\src\AddIns\Uno.UI.MSAL\buildTransitive\*" target="buildTransitive" />
Expand Down
6 changes: 3 additions & 3 deletions build/nuget/Uno.WinUI.RemoteControl.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<file src="_._" target="lib\net8.0-macos14.0" />

<file src="_._" target="lib\net9.0-android" />
<file src="_._" target="lib\net9.0-ios17.2" />
<file src="_._" target="lib\net9.0-maccatalyst17.2" />
<file src="_._" target="lib\net9.0-macos14.2" />
<file src="_._" target="lib\net9.0-ios17.5" />
<file src="_._" target="lib\net9.0-maccatalyst17.5" />
<file src="_._" target="lib\net9.0-macos14.5" />
</files>
</package>
12 changes: 6 additions & 6 deletions build/nuget/Uno.WinUI.Svg.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@

<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
</group>
<group targetFramework="net9.0-ios17.2">
<group targetFramework="net9.0-ios17.5">
<dependency id="Svg.Skia" version="1.0.0.1" />
<dependency id="SkiaSharp.Views.Uno" version="2.88.7" />
<dependency id="SkiaSharp.NativeAssets.ios" version="2.88.7" />

<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
</group>
<group targetFramework="net9.0-maccatalyst17.2">
<group targetFramework="net9.0-maccatalyst17.5">
<dependency id="Svg.Skia" version="1.0.0.1" />
<dependency id="SkiaSharp.Views.Uno" version="2.88.7" />
<dependency id="SkiaSharp.NativeAssets.maccatalyst" version="2.88.7" />
Expand All @@ -73,10 +73,10 @@
</dependencies>

<references>
<group targetFramework="net9.0-ios17.2">
<group targetFramework="net9.0-ios17.5">
<reference file="Uno.UI.Svg.dll" />
</group>
<group targetFramework="net9.0-maccatalyst17.2">
<group targetFramework="net9.0-maccatalyst17.5">
<reference file="Uno.UI.Svg.dll" />
</group>
<group targetFramework="net9.0-android">
Expand Down Expand Up @@ -109,8 +109,8 @@
<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.Svg.dll" target="lib\net8.0-maccatalyst17.0" />

<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net9.0-android\Uno.UI.Svg.dll" target="lib\net9.0-android" />
<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net9.0-ios17.2\Uno.UI.Svg.dll" target="lib\net9.0-ios17.2" />
<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.Svg.dll" target="lib\net9.0-maccatalyst17.2" />
<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net9.0-ios17.5\Uno.UI.Svg.dll" target="lib\net9.0-ios17.5" />
<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net9.0-maccatalyst17.5\Uno.UI.Svg.dll" target="lib\net9.0-maccatalyst17.5" />

<!-- Build targets -->
<file src="..\..\src\AddIns\Uno.UI.Svg\buildTransitive\*" target="buildTransitive" />
Expand Down
Loading
Loading