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

Uno 4.2.6 update #50

Merged
merged 4 commits into from
Apr 22, 2022
Merged

Uno 4.2.6 update #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d67626
Updated project banner
jamesmcroft Apr 22, 2022
00f71d7
Updated MADE.NET packages to 1.5.0
jamesmcroft Apr 22, 2022
3764d04
Updated Microsoft.UI.Xaml to 2.7.1
jamesmcroft Apr 22, 2022
27e80ab
Updated Uno packages to 4.2.6
jamesmcroft Apr 22, 2022
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
Binary file modified assets/ProjectBanner.afdesign
View file
Open in desktop
Binary file not shown.
22 changes: 11 additions & 11 deletions samples/MADE.Samples/MADE.Samples.Droid/MADE.Samples.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@
<PackageReference Include="CommunityToolkit.Mvvm">
<Version>7.1.2</Version>
</PackageReference>
<PackageReference Include="MADE.Collections" Version="1.4.0" />
<PackageReference Include="MADE.Data.Converters" Version="1.4.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.4.0" />
<PackageReference Include="MADE.Diagnostics" Version="1.4.0" />
<PackageReference Include="MADE.Foundation" Version="1.4.0" />
<PackageReference Include="MADE.Networking" Version="1.4.0" />
<PackageReference Include="MADE.Runtime" Version="1.4.0" />
<PackageReference Include="MADE.Threading" Version="1.4.0" />
<PackageReference Include="MADE.Collections" Version="1.5.0" />
<PackageReference Include="MADE.Data.Converters" Version="1.5.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.5.0" />
<PackageReference Include="MADE.Diagnostics" Version="1.5.0" />
<PackageReference Include="MADE.Foundation" Version="1.5.0" />
<PackageReference Include="MADE.Networking" Version="1.5.0" />
<PackageReference Include="MADE.Runtime" Version="1.5.0" />
<PackageReference Include="MADE.Threading" Version="1.5.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
<Version>5.0.2</Version>
</PackageReference>
Expand All @@ -89,11 +89,11 @@
<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
<Version>7.1.11</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging">
<Version>4.1.8</Version>
<Version>4.2.6</Version>
</PackageReference>
<PackageReference Include="Uno.UI.RemoteControl" Version="4.1.8" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.2.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
</ItemGroup>
<ItemGroup>
Expand Down
20 changes: 10 additions & 10 deletions samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<PackageReference Include="CommunityToolkit.Mvvm">
<Version>7.1.2</Version>
</PackageReference>
<PackageReference Include="MADE.Collections" Version="1.4.0" />
<PackageReference Include="MADE.Data.Converters" Version="1.4.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.4.0" />
<PackageReference Include="MADE.Diagnostics" Version="1.4.0" />
<PackageReference Include="MADE.Foundation" Version="1.4.0" />
<PackageReference Include="MADE.Networking" Version="1.4.0" />
<PackageReference Include="MADE.Runtime" Version="1.4.0" />
<PackageReference Include="MADE.Threading" Version="1.4.0" />
<PackageReference Include="MADE.Collections" Version="1.5.0" />
<PackageReference Include="MADE.Data.Converters" Version="1.5.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.5.0" />
<PackageReference Include="MADE.Diagnostics" Version="1.5.0" />
<PackageReference Include="MADE.Foundation" Version="1.5.0" />
<PackageReference Include="MADE.Networking" Version="1.5.0" />
<PackageReference Include="MADE.Runtime" Version="1.5.0" />
<PackageReference Include="MADE.Threading" Version="1.5.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
<Version>5.0.2</Version>
</PackageReference>
Expand All @@ -37,13 +37,13 @@
<Version>7.1.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.6.2</Version>
<Version>2.7.1</Version>
</PackageReference>
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton">
<Version>4.0.1</Version>
</PackageReference>
<PackageReference Include="Uno.UI">
<Version>4.1.8</Version>
<Version>4.2.6</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup>
Expand Down
28 changes: 14 additions & 14 deletions samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,25 @@
<ItemGroup>
<!-- Note that for WebAssembly version 1.1.1 of the console logger required -->
<PackageReference Include="CommunityToolkit.Mvvm" Version="7.1.2" />
<PackageReference Include="MADE.Collections" Version="1.4.0" />
<PackageReference Include="MADE.Data.Converters" Version="1.4.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.4.0" />
<PackageReference Include="MADE.Diagnostics" Version="1.4.0" />
<PackageReference Include="MADE.Foundation" Version="1.4.0" />
<PackageReference Include="MADE.Networking" Version="1.4.0" />
<PackageReference Include="MADE.Runtime" Version="1.4.0" />
<PackageReference Include="MADE.Threading" Version="1.4.0" />
<PackageReference Include="MADE.Collections" Version="1.5.0" />
<PackageReference Include="MADE.Data.Converters" Version="1.5.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.5.0" />
<PackageReference Include="MADE.Diagnostics" Version="1.5.0" />
<PackageReference Include="MADE.Foundation" Version="1.5.0" />
<PackageReference Include="MADE.Networking" Version="1.5.0" />
<PackageReference Include="MADE.Runtime" Version="1.5.0" />
<PackageReference Include="MADE.Threading" Version="1.5.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
<PackageReference Include="Uno.ColorCode.UWP" Version="2.1.0-uno.32" />
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.1.0" />
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0" />
<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.11" />
<PackageReference Include="Uno.UI.WebAssembly" Version="4.1.8" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.1.8" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.8" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.2.0" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.2.0" />
<PackageReference Include="Uno.UI.WebAssembly" Version="4.2.6" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.2.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.2.6" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.3.1" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.3.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\MADE.UI.Controls.ChipBox\MADE.UI.Controls.ChipBox.csproj" />
Expand Down
24 changes: 12 additions & 12 deletions samples/MADE.Samples/MADE.Samples.iOS/MADE.Samples.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@
<PackageReference Include="CommunityToolkit.Mvvm">
<Version>7.1.2</Version>
</PackageReference>
<PackageReference Include="MADE.Collections" Version="1.4.0" />
<PackageReference Include="MADE.Data.Converters" Version="1.4.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.4.0" />
<PackageReference Include="MADE.Diagnostics" Version="1.4.0" />
<PackageReference Include="MADE.Foundation" Version="1.4.0" />
<PackageReference Include="MADE.Networking" Version="1.4.0" />
<PackageReference Include="MADE.Runtime" Version="1.4.0" />
<PackageReference Include="MADE.Threading" Version="1.4.0" />
<PackageReference Include="MADE.Collections" Version="1.5.0" />
<PackageReference Include="MADE.Data.Converters" Version="1.5.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.5.0" />
<PackageReference Include="MADE.Diagnostics" Version="1.5.0" />
<PackageReference Include="MADE.Foundation" Version="1.5.0" />
<PackageReference Include="MADE.Networking" Version="1.5.0" />
<PackageReference Include="MADE.Runtime" Version="1.5.0" />
<PackageReference Include="MADE.Threading" Version="1.5.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
<Version>5.0.2</Version>
</PackageReference>
Expand All @@ -139,16 +139,16 @@
<Version>2.1.0-uno.32</Version>
</PackageReference>
<PackageReference Include="Uno.Extensions.Logging.OSLog">
<Version>1.1.0</Version>
<Version>1.3.0</Version>
</PackageReference>
<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
<Version>7.1.11</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging">
<Version>4.1.8</Version>
<Version>4.2.6</Version>
</PackageReference>
<PackageReference Include="Uno.UI.RemoteControl" Version="4.1.8" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.2.6" Condition="'$(Configuration)'=='Debug'" />
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\Contents.json">
Expand Down
2 changes: 1 addition & 1 deletion src/MADE.UI.Controls.ChipBox/MADE.UI.Controls.ChipBox.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/MADE.UI.Controls.DropDownList/MADE.UI.Controls.DropDownList.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MADE.Collections" Version="1.4.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.4.0" />
<PackageReference Include="MADE.Collections" Version="1.5.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/MADE.UI.Controls.FilePicker/MADE.UI.Controls.FilePicker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MADE.Data.Validation" Version="1.4.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/MADE.UI.Controls.RichEditToolbar/MADE.UI.Controls.RichEditToolbar.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/MADE.UI.Controls.Validator/MADE.UI.Controls.Validator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MADE.Data.Validation" Version="1.4.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/MADE.UI.Data.Converters/MADE.UI.Data.Converters.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MADE.Data.Converters" Version="1.4.0" />
<PackageReference Include="MADE.Data.Converters" Version="1.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/MADE.UI.Styling/MADE.UI.Styling.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
Expand All @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MADE.Data.Validation" Version="1.4.0" />
<PackageReference Include="MADE.Data.Validation" Version="1.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/MADE.UI.ViewManagement/MADE.UI.ViewManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MADE.Foundation" Version="1.4.0" />
<PackageReference Include="MADE.Foundation" Version="1.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/MADE.UI.Views.Dialogs/MADE.UI.Views.Dialogs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/MADE.UI.Views.Navigation.Mvvm/MADE.UI.Views.Navigation.Mvvm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/MADE.UI.Views.Navigation/MADE.UI.Views.Navigation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/MADE.UI/MADE.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="4.1.8" />
<PackageReference Include="Uno.UI" Version="4.2.6" />
</ItemGroup>

<ItemGroup>
Expand Down