Skip to content

Commit

Permalink
chore: Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@Youssef1313
Youssef1313 committed May 17, 2024
1 parent 601a3d7 commit b80e23d
Show file tree
Hide file tree
Showing 11 changed files with 98 additions and 96 deletions.
16 changes: 8 additions & 8 deletions build/nuget/Uno.WinUI.DevServer.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.3.2" />
</group>

<!-- net8.0-maccatalyst -->
<group targetFramework="net8.0-maccatalyst">
<!-- net8.0-maccatalyst17.0 -->
<group targetFramework="net8.0-maccatalyst17.0">
<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 @@ -61,8 +61,8 @@
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.3.2" />
</group>

<!-- net9.0-maccatalyst -->
<group targetFramework="net9.0-maccatalyst">
<!-- net9.0-maccatalyst17.2 -->
<group targetFramework="net9.0-maccatalyst17.2">
<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 @@ -136,8 +136,8 @@
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-ios17.0\Uno.UI.RemoteControl.dll" target="lib\net8.0-ios17.0" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-ios17.0\Uno.UI.RemoteControl.pdb" target="lib\net8.0-ios17.0" />

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

<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-macos\Uno.UI.RemoteControl.dll" target="lib\net8.0-macos" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net8.0-macos\Uno.UI.RemoteControl.pdb" target="lib\net8.0-macos" />
Expand All @@ -148,8 +148,8 @@
<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-maccatalyst\Uno.UI.RemoteControl.dll" target="lib\net9.0-maccatalyst" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.RemoteControl.pdb" target="lib\net9.0-maccatalyst" />
<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-macos\Uno.UI.RemoteControl.dll" target="lib\net9.0-macos" />
<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos\Uno.UI.RemoteControl.pdb" target="lib\net9.0-macos" />
Expand Down
12 changes: 6 additions & 6 deletions build/nuget/Uno.WinUI.Lottie.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="net8.0-maccatalyst">
<group targetFramework="net8.0-maccatalyst17.0">
<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" />
Expand Down Expand Up @@ -80,7 +80,7 @@
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="net9.0-maccatalyst">
<group targetFramework="net9.0-maccatalyst17.2">
<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" />
Expand All @@ -102,7 +102,7 @@
<group targetFramework="net8.0-ios17.0">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net8.0-maccatalyst">
<group targetFramework="net8.0-maccatalyst17.0">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net8.0-macos">
Expand All @@ -114,7 +114,7 @@
<group targetFramework="net9.0-ios17.2">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net9.0-maccatalyst">
<group targetFramework="net9.0-maccatalyst17.2">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net9.0-macos">
Expand All @@ -139,11 +139,11 @@

<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net8.0-android\Uno.UI.Lottie.dll" target="lib\net8.0-android" />
<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net8.0-ios17.0\Uno.UI.Lottie.dll" target="lib\net8.0-ios17.0" />
<file src="..\..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.Lottie.dll" target="lib\net8.0-maccatalyst" />
<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-maccatalyst\Uno.UI.Lottie.dll" target="lib\net9.0-maccatalyst" />
<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" />

<!-- Build targets -->
<file src="..\..\src\AddIns\Uno.UI.Lottie\buildTransitive\*" target="buildTransitive" />
Expand Down
8 changes: 4 additions & 4 deletions build/nuget/Uno.WinUI.MSAL.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.47.0" />
</group>
<group targetFramework="net8.0-maccatalyst13.5">
<group targetFramework="net8.0-maccatalyst17.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.47.0" />
</group>
Expand All @@ -58,7 +58,7 @@
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.47.0" />
</group>
<group targetFramework="net9.0-maccatalyst13.5">
<group targetFramework="net9.0-maccatalyst17.2">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.47.0" />
</group>
Expand All @@ -85,12 +85,12 @@

<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-android\Uno.UI.MSAL.*" target="lib\net8.0-android" />
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-ios17.0\Uno.UI.MSAL.*" target="lib\net8.0-ios17.0" />
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.MSAL.*" target="lib\net8.0-maccatalyst" />
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.MSAL.*" target="lib\net8.0-maccatalyst17.0" />
<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net8.0-macos\Uno.UI.MSAL.*" target="lib\net8.0-macos" />

<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-maccatalyst\Uno.UI.MSAL.*" target="lib\net9.0-maccatalyst" />
<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-macos\Uno.UI.MSAL.*" target="lib\net9.0-macos" />

<!-- Build targets -->
Expand Down
4 changes: 2 additions & 2 deletions build/nuget/Uno.WinUI.RemoteControl.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@

<file src="_._" target="lib\net8.0-android" />
<file src="_._" target="lib\net8.0-ios17.0" />
<file src="_._" target="lib\net8.0-maccatalyst" />
<file src="_._" target="lib\net8.0-maccatalyst17.0" />
<file src="_._" target="lib\net8.0-macos" />

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

<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
</group>
<group targetFramework="net8.0-maccatalyst">
<group targetFramework="net8.0-maccatalyst17.0">
<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 @@ -63,7 +63,7 @@

<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
</group>
<group targetFramework="net9.0-maccatalyst">
<group targetFramework="net9.0-maccatalyst17.2">
<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 @@ -76,7 +76,7 @@
<group targetFramework="net9.0-ios17.2">
<reference file="Uno.UI.Svg.dll" />
</group>
<group targetFramework="net9.0-maccatalyst">
<group targetFramework="net9.0-maccatalyst17.2">
<reference file="Uno.UI.Svg.dll" />
</group>
<group targetFramework="net9.0-android">
Expand All @@ -88,7 +88,7 @@
<group targetFramework="net8.0-ios17.0">
<reference file="Uno.UI.Svg.dll" />
</group>
<group targetFramework="net8.0-maccatalyst">
<group targetFramework="net8.0-maccatalyst17.0">
<reference file="Uno.UI.Svg.dll" />
</group>
<group targetFramework="net8.0-android">
Expand All @@ -106,11 +106,11 @@

<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net8.0-android\Uno.UI.Svg.dll" target="lib\net8.0-android" />
<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net8.0-ios17.0\Uno.UI.Svg.dll" target="lib\net8.0-ios17.0" />
<file src="..\..\src\AddIns\Uno.UI.Svg\bin\Uno.UI.Svg.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.Svg.dll" target="lib\net8.0-maccatalyst" />
<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-maccatalyst\Uno.UI.Svg.dll" target="lib\net9.0-maccatalyst" />
<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" />

<!-- Build targets -->
<file src="..\..\src\AddIns\Uno.UI.Svg\buildTransitive\*" target="buildTransitive" />
Expand Down
12 changes: 6 additions & 6 deletions build/nuget/Uno.WinUI.XamlHost.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<group targetFramework="net8.0-ios17.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
</group>
<group targetFramework="net8.0-maccatalyst13.5">
<group targetFramework="net8.0-maccatalyst17.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
</group>
<group targetFramework="net8.0-macos10.15">
Expand All @@ -31,7 +31,7 @@
<group targetFramework="net9.0-ios17.2">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
</group>
<group targetFramework="net9.0-maccatalyst13.5">
<group targetFramework="net9.0-maccatalyst17.2">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
</group>
<group targetFramework="net9.0-macos10.15">
Expand All @@ -46,8 +46,8 @@
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-ios17.0\Uno.UI.XamlHost.dll" target="lib\net8.0-ios17.0" />
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-ios17.0\Uno.UI.XamlHost.pdb" target="lib\net8.0-ios17.0" />

<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.XamlHost.dll" target="lib\net8.0-maccatalyst" />
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-maccatalyst\Uno.UI.XamlHost.pdb" target="lib\net8.0-maccatalyst" />
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.XamlHost.dll" target="lib\net8.0-maccatalyst17.0" />
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-maccatalyst17.0\Uno.UI.XamlHost.pdb" target="lib\net8.0-maccatalyst17.0" />

<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-macos\Uno.UI.XamlHost.dll" target="lib\net8.0-macos" />
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net8.0-macos\Uno.UI.XamlHost.pdb" target="lib\net8.0-macos" />
Expand All @@ -58,8 +58,8 @@
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-ios17.2\Uno.UI.XamlHost.dll" target="lib\net9.0-ios17.2" />
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-ios17.2\Uno.UI.XamlHost.pdb" target="lib\net9.0-ios17.2" />

<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.XamlHost.dll" target="lib\net9.0-maccatalyst" />
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-maccatalyst\Uno.UI.XamlHost.pdb" target="lib\net9.0-maccatalyst" />
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.XamlHost.dll" target="lib\net9.0-maccatalyst17.2" />
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-maccatalyst17.2\Uno.UI.XamlHost.pdb" target="lib\net9.0-maccatalyst17.2" />

<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-macos\Uno.UI.XamlHost.dll" target="lib\net9.0-macos" />
<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-macos\Uno.UI.XamlHost.pdb" target="lib\net9.0-macos" />
Expand Down

0 comments on commit b80e23d

Please sign in to comment.