github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-23 06:25:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #31 from nventive/dev/jela/history

Browse source 
Update to uno latest
This commit is contained in:
Jérôme Laban 2019-05-23 22:25:34 -04:00 • committed by GitHub
commit df1a74306b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Calculator.Droid/Calculator.Droid.csproj
View file

@ -20,7 +20,7 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile> <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
<ResourcesDirectory>..\Calculator.Shared\Strings</ResourcesDirectory> <ResourcesDirectory>..\Calculator.Shared\Strings</ResourcesDirectory>
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -55,7 +55,7 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="1.45.0-dev.1457" /> <PackageReference Include="Uno.UI" Version="1.45.0-dev.1533" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" /> <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Calculator.UWP/Calculator.UWP.csproj
View file

@ -9,7 +9,7 @@
<Version>4.3.1</Version> <Version>4.3.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Uno.UI"> <PackageReference Include="Uno.UI">
<Version>1.45.0-dev.1503</Version> <Version>1.45.0-dev.1533</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>

2
src/Calculator.Wasm/Calculator.Wasm.csproj
View file

@ -36,7 +36,7 @@
<ItemGroup> <ItemGroup>
<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" Version="1.45.0-dev.1503" /> <PackageReference Include="Uno.UI" Version="1.45.0-dev.1533" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.278" /> <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.278" />
<DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0-dev.276" /> <DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0-dev.276" />
</ItemGroup> </ItemGroup>

9
src/Calculator.iOS/Calculator.iOS.csproj
View file

@ -12,7 +12,7 @@
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
</NuGetPackageImportStamp> </NuGetPackageImportStamp>
<ResourcesDirectory>..\Calculator.Shared\Strings</ResourcesDirectory> <ResourcesDirectory>..\Calculator.Shared\Strings</ResourcesDirectory>
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -78,8 +78,9 @@
<MtouchArch>ARM64</MtouchArch> <MtouchArch>ARM64</MtouchArch>
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
<MtouchExtraArgs>-gcc_flags "-lc++ -lstdc++" --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs> <MtouchExtraArgs>-gcc_flags "-lc++ -lstdc++" --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
<CodesignProvision>Uno Calculator</CodesignProvision> <CodesignProvision>
<CodesignKey>iPhone Distribution</CodesignKey> </CodesignProvision>
<CodesignKey>iPhone Developer</CodesignKey>
<CodesignExtraArgs /> <CodesignExtraArgs />
<CodesignResourceRules /> <CodesignResourceRules />
<MtouchUseLlvm>true</MtouchUseLlvm> <MtouchUseLlvm>true</MtouchUseLlvm>
@ -189,7 +190,7 @@
<BundleResource Include="Resources\Fonts\winjs-symbols.ttf" /> <BundleResource Include="Resources\Fonts\winjs-symbols.ttf" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="1.45.0-dev.1503" /> <PackageReference Include="Uno.UI" Version="1.45.0-dev.1533" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'iPhoneSimulator' "> <ItemGroup Condition=" '$(Platform)' == 'iPhoneSimulator' ">
<NativeReference Include="NativeReferences/x86_64/libCalcManager.a"> <NativeReference Include="NativeReferences/x86_64/libCalcManager.a">