unoplatform
/
calculator
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #449 from unoplatform/dev/jela/uno-update15 

chore: Update to uno latest, update Wasm AOT profile
This commit is contained in:
Jérôme Laban 2022-02-01 22:53:40 -05:00 коммит произвёл GitHub
Родитель c7541655da b645db8f7b
Коммит 67a37f207f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 29 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
src/Calculator.Droid/Calculator.Droid.csproj
Просмотреть файл

@ -94,13 +94,13 @@
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>13.0.1</Version> <Version>13.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" /> <PackageReference Include="Uno.UI" Version="4.1.0-dev.583" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" /> <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" /> <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.0-dev.583" />
<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.0-dev.7" /> <PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\AssemblyVersion.Android.cs"> <Compile Include="..\AssemblyVersion.Android.cs">
<Link>Properties\AssemblyVersion.Android.cs</Link> <Link>Properties\AssemblyVersion.Android.cs</Link>
@ -231,4 +231,4 @@
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>

6
src/Calculator.Skia.Gtk/Calculator.Skia.Gtk.csproj
Просмотреть файл

@ -21,12 +21,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI.Skia.Gtk" Version="4.0.0-dev.5594" /> <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.1.0-dev.583" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" /> <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.0-dev.583" />
<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.0-dev.7" /> <PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
src/Calculator.UWP/Calculator.UWP.csproj
Просмотреть файл

@ -15,10 +15,10 @@
<Version>4.3.1</Version> <Version>4.3.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Uno.UI"> <PackageReference Include="Uno.UI">
<Version>4.0.0-dev.5594</Version> <Version>4.1.0-dev.583</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.0-dev.7" /> <PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform> <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -183,4 +183,4 @@
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>

14
src/Calculator.Wasm/Calculator.Wasm.csproj
Просмотреть файл

@ -16,7 +16,7 @@
<!--<UseAOT Condition="$([MSBuild]::IsOsPlatform('Linux')) or ( $([MSBuild]::IsOsPlatform('Windows')) and '$(SkipWasmBuild)'=='' )">true</UseAOT>--> <!--<UseAOT Condition="$([MSBuild]::IsOsPlatform('Linux')) or ( $([MSBuild]::IsOsPlatform('Windows')) and '$(SkipWasmBuild)'=='' )">true</UseAOT>-->
<WasmShellMonoRuntimeExecutionMode Condition="'$(UseAOT)'!=''">InterpreterAndAOT</WasmShellMonoRuntimeExecutionMode> <WasmShellMonoRuntimeExecutionMode Condition="'$(UseAOT)'!=''">InterpreterAndAOT</WasmShellMonoRuntimeExecutionMode>
<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling> <WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>
<!--<WasmShellGenerateAOTProfile>true</WasmShellGenerateAOTProfile>--> <WasmShellGenerateAOTProfile>true</WasmShellGenerateAOTProfile>
<!-- https://github.com/dotnet/runtime/issues/50508 --> <!-- https://github.com/dotnet/runtime/issues/50508 -->
<WasmShellEnableAOTDeduplication>false</WasmShellEnableAOTDeduplication> <WasmShellEnableAOTDeduplication>false</WasmShellEnableAOTDeduplication>
@ -65,13 +65,13 @@
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Uno.UI.WebAssembly" Version="4.0.0-dev.5594" /> <PackageReference Include="Uno.UI.WebAssembly" Version="4.1.0-dev.583" />
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.37" /> <PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.42" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.0.0" /> <PackageReference Include="Uno.Wasm.Bootstrap" Version="3.2.0-dev.24" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.0.0" /> <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.2.0-dev.24" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" /> <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" /> <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.0-dev.583" />
<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.0-dev.7" /> <PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

Двоичные данные
src/Calculator.Wasm/aot.profile
Просмотреть файл

Двоичный файл не отображается.

10
src/Calculator.iOS/Calculator.iOS.csproj
Просмотреть файл

@ -215,12 +215,12 @@
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>13.0.1</Version> <Version>13.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" /> <PackageReference Include="Uno.UI" Version="4.1.0-dev.583" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" /> <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.0-dev.583" />
<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.0-dev.7" /> <PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'iPhoneSimulator' "> <ItemGroup Condition=" '$(Platform)' == 'iPhoneSimulator' ">
<NativeReference Include="NativeReferences/x86_64/libCalcManager.a"> <NativeReference Include="NativeReferences/x86_64/libCalcManager.a">
<Kind>Static</Kind> <Kind>Static</Kind>
@ -236,4 +236,4 @@
</ItemGroup> </ItemGroup>
<Import Project="..\Calculator.Shared\Calculator.Shared.projitems" Label="Shared" Condition="Exists('..\Calculator.Shared\Calculator.Shared.projitems')" /> <Import Project="..\Calculator.Shared\Calculator.Shared.projitems" Label="Shared" Condition="Exists('..\Calculator.Shared\Calculator.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project> </Project>

10
src/Calculator.macOS/Calculator.macOS.csproj
Просмотреть файл

@ -73,7 +73,7 @@
<Reference Include="System.Memory" /> <Reference Include="System.Memory" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" /> <PackageReference Include="Uno.UI" Version="4.1.0-dev.583" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
@ -85,9 +85,9 @@
<PackageReference Include="Microsoft.AppCenter.Analytics"> <PackageReference Include="Microsoft.AppCenter.Analytics">
<Version>2.6.1</Version> <Version>2.6.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" /> <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.0-dev.583" />
<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.0-dev.7" /> <PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
<ImageAsset Include="Assets.xcassets\Contents.json" /> <ImageAsset Include="Assets.xcassets\Contents.json" />
@ -151,4 +151,4 @@
<ReferencePath Remove="@(_ReferencePathToRemove)" /> <ReferencePath Remove="@(_ReferencePathToRemove)" />
</ItemGroup> </ItemGroup>
</Target> </Target>
</Project> </Project>