Skip to content

Commit

Permalink
build: use uno.sdk.private for samples/testing
Browse files Browse the repository at this point in the history
  • Loading branch information
kazo0 committed Dec 10, 2024
1 parent 44e66c1 commit f10bc9b
Show file tree
Hide file tree
Showing 11 changed files with 62 additions and 90 deletions.
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</ItemGroup>-->

<PropertyGroup>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<!-- Forces Uno's XamlFileGenerator to write error when XAML is invalid-->
<ShouldWriteErrorOnInvalidXaml>True</ShouldWriteErrorOnInvalidXaml>
</PropertyGroup>
Expand Down
52 changes: 52 additions & 0 deletions SamplePackages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<Project ToolsVersion="15.0">
<PropertyGroup>
<UnoVersion>5.5.87</UnoVersion>
<UnoToolkitVersion>6.3.7</UnoToolkitVersion>
<UnoThemesVersion>5.3.1</UnoThemesVersion>
<UnoCSharpMarkupVersion>5.5.6</UnoCSharpMarkupVersion>
<UnoWasmBootstrapVersion>8.0.21</UnoWasmBootstrapVersion>
<UnoLoggingVersion>1.7.0</UnoLoggingVersion>
<UnoCoreLoggingSingletonVersion>4.1.1</UnoCoreLoggingSingletonVersion>
<UnoUniversalImageLoaderVersion>1.9.37</UnoUniversalImageLoaderVersion>
<UnoDspTasksVersion>1.4.0</UnoDspTasksVersion>
<UnoResizetizerVersion>1.6.1</UnoResizetizerVersion>
<SkiaSharpVersion>2.88.9-preview.2.2</SkiaSharpVersion>
<SvgSkiaVersion>2.0.0.4</SvgSkiaVersion>
<WinAppSdkVersion>1.6.241114003</WinAppSdkVersion>
<WinAppSdkBuildToolsVersion>10.0.26100.1742</WinAppSdkBuildToolsVersion>
<MicrosoftLoggingVersion>8.0.1</MicrosoftLoggingVersion>
<WindowsCompatibilityVersion>8.0.11</WindowsCompatibilityVersion>
<MicrosoftIdentityClientVersion>4.65.0</MicrosoftIdentityClientVersion>
<CommunityToolkitMvvmVersion>8.3.2</CommunityToolkitMvvmVersion>
<PrismVersion>9.0.537</PrismVersion>
<AndroidMaterialVersion>1.11.0.3</AndroidMaterialVersion>
<AndroidXLegacySupportV4Version>1.0.0.23</AndroidXLegacySupportV4Version>
<AndroidXAppCompatVersion>1.7.0.3</AndroidXAppCompatVersion>
<AndroidXRecyclerViewVersion>1.3.2.8</AndroidXRecyclerViewVersion>
<AndroidXActivityVersion>1.9.2.1</AndroidXActivityVersion>
<AndroidXBrowserVersion>1.8.0.6</AndroidXBrowserVersion>
<AndroidXSwipeRefreshLayoutVersion>1.1.0.24</AndroidXSwipeRefreshLayoutVersion>
<AndroidXNavigationVersion>2.8.0.1</AndroidXNavigationVersion>
<AndroidXCollectionVersion>1.4.4</AndroidXCollectionVersion>
<MauiVersion>8.0.91</MauiVersion>
</PropertyGroup>

<ItemGroup>
<!-- Microsoft Logging -->
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftLoggingVersion)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftLoggingVersion)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftLoggingVersion)" />

<!-- SkiaSharp -->
<PackageVersion Include="SkiaSharp" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.Skottie" Version="$(SkiaSharpVersion)" />

<!-- Maui -->
<PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageVersion Include="Microsoft.Maui.Graphics" Version="$(MauiVersion)" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.44",
"Uno.Sdk": "5.3.96"
"Uno.Sdk": "5.3.96",
"Uno.Sdk.Private": "5.5.87"
}
}
20 changes: 1 addition & 19 deletions samples/MauiEmbedding/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,16 @@
See https://aka.platform.uno/using-uno-sdk for more information.
-->
<Import Project="$(MSBuildThisFileDirectory)..\..\SamplePackages.props" />
<ItemGroup>
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageVersion Include="SkiaSharp" Version="2.88.8" />
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.8" />
<PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.8" />
<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.8" />
<PackageVersion Include="Syncfusion.Maui.Core" Version="22.2.9" />
<PackageVersion Include="Syncfusion.Maui.Charts" Version="22.2.9" />
<PackageVersion Include="Syncfusion.Maui.DataGrid" Version="22.2.9" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.1.1" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" />
<PackageVersion Include="Telerik.UI.for.Maui" Version="5.1.0" Condition="$(_UseTelerik)" />
<PackageVersion Include="Esri.ArcGISRuntime.Maui" Version="200.1.0" />
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.4" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />

<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
<PackageVersion Include="Microsoft.Maui.Graphics" Version="8.0.3" />

<PackageVersion Include="Xamarin.AndroidX.Navigation.UI" Version="2.7.7.1" />
<PackageVersion Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.7.7.1"/>
<PackageVersion Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.7.7.1"/>
<PackageVersion Include="Xamarin.AndroidX.Navigation.Common" Version="2.7.7.1"/>
<PackageVersion Include="Xamarin.AndroidX.Collection" Version="1.4.0.1"/>
<PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.0.1" />
<PackageVersion Include="Xamarin.AndroidX.Collection.Jvm" Version="1.4.0.1" />
</ItemGroup>
</Project>
20 changes: 1 addition & 19 deletions samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Uno.Sdk">
<Project Sdk="Uno.Sdk.Private">
<Import Project="..\..\..\src\tfms-ui-maui.props" />

<PropertyGroup>
Expand Down Expand Up @@ -36,14 +36,6 @@
</UnoFeatures>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton"/>
</ItemGroup>

<ItemGroup Condition="'$(IsIOSOrCatalyst)' == 'true'">
<PackageReference Include="Uno.Extensions.Logging.OSLog" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Uno.Extensions.Core.UI\Uno.Extensions.Core.WinUI.csproj" />
<ProjectReference Include="..\..\..\src\Uno.Extensions.Configuration\Uno.Extensions.Configuration.csproj" />
Expand All @@ -69,16 +61,6 @@
<Import Project="..\..\..\src\Uno.Extensions.Navigation\build\Package.targets" />
<Import Project="..\..\..\src\Uno.Extensions.Navigation.UI\build\Package.targets" />

<ItemGroup Condition="'$(IsAndroid)' == 'true'">
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Common" />
<PackageReference Include="Xamarin.AndroidX.Collection" />
<PackageReference Include="Xamarin.AndroidX.Collection.Jvm" />
<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility"/>
Expand Down
12 changes: 0 additions & 12 deletions samples/Playground/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,4 @@
-->
<NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton"/>
</ItemGroup>

<ItemGroup Condition="'$(IsBrowserWasm)'=='true'">
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" />
</ItemGroup>

<ItemGroup Condition="'$(IsIOSOrCatalyst)' == 'true'">
<PackageReference Include="Uno.Extensions.Logging.OSLog" />
</ItemGroup>
</Project>
12 changes: 1 addition & 11 deletions samples/Playground/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
<Project ToolsVersion="15.0">
<Import Project="$(MSBuildThisFileDirectory)..\..\SamplePackages.props" />
<ItemGroup>
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.2.0" />
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
<PackageVersion Include="Refit" Version="7.2.22" />
<PackageVersion Include="Refit.HttpClientFactory" Version="7.2.22" />
<PackageVersion Include="SkiaSharp.Views" Version="2.88.7" />
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="Uno.Core" Version="4.1.1" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.1.1" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion samples/Playground/Playground/Playground.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Uno.Sdk">
<Project Sdk="Uno.Sdk.Private">
<Import Project="..\..\..\src\tfms-ui-winui.props" />

<PropertyGroup>
Expand Down Expand Up @@ -33,6 +33,7 @@
Material;
Toolkit;
Mvvm;
Skia;
</UnoFeatures>
</PropertyGroup>

Expand Down
10 changes: 1 addition & 9 deletions testing/TestHarness/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project ToolsVersion="15.0">
<Import Project="$(MSBuildThisFileDirectory)..\..\SamplePackages.props" />
<ItemGroup>
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.0.0" />
<PackageVersion Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="FluentValidation" Version="11.4.0" />
Expand All @@ -20,23 +20,15 @@
<!--<PackageVersion Include="Microsoft.Toolkit.Uwp.UI" Version="7.1.2" />
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.5" />-->
<!--<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2365.46" />-->
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
<PackageVersion Include="Refit" Version="7.2.22" />
<PackageVersion Include="Refit.HttpClientFactory" Version="7.2.22" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI" Version="7.1.100" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.1.1" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)"/>
<PackageVersion Include="Uno.UITest" Version="1.1.0-dev.70" />
<PackageVersion Include="Uno.UITest.Selenium" Version="1.1.0-dev.70" />
<PackageVersion Include="Uno.UITest.Xamarin" Version="1.1.0-dev.70" />
<PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
<PackageVersion Include="Uno.WinUI" Version="$(UnoVersion)" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NUnit" Version="4.1.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
<PackageReference Include="MSTest.TestFramework"/>
</ItemGroup>

<ItemGroup>
<PackageVersion Include="SkiaSharp" Version="2.88.8" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
</ItemGroup>
Expand Down
14 changes: 1 addition & 13 deletions testing/TestHarness/TestHarness/TestHarness.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Uno.Sdk">
<Project Sdk="Uno.Sdk.Private">
<Import Project="..\..\..\src\tfms-ui-winui.props" />

<PropertyGroup>
Expand Down Expand Up @@ -89,20 +89,8 @@
<ProjectReference Include="..\..\..\src\Uno.Extensions.Validation.Fluent\Uno.Extensions.Validation.Fluent.csproj" />
<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />

<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" />
<PackageReference Include="Uno.WinUI" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
<!--<PackageReference Include="Uno.Wasm.Bootstrap" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" />
<PackageReference Include="Uno.Resizetizer" />-->
</ItemGroup>

<ItemGroup Condition="'$(IsBrowserWasm)'=='true'">
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" />
</ItemGroup>

<ItemGroup Condition="'$(IsIOSOrCatalyst)' == 'true'">
<PackageReference Include="Uno.Extensions.Logging.OSLog" />
</ItemGroup>

</Project>

0 comments on commit f10bc9b

Please sign in to comment.