Merge pull request #91 from unoplatform/dev/jela/uno-update5

Uno update
This commit is contained in:
Jérôme Laban 2020-11-02 08:49:41 -05:00 коммит произвёл GitHub
Родитель 5e5c0bee92 ea80dae203
Коммит 8a01e8443d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nventive.xamlcontrolsgallery" android:versionCode="35" android:versionName="1.0" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:label="XAML Controls Gallery"></application>
</manifest>

Просмотреть файл

@ -16,7 +16,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
<ResourcesDirectory>..\AppUIBasics.Shared\Strings</ResourcesDirectory>
@ -76,12 +76,12 @@
<PackageReference Include="Uno.ColorCode.UWP">
<Version>2.0.8-gd42a883502</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="3.0.0-dev.1549" />
<PackageReference Include="Uno.UI" Version="3.2.0-dev.401" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.2-uno.74" />
<PackageReference Include="System.Json" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.33" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />

Просмотреть файл

@ -41,7 +41,7 @@
<ItemGroup>
<PackageReference Include="Uno.ColorCode.UWP" Version="2.0.8-gd42a883502" />
<PackageReference Include="Uno.UI.WebAssembly" Version="3.0.0-dev.1549" />
<PackageReference Include="Uno.UI.WebAssembly" Version="3.2.0-dev.401" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.2-uno.74" />
<PackageReference Include="System.Json" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />

Просмотреть файл

@ -123,7 +123,7 @@
<PackageReference Include="Uno.ColorCode.UWP">
<Version>2.0.8-gd42a883502</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="3.0.0-dev.1549" />
<PackageReference Include="Uno.UI" Version="3.2.0-dev.401" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.2-uno.74" />
<PackageReference Include="System.Json" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />

Просмотреть файл

@ -75,10 +75,10 @@
<PackageReference Include="Uno.ColorCode.UWP">
<Version>2.0.8-gd42a883502</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="3.0.0-dev.1549" />
<PackageReference Include="Uno.UI" Version="3.2.0-dev.401" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.2-uno.74" />
<PackageReference Include="Uno.UI" Version="2.0.512-dev.4178" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.0-dev.1549" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.2.0-dev.401" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
</ItemGroup>