Skip to content

Commit d0e05de

Browse files
jamesmcroftjamesmcroft
committed
Merge branch 'main' into feature/docs
2 parents 0183a53 + 32f0629 commit d0e05de

19 files changed

Lines changed: 35 additions & 28 deletions

File tree

‎samples/MADE.Samples/MADE.Samples.Droid/MADE.Samples.Droid.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@
6767
<Version>5.0.2</Version>
6868
</PackageReference>
6969
<PackageReference Include="Uno.ColorCode.UWP">
70-
<Version>2.0.8-gd42a883502</Version>
70+
<Version>2.1.0-uno.32</Version>
7171
</PackageReference>
7272
<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
7373
<Version>7.0.0</Version>
7474
</PackageReference>
75-
<PackageReference Include="Uno.UI" Version="3.10.11" />
76-
<PackageReference Include="Uno.UI.RemoteControl" Version="3.10.11" Condition="'$(Configuration)'=='Debug'" />
75+
<PackageReference Include="Uno.UI" Version="4.0.9" />
76+
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.9" Condition="'$(Configuration)'=='Debug'" />
7777
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
7878
</ItemGroup>
7979
<ItemGroup>

‎samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<Version>6.2.13</Version>
2121
</PackageReference>
2222
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
23-
<Version>7.1.1</Version>
23+
<Version>7.1.2</Version>
2424
</PackageReference>
2525
</ItemGroup>
2626
<PropertyGroup>

‎samples/MADE.Samples/MADE.Samples.Wasm/LinkerConfig.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<linker>
22
<assembly fullname="MADE.Samples.Wasm" />
33
<assembly fullname="Uno.UI" />
4+
<assembly fullname="Microsoft.Extensions.Options" />
45

56
<assembly fullname="System.Core">
67
<!-- This is required by JSon.NET and any expression.Compile caller -->

‎samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project Sdk="Microsoft.NET.Sdk.Web">
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
65
<NoWarn>NU1701</NoWarn>
76
</PropertyGroup>
87
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
98
<MonoRuntimeDebuggerEnabled>true</MonoRuntimeDebuggerEnabled>
109
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
1110
<DebugType>portable</DebugType>
1211
<DebugSymbols>true</DebugSymbols>
12+
<!--
13+
IL Linking is disabled in Debug configuration.
14+
When building in Release, see https://platform.uno/docs/articles/features/using-il-linker-webassembly.html
15+
-->
16+
<WasmShellILLinkerEnabled>false</WasmShellILLinkerEnabled>
1317
</PropertyGroup>
1418
<ItemGroup>
1519
<Content Include="Assets\SplashScreen.png" />
@@ -39,12 +43,14 @@
3943
<!-- Note that for WebAssembly version 1.1.1 of the console logger required -->
4044
<PackageReference Include="CommunityToolkit.Mvvm" Version="7.0.3" />
4145
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
42-
<PackageReference Include="Uno.ColorCode.UWP" Version="2.0.8-gd42a883502" />
46+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
47+
<PackageReference Include="Uno.ColorCode.UWP" Version="2.1.0-uno.32" />
4348
<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.0.0" />
44-
<PackageReference Include="Uno.UI.WebAssembly" Version="3.10.11" />
45-
<PackageReference Include="Uno.UI.RemoteControl" Version="3.10.11" Condition="'$(Configuration)'=='Debug'" />
46-
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.0.0" />
47-
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.0.0" />
49+
<PackageReference Include="Uno.UI.WebAssembly" Version="4.0.9" />
50+
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.9" Condition="'$(Configuration)'=='Debug'" />
51+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.9" />
52+
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.1.2" />
53+
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.1.2" />
4854
</ItemGroup>
4955
<ItemGroup>
5056
<ProjectReference Include="..\..\..\src\MADE.Collections\MADE.Collections.csproj" />

‎samples/MADE.Samples/MADE.Samples.iOS/MADE.Samples.iOS.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@
122122
<Version>5.0.2</Version>
123123
</PackageReference>
124124
<PackageReference Include="Uno.ColorCode.UWP">
125-
<Version>2.0.8-gd42a883502</Version>
125+
<Version>2.1.0-uno.32</Version>
126126
</PackageReference>
127127
<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
128128
<Version>7.0.0</Version>
129129
</PackageReference>
130-
<PackageReference Include="Uno.UI" Version="3.10.11" />
131-
<PackageReference Include="Uno.UI.RemoteControl" Version="3.10.11" Condition="'$(Configuration)'=='Debug'" />
130+
<PackageReference Include="Uno.UI" Version="4.0.9" />
131+
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.9" Condition="'$(Configuration)'=='Debug'" />
132132
</ItemGroup>
133133
<ItemGroup>
134134
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\Contents.json">

‎src/MADE.UI.Controls.FilePicker/MADE.UI.Controls.FilePicker.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
17-
<PackageReference Include="Uno.UI" Version="3.10.11" />
17+
<PackageReference Include="Uno.UI" Version="4.0.9" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/MADE.UI.Controls.Validator/MADE.UI.Controls.Validator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
17-
<PackageReference Include="Uno.UI" Version="3.10.11" />
17+
<PackageReference Include="Uno.UI" Version="4.0.9" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/MADE.UI.Styling/MADE.UI.Styling.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
17-
<PackageReference Include="Uno.UI" Version="3.10.11" />
17+
<PackageReference Include="Uno.UI" Version="4.0.9" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/MADE.UI.ViewManagement/MADE.UI.ViewManagement.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
17-
<PackageReference Include="Uno.UI" Version="3.10.11" />
17+
<PackageReference Include="Uno.UI" Version="4.0.9" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/MADE.UI.Views.Dialogs/MADE.UI.Views.Dialogs.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
16-
<PackageReference Include="Uno.UI" Version="3.10.11" />
16+
<PackageReference Include="Uno.UI" Version="4.0.9" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

0 commit comments

Comments
 (0)