[Android] Remove changes to IVisualElementRenderer so it remains backwards compatible (#5619)
* [Android] Remove changes to IVisualElementRenderer so it remains backwards compatible (#5398) * return IVisualElementRenderer to previous state * set to internal * remove extra change * - ToUIBarButtonItem abi fix * - page gallery * - remove tizen from iphone configuration
This commit is contained in:
Shane Neuville
GitHub
Родитель
e46fef9190
Коммит
f0f147d6c6
|
|
@ -72,7 +72,6 @@
|
|||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<ITunesArtwork Include="iTunesArtwork" />
|
||||
<ITunesArtwork Include="iTunesArtwork@2x" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
|
||||
|
|
@ -104,6 +103,8 @@
|
|||
<ProjectReference Include="..\..\Stubs\Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS %28Forwarders%29.csproj">
|
||||
<Project>{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}</Project>
|
||||
<Name>Xamarin.Forms.Platform.iOS (Forwarders)</Name>
|
||||
<IsAppExtension>false</IsAppExtension>
|
||||
<IsWatchApp>false</IsWatchApp>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -124,54 +125,19 @@
|
|||
<BundleResource Include="Resources\Icon-Small%403x.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Azure.Mobile.Client, Version=4.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Microsoft.Azure.Mobile.Client.4.0.2\lib\xamarinios10\Microsoft.Azure.Mobile.Client.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="PCLCrypto, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d4421c8a4786956c, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\PCLCrypto.2.0.147\lib\xamarinios10\PCLCrypto.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="PInvoke.BCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="PInvoke.Kernel32, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="PInvoke.NCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="PInvoke.Windows.Core, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.IO.Compression" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="Validation, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.iOS" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Azure.Mobile.Client" Version="4.0.2" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||
<Import Project="..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
|
||||
|
||||
<PropertyGroup>
|
||||
<__XFBuildTasksLocation>$(_XFBuildTasksLocation)</__XFBuildTasksLocation>
|
||||
<__XFBuildTasksLocation Condition="'$(__XFBuildTasksLocation)' == '' AND '$(MSBuildRuntimeType)' == 'Core'">..\..\.nuspec\netstandard2.0\</__XFBuildTasksLocation>
|
||||
<__XFBuildTasksLocation Condition="'$(__XFBuildTasksLocation)' == ''">..\..\.nuspec\net46\</__XFBuildTasksLocation>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\..\.nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(__XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll')" />
|
||||
<Import Project="..\..\.nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
|
||||
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Azure.Mobile.Client" version="4.0.2" targetFramework="xamarinios10" />
|
||||
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="xamarinios10" />
|
||||
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="NETStandard.Library" version="2.0.0" targetFramework="xamarinios10" />
|
||||
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="xamarinios10" />
|
||||
<package id="PCLCrypto" version="2.0.147" targetFramework="xamarinios10" />
|
||||
<package id="PInvoke.BCrypt" version="0.3.2" targetFramework="xamarinios10" />
|
||||
<package id="PInvoke.Kernel32" version="0.3.2" targetFramework="xamarinios10" />
|
||||
<package id="PInvoke.NCrypt" version="0.3.2" targetFramework="xamarinios10" />
|
||||
<package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="xamarinios10" />
|
||||
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.ComponentModel.TypeConverter" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Console" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Globalization" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.IO" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.IO.Compression" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Linq" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Net.Http" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Net.Primitives" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Net.Sockets" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.ObjectModel" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Reflection" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Runtime" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Text.Encoding" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Threading" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Threading.Timer" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinios10" />
|
||||
<package id="Validation" version="2.2.8" targetFramework="xamarinios10" />
|
||||
</packages>
|
||||
|
|
@ -154,10 +154,6 @@
|
|||
<AndroidResource Include="Resources\drawable\cover1.jpg" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\PagesGallery\PagesGallery.Droid\PagesGallery.Droid.csproj">
|
||||
<Project>{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}</Project>
|
||||
<Name>PagesGallery.Droid</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Stubs\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android (Forwarders).csproj">
|
||||
<Project>{6e53feb1-1100-46ae-8013-17bba35cc197}</Project>
|
||||
<Name>Xamarin.Forms.Platform.Android (Forwarders)</Name>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ namespace Xamarin.Forms.Platform.Android
|
|||
IImageRendererController,
|
||||
AView.IOnFocusChangeListener,
|
||||
AView.IOnClickListener,
|
||||
AView.IOnTouchListener
|
||||
AView.IOnTouchListener,
|
||||
ILayoutChanges
|
||||
{
|
||||
bool _inputTransparent;
|
||||
bool _disposed;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,9 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
|
|||
{
|
||||
renderer.ElementPropertyChanged += OnElementPropertyChanged;
|
||||
renderer.ElementChanged += OnElementChanged;
|
||||
renderer.LayoutChange += OnLayoutChange;
|
||||
|
||||
if(renderer is ILayoutChanges layoutChanges)
|
||||
layoutChanges.LayoutChange += OnLayoutChange;
|
||||
}
|
||||
|
||||
static void OnLayoutChange(object sender, global::Android.Views.View.LayoutChangeEventArgs e)
|
||||
|
|
@ -28,7 +30,8 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
|
|||
{
|
||||
renderer.ElementPropertyChanged -= OnElementPropertyChanged;
|
||||
renderer.ElementChanged -= OnElementChanged;
|
||||
renderer.LayoutChange -= OnLayoutChange;
|
||||
if (renderer is ILayoutChanges layoutChanges)
|
||||
layoutChanges.LayoutChange -= OnLayoutChange;
|
||||
}
|
||||
|
||||
async static void OnElementChanged(object sender, VisualElementChangedEventArgs e)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ using Xamarin.Forms.Internals;
|
|||
|
||||
namespace Xamarin.Forms.Platform.Android.FastRenderers
|
||||
{
|
||||
internal sealed class ImageRenderer : AImageView, IVisualElementRenderer, IImageRendererController, IViewRenderer, ITabStop
|
||||
internal sealed class ImageRenderer : AImageView, IVisualElementRenderer, IImageRendererController, IViewRenderer, ITabStop,
|
||||
ILayoutChanges
|
||||
{
|
||||
bool _disposed;
|
||||
Image _element;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
using System;
|
||||
using ALayoutChangeEventArgs = Android.Views.View.LayoutChangeEventArgs;
|
||||
|
||||
namespace Xamarin.Forms.Platform.Android
|
||||
{
|
||||
internal interface ILayoutChanges
|
||||
{
|
||||
event EventHandler<ALayoutChangeEventArgs> LayoutChange;
|
||||
}
|
||||
}
|
||||
|
|
@ -28,7 +28,5 @@ namespace Xamarin.Forms.Platform.Android
|
|||
void SetLabelFor(int? id);
|
||||
|
||||
void UpdateLayout();
|
||||
|
||||
event EventHandler<ALayoutChangeEventArgs> LayoutChange;
|
||||
}
|
||||
}
|
||||
|
|
@ -113,6 +113,7 @@
|
|||
<Compile Include="GetDesiredSizeDelegate.cs" />
|
||||
<Compile Include="IBorderVisualElementRenderer.cs" />
|
||||
<Compile Include="IDeviceInfoProvider.cs" />
|
||||
<Compile Include="ILayoutChanges.cs" />
|
||||
<Compile Include="ITabStop.cs" />
|
||||
<Compile Include="IPickerRenderer.cs" />
|
||||
<Compile Include="Renderers\PickerEditText.cs" />
|
||||
|
|
|
|||
|
|
@ -9,9 +9,16 @@ namespace Xamarin.Forms.Platform.iOS
|
|||
{
|
||||
public static class ToolbarItemExtensions
|
||||
{
|
||||
public static UIBarButtonItem ToUIBarButtonItem(this ToolbarItem item, bool forceName = false)
|
||||
public static UIKit.UIBarButtonItem ToUIBarButtonItem(this Xamarin.Forms.ToolbarItem item, bool forceName)
|
||||
{
|
||||
return item.Order == ToolbarItemOrder.Secondary ? new SecondaryToolbarItem(item) : (UIBarButtonItem)new PrimaryToolbarItem(item, forceName);
|
||||
return ToUIBarButtonItem(item, false, false);
|
||||
}
|
||||
|
||||
public static UIBarButtonItem ToUIBarButtonItem(this ToolbarItem item, bool forceName = false, bool forcePrimary = false)
|
||||
{
|
||||
if (item.Order == ToolbarItemOrder.Secondary && !forcePrimary)
|
||||
return new SecondaryToolbarItem(item);
|
||||
return new PrimaryToolbarItem(item, forceName);
|
||||
}
|
||||
|
||||
sealed class PrimaryToolbarItem : UIBarButtonItem
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml.Design",
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XFCorePostProcessor.Tasks", "XFCorePostProcessor.Tasks\XFCorePostProcessor.Tasks.csproj", "{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Tizen (Forwarders)", "Stubs\Xamarin.Forms.Platform.Tizen\Xamarin.Forms.Platform.Tizen (Forwarders).csproj", "{39B3457F-01D8-43D0-8E84-D8C4F73CF48E}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform.Tizen (Forwarders)", "Stubs\Xamarin.Forms.Platform.Tizen\Xamarin.Forms.Platform.Tizen (Forwarders).csproj", "{39B3457F-01D8-43D0-8E84-D8C4F73CF48E}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{83790029-272E-45AF-A41D-E7716684E5B8} = {83790029-272E-45AF-A41D-E7716684E5B8}
|
||||
EndProjectSection
|
||||
|
|
@ -316,6 +316,7 @@ Global
|
|||
{1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|x86.Build.0 = Release|Any CPU
|
||||
{1346A7F1-4457-4BB4-A371-2C8E28BBD53E}.Release|x86.Deploy.0 = Release|Any CPU
|
||||
{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -337,7 +338,6 @@ Global
|
|||
{4B14D295-C09B-4C38-B880-7CC768E50585}.Release|x64.Build.0 = Release|Any CPU
|
||||
{4B14D295-C09B-4C38-B880-7CC768E50585}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{4B14D295-C09B-4C38-B880-7CC768E50585}.Release|x86.Build.0 = Release|Any CPU
|
||||
{4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -1362,7 +1362,6 @@ Global
|
|||
{AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
{AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|iPhone.Build.0 = Debug|Any CPU
|
||||
{AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
||||
{AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
|
||||
{AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -1384,7 +1383,6 @@ Global
|
|||
{8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
{8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|iPhone.Build.0 = Debug|Any CPU
|
||||
{8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
||||
{8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
|
||||
{8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -1406,7 +1404,6 @@ Global
|
|||
{C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
{C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|iPhone.Build.0 = Debug|Any CPU
|
||||
{C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
||||
{C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
|
||||
{C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -1520,6 +1517,18 @@ Global
|
|||
{65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x64.Build.0 = Release|Any CPU
|
||||
{65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{65BC4888-CC59-428A-9B75-540CF1C09480}.Release|x86.Build.0 = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|iPhone.ActiveCfg = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -1544,18 +1553,6 @@ Global
|
|||
{39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Release|x64.Build.0 = Release|Any CPU
|
||||
{39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Release|x86.Build.0 = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|iPhone.ActiveCfg = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{5BBF4A3F-4AD1-47FD-B250-05EA793F939D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче