This commit is contained in:
Jerome Laban 2020-06-18 11:42:05 -04:00
Родитель b6993943a2
Коммит f0c3e376be
23 изменённых файлов: 7552 добавлений и 3147 удалений

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

@ -39,7 +39,7 @@
<ItemGroup Condition="!('$(TargetFramework)'=='net462')">
<Compile Remove="PlatformSpecific\NetFramework\**\*" />
<None Remove="PlatformSpecific\NetFramework\**\*" />
<None Include="PlatformSpecific\NetFramework\**\*" />
<Page Remove="PlatformSpecific\NetFramework\**\*" />
</ItemGroup>

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

@ -88,7 +88,7 @@
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.23" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.1-uno.28</Version>
<Version>2.0.2-uno.66</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="3.0.0-dev.405" />
</ItemGroup>

Разница между файлами не показана из-за своего большого размера Загрузить разницу

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

@ -116,7 +116,7 @@
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.23" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.1-uno.28</Version>
<Version>2.0.2-uno.66</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="3.0.0-dev.405" />
</ItemGroup>

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

@ -149,10 +149,6 @@
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Eyedropper\EyedropperPage.xaml.cs">
<DependentUpon>EyedropperPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Facebook Service\FacebookPage.xaml.cs">
<DependentUpon>FacebookPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Facebook Service\FacebookPhotoTemplateSelector.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\FadeHeader\FadeHeaderBehaviorPage.xaml.cs">
<DependentUpon>FadeHeaderBehaviorPage.xaml</DependentUpon>
</Compile>
@ -348,9 +344,37 @@
<DependentUpon>ToastPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\TokenizingTextBox\SampleDataType.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\TokenizingTextBox\SampleEmailDataType.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\TokenizingTextBox\TokenizingTextBoxPage.xaml.cs">
<DependentUpon>TokenizingTextBoxPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\CompareStateTriggerPage.xaml.cs">
<DependentUpon>CompareStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\FullScreenModeStateTriggerPage.xaml.cs">
<DependentUpon>FullScreenModeStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\IsEqualStateTriggerPage.xaml.cs">
<DependentUpon>IsEqualStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\IsNotEqualStateTriggerPage.xaml.cs">
<DependentUpon>IsNotEqualStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\IsNullOrEmptyStateTriggerPage.xaml.cs">
<DependentUpon>IsNullOrEmptyStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\NetworkConnectionStateTriggerPage.xaml.cs">
<DependentUpon>NetworkConnectionStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\RegexStateTriggerPage.xaml.cs">
<DependentUpon>RegexStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\UserHandPreferenceStateTriggerPage.xaml.cs">
<DependentUpon>UserHandPreferenceStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\UserInteractionModeStateTriggerPage.xaml.cs">
<DependentUpon>UserInteractionModeStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)SamplePages\Twitter Service\TwitterPage.xaml.cs">
<DependentUpon>TwitterPage.xaml</DependentUpon>
</Compile>
@ -854,10 +878,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Facebook Service\FacebookPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\FadeHeader\FadeHeaderBehaviorPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@ -1122,6 +1142,42 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\CompareStateTriggerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\FullScreenModeStateTriggerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\IsEqualStateTriggerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\IsNotEqualStateTriggerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\IsNullOrEmptyStateTriggerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\NetworkConnectionStateTriggerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\RegexStateTriggerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\UserHandPreferenceStateTriggerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Triggers\UserInteractionModeStateTriggerPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)SamplePages\Twitter Service\TwitterPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>

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

@ -555,9 +555,37 @@
<DependentUpon>ImageCropperPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\TokenizingTextBox\SampleDataType.cs" />
<Compile Include="SamplePages\TokenizingTextBox\SampleEmailDataType.cs" />
<Compile Include="SamplePages\TokenizingTextBox\TokenizingTextBoxPage.xaml.cs">
<DependentUpon>TokenizingTextBoxPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\Triggers\CompareStateTriggerPage.xaml.cs">
<DependentUpon>CompareStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\Triggers\FullScreenModeStateTriggerPage.xaml.cs">
<DependentUpon>FullScreenModeStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\Triggers\IsEqualStateTriggerPage.xaml.cs">
<DependentUpon>IsEqualStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\Triggers\IsNotEqualStateTriggerPage.xaml.cs">
<DependentUpon>IsNotEqualStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\Triggers\IsNullOrEmptyStateTriggerPage.xaml.cs">
<DependentUpon>IsNullOrEmptyStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\Triggers\NetworkConnectionStateTriggerPage.xaml.cs">
<DependentUpon>NetworkConnectionStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\Triggers\RegexStateTriggerPage.xaml.cs">
<DependentUpon>RegexStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\Triggers\UserHandPreferenceStateTriggerPage.xaml.cs">
<DependentUpon>UserHandPreferenceStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="SamplePages\Triggers\UserInteractionModeStateTriggerPage.xaml.cs">
<DependentUpon>UserInteractionModeStateTriggerPage.xaml</DependentUpon>
</Compile>
<Compile Include="Shell.Search.cs" />
<Compile Include="Shell.SamplePicker.cs" />
<Content Include="SamplePages\ViewportBehavior\ViewportBehaviorXaml.bind" />
@ -568,6 +596,15 @@
<Content Include="SamplePages\Eyedropper\EyedropperXaml.bind" />
<Content Include="SamplePages\Eyedropper\EyedropperCode.bind" />
<Content Include="SamplePages\TokenizingTextBox\TokenizingTextBoxCode.bind" />
<None Include="SamplePages\Triggers\CompareStateTrigger.bind" />
<None Include="SamplePages\Triggers\FullScreenModeStateTrigger.bind" />
<None Include="SamplePages\Triggers\IsEqualStateTrigger.bind" />
<None Include="SamplePages\Triggers\IsNotEqualStateTrigger.bind" />
<None Include="SamplePages\Triggers\IsNullOrEmptyStateTrigger.bind" />
<None Include="SamplePages\Triggers\NetworkConnectionStateTrigger.bind" />
<None Include="SamplePages\Triggers\RegexStateTrigger.bind" />
<None Include="SamplePages\Triggers\UserHandPreferenceStateTrigger.bind" />
<None Include="SamplePages\Triggers\UserInteractionModeStateTrigger.bind" />
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
@ -1041,6 +1078,42 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Content>
<Page Include="SamplePages\Triggers\CompareStateTriggerPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SamplePages\Triggers\FullScreenModeStateTriggerPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SamplePages\Triggers\IsEqualStateTriggerPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SamplePages\Triggers\IsNotEqualStateTriggerPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SamplePages\Triggers\IsNullOrEmptyStateTriggerPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SamplePages\Triggers\NetworkConnectionStateTriggerPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SamplePages\Triggers\RegexStateTriggerPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SamplePages\Triggers\UserHandPreferenceStateTriggerPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SamplePages\Triggers\UserInteractionModeStateTriggerPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SamplePages\UniformGrid\UniformGridPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@ -1553,4 +1626,4 @@
<Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
<Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f | findstr /v /b &quot;#pragma&quot; &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
</Target>
</Project>
</Project>

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

@ -195,7 +195,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
public async Task<string> GetCSharpSourceAsync()
{
using (var codeStream = await StreamHelper.GetPackagedFileStreamAsync(CodeFile.StartsWith('/') ? CodeFile : $"SamplePages/{Name}/{CodeFile}"))
using (var codeStream = await StreamHelper.GetEmbeddedFileStreamAsync(GetType(), CodeFile.StartsWith("/") ? CodeFile : $"SamplePages/{Name}/{CodeFile}"))
{
using (var streamreader = new StreamReader(codeStream.AsStream()))
{
@ -206,7 +206,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
public async Task<string> GetJavaScriptSourceAsync()
{
using (var codeStream = await StreamHelper.GetPackagedFileStreamAsync(JavaScriptCodeFile.StartsWith('/') ? JavaScriptCodeFile : $"SamplePages/{Name}/{JavaScriptCodeFile}"))
using (var codeStream = await StreamHelper.GetEmbeddedFileStreamAsync(GetType(), JavaScriptCodeFile.StartsWith("/") ? JavaScriptCodeFile : $"SamplePages/{Name}/{JavaScriptCodeFile}"))
{
using (var streamreader = new StreamReader(codeStream.AsStream()))
{
@ -466,6 +466,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
if (_propertyDescriptor == null)
{
#if HAS_UNO
var manifestName = typeof(Samples).GetTypeInfo().Assembly
.GetManifestResourceNames()
.FirstOrDefault(n => n.EndsWith($"{Name}.{XamlCodeFile}".Replace(" ", "_"), StringComparison.OrdinalIgnoreCase));
@ -476,7 +477,10 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
}
// Get Xaml code
using (var codeStream = await StreamHelper.GetPackagedFileStreamAsync(XamlCodeFile.StartsWith('/') ? XamlCodeFile : $"SamplePages/{Name}/{XamlCodeFile}"))
using (var codeStream = typeof(Samples).GetTypeInfo().Assembly.GetManifestResourceStream(manifestName))
#else
using (var codeStream = await StreamHelper.GetEmbeddedFileStreamAsync(GetType(), XamlCodeFile.StartsWith("/") ? XamlCodeFile : $"SamplePages/{Name}/{XamlCodeFile}"))
#endif
{
XamlCode = await codeStream.ReadTextAsync(Encoding.UTF8);

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

@ -8,6 +8,7 @@ using System.ComponentModel;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using Microsoft.Toolkit.Uwp.SampleApp.Common;
using Microsoft.Toolkit.Uwp.SampleApp.Controls;
using Microsoft.Toolkit.Uwp.SampleApp.Models;
@ -200,7 +201,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
// UNO TODO
// The controls may be loaded when set directly to their parent
// so the datacontext of the renderer needs to be set early.
SetSampleDataContext();
await SetSampleDataContext();
if (!string.IsNullOrWhiteSpace(CurrentSample.Type))
{
@ -243,10 +244,10 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
_onlyDocumentation = true;
}
InfoAreaPivot.Items.Clear();
if (CurrentSample.HasXAMLCode)
async Task SetSampleDataContext()
{
DataContext = CurrentSample;
// Load Sample Properties before we load sample (if we haven't before)
await CurrentSample.PreparePropertyDescriptorAsync();
@ -262,9 +263,13 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
{
InfoAreaPivot.Items.Add(PropertiesPivotItem);
}
}
InfoAreaPivot.Items.Clear();
if (CurrentSample.HasXAMLCode)
{
#if !HAS_UNO
if (AnalyticsInfo.VersionInfo.GetDeviceFormFactor() != DeviceFormFactor.Desktop || CurrentSample.DisableXamlEditorRendering)
#endif
@ -327,8 +332,6 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
GithubButton.Visibility = Visibility.Visible;
}
DataContext = CurrentSample;
if (InfoAreaPivot.Items.Count == 0)
{
SidePaneState = PaneState.None;

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

@ -7,12 +7,12 @@
mc:Ignorable="d">
<Page.Resources>
<DataTemplate x:Name="NormalTemplate">
<DataTemplate x:Key="NormalTemplate">
<TextBlock Foreground="Green"
Text="{Binding Title}" />
</DataTemplate>
<DataTemplate x:Name="AlternateTemplate">
<DataTemplate x:Key="AlternateTemplate">
<TextBlock Foreground="Red"
Text="{Binding Title}" />
</DataTemplate>

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

@ -126,7 +126,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
_ttb.TextChanged += TextChanged;
_ttb.TokenItemAdding += TokenItemCreating;
_acv.Filter = item => !_ttb.Items.Contains(item) && (item as SampleDataType).Text.Contains(_ttb.Text, System.StringComparison.CurrentCultureIgnoreCase);
_acv.Filter = item => !_ttb.Items.Contains(item) && (item as SampleDataType).Text.IndexOf(_ttb.Text, System.StringComparison.CurrentCultureIgnoreCase) != -1;
_ttb.SuggestedItemsSource = _acv;
}
@ -154,7 +154,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
_ttbEmail.TextChanged += EmailTextChanged;
_ttbEmail.PreviewKeyDown += EmailPreviewKeyDown;
_acvEmail.Filter = item => !_ttbEmail.Items.Contains(item) && (item as SampleEmailDataType).DisplayName.Contains(_ttbEmail.Text, System.StringComparison.CurrentCultureIgnoreCase);
_acvEmail.Filter = item => !_ttbEmail.Items.Contains(item) && (item as SampleEmailDataType).DisplayName.IndexOf(_ttbEmail.Text, System.StringComparison.CurrentCultureIgnoreCase) != -1;
}
if (_ttbEmailSuggestions != null)
@ -191,7 +191,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
private void TokenItemCreating(object sender, TokenItemAddingEventArgs e)
{
// Take the user's text and convert it to our data type (if we have a matching one).
e.Item = _samples.FirstOrDefault((item) => item.Text.Contains(e.TokenText, System.StringComparison.CurrentCultureIgnoreCase));
e.Item = _samples.FirstOrDefault((item) => item.Text.IndexOf(e.TokenText, System.StringComparison.CurrentCultureIgnoreCase) != -1);
// Otherwise, create a new version of our data type
if (e.Item == null)
@ -243,7 +243,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
foreach (var person in _emailSamples)
{
if (args.TokenText.Contains(person.EmailAddress) ||
args.TokenText.Contains(person.DisplayName, StringComparison.CurrentCultureIgnoreCase))
args.TokenText.IndexOf(person.DisplayName, StringComparison.CurrentCultureIgnoreCase) != -1)
{
args.Item = person;
return;

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

@ -910,7 +910,488 @@
<Setter Property="FontWeight" Value="Bold" />
</Style>
<Style x:Key="ToolkitNavViewStyle" TargetType="winui:NavigationView">
<!--
UNO TODO
<Style x:Key="ToolkitNavViewStyle" TargetType="winui:NavigationView">
<Setter Property="PaneToggleButtonStyle" Value="{StaticResource PaneToggleButtonStyle}" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="CompactPaneLength" Value="{ThemeResource NavigationViewCompactPaneLength}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="winui:NavigationView">
<Grid x:Name="RootGrid">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="DisplayModeGroup">
<VisualState x:Name="Compact" />
<VisualState x:Name="Expanded">
<VisualState.Setters>
<Setter Target="RootSplitView.PaneBackground" Value="{ThemeResource NavigationViewExpandedPaneBackground}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Minimal">
<VisualState.Setters>
<Setter Target="HeaderContent.Margin" Value="48,5,0,0" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="MinimalWithBackButton">
<VisualState.Setters>
<Setter Target="HeaderContent.Margin" Value="104,5,0,0" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="TogglePaneGroup">
<VisualState x:Name="TogglePaneButtonVisible" />
<VisualState x:Name="TogglePaneButtonCollapsed">
<VisualState.Setters>
<Setter Target="PaneContentGridToggleButtonRow.Height" Value="4" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="HeaderGroup">
<VisualState x:Name="HeaderVisible" />
<VisualState x:Name="HeaderCollapsed">
<VisualState.Setters>
<Setter Target="HeaderContent.Visibility" Value="Collapsed" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="SettingsGroup">
<VisualState x:Name="SettingsVisible" />
<VisualState x:Name="SettingsCollapsed">
<VisualState.Setters>
<Setter Target="SettingsNavPaneItem.Visibility" Value="Collapsed" />
<Setter Target="SettingsTopNavPaneItem.Visibility" Value="Collapsed" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="AutoSuggestGroup">
<VisualState x:Name="AutoSuggestBoxVisible" />
<VisualState x:Name="AutoSuggestBoxCollapsed">
<VisualState.Setters>
<Setter Target="AutoSuggestArea.Visibility" Value="Collapsed" />
<Setter Target="TopPaneAutoSuggestArea.Visibility" Value="Collapsed" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="PaneStateGroup">
<VisualState x:Name="NotClosedCompact" />
<VisualState x:Name="ClosedCompact">
<VisualState.Setters>
<Setter Target="PaneAutoSuggestBoxPresenter.Visibility" Value="Collapsed" />
<Setter Target="PaneAutoSuggestButton.Visibility" Value="Visible" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="PaneStateListSizeGroup">
<VisualState x:Name="ListSizeFull" />
<VisualState x:Name="ListSizeCompact">
<VisualState.Setters>
<Setter Target="MenuItemsHost.HorizontalAlignment" Value="Left" />
--><!-- This is essentially a TemplateBinding: --><!--
<Setter Target="MenuItemsHost.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
<Setter Target="SettingsNavPaneItem.HorizontalAlignment" Value="Left" />
<Setter Target="SettingsNavPaneItem.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
<Setter Target="PaneTitleTextBlock.Visibility" Value="Collapsed" />
<Setter Target="PaneHeaderContentBorder.Visibility" Value="Collapsed" />
<Setter Target="PaneCustomContentBorder.HorizontalAlignment" Value="Left" />
<Setter Target="PaneCustomContentBorder.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
<Setter Target="FooterContentBorder.HorizontalAlignment" Value="Left" />
<Setter Target="FooterContentBorder.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="TitleBarVisibilityGroup">
<VisualState x:Name="TitleBarVisible" />
<VisualState x:Name="TitleBarCollapsed">
<VisualState.Setters>
<Setter Target="PaneContentGrid.Margin" Value="0,32,0,0" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="OverflowLabelGroup">
<VisualState x:Name="OverflowButtonWithLabel" />
<VisualState x:Name="OverflowButtonNoLabel">
<VisualState.Setters>
<Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="BackButtonGroup">
<VisualState x:Name="BackButtonVisible" />
<VisualState x:Name="BackButtonCollapsed">
<VisualState.Setters>
<Setter Target="BackButtonPlaceholderOnTopNav.Width" Value="0" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<Grid
x:Name="PaneToggleButtonGrid"
Margin="0,0,0,8"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Canvas.ZIndex="100">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid x:Name="ButtonHolderGrid" Grid.Row="1">
<Button x:Name="NavigationViewBackButton"
Height="48"
Style="{StaticResource NavigationBackButtonNormalStyle}"
VerticalAlignment="Center"
Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.BackButtonVisibility}"
IsEnabled="{TemplateBinding IsBackEnabled}"/>
<Button
x:Name="TogglePaneButton"
Style="{TemplateBinding PaneToggleButtonStyle}"
AutomationProperties.LandmarkType="Navigation"
Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneToggleButtonVisibility}"
VerticalAlignment="Center"/>
</Grid>
</Grid>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackPanel
x:Name="TopNavArea"
Background="{ThemeResource Background-NavigationBar}"
Grid.Row="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
Canvas.ZIndex="1">
<Grid x:Name="TopNavTopPadding"
Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}"
Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}"/>
<Grid x:Name="TopNavGrid"
Height="48"
Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}">
<Grid.ColumnDefinitions>
<ColumnDefinition x:Name="BackButtonPlaceholderOnTopNav" Width="{ThemeResource NavigationBackButtonWidth}" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
--><!-- removed MinWidth to work around https://github.com/unoplatform/uno/issues/1535 --><!--
<ColumnDefinition Width="*" /> --><!-- MinWidth="48" --><!--
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid
x:Name="TopNavLeftPadding"
Grid.Column="1"
Width="0"/>
<ContentControl
x:Name="PaneHeaderOnTopPane"
IsTabStop="False"
VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Grid.Column="2"/>
--><!-- Top nav list --><!--
<winui:ItemsRepeaterScrollHost
AutomationProperties.LandmarkType="Navigation"
Grid.Column="3"
ScrollViewer.HorizontalScrollMode="Disabled"
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollMode="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Hidden">
<ScrollViewer
HorizontalScrollMode="Disabled"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollMode="Disabled"
VerticalScrollBarVisibility="Hidden">
<winui:ItemsRepeater
x:Name="TopNavMenuItemsHost"
ItemTemplate="{TemplateBinding MenuItemTemplateSelector}"
AutomationProperties.LandmarkType="Navigation"
AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
AutomationProperties.AccessibilityView = "Content">
<winui:ItemsRepeater.Layout>
<winui:StackLayout Orientation="Horizontal"/>
</winui:ItemsRepeater.Layout>
</winui:ItemsRepeater>
</ScrollViewer>
</winui:ItemsRepeaterScrollHost>
<winui:NavigationViewList AutomationProperties.LandmarkType="Navigation" x:Name="TopNavMenuItemsHost" Grid.Column="3" SelectionMode="Single" IsItemClickEnabled="True" ItemTemplate="{TemplateBinding MenuItemTemplate}" ItemTemplateSelector="{TemplateBinding MenuItemTemplateSelector}" ItemContainerStyle="{TemplateBinding MenuItemContainerStyle}" ItemContainerStyleSelector="{TemplateBinding MenuItemContainerStyleSelector}" ScrollViewer.HorizontalScrollMode="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollMode="Disabled" ScrollViewer.VerticalScrollBarVisibility="Hidden" SingleSelectionFollowsFocus="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SingleSelectionFollowsFocus}">
<ListView.ItemsPanel>
<ItemsPanelTemplate>
--><!--Use a StackPanel instead of a ItemsStackPanel to workaround https://github.com/unoplatform/uno/issues/2136--><!--
<StackPanel Orientation="Horizontal" />
</ItemsPanelTemplate>
</ListView.ItemsPanel>
<ListView.ItemContainerTransitions>
<TransitionCollection />
</ListView.ItemContainerTransitions>
</winui:NavigationViewList>
<Button
x:Name="TopNavOverflowButton"
Grid.Column="4"
Content="More"
FontFamily="Segoe UI"
FontSize="15px"
FontWeight="Normal"
VerticalAlignment="Center"
Style="{StaticResource NavigationViewOverflowButtonStyleWhenPaneOnTop}"
Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OverflowButtonVisibility}">
<Button.Flyout>
<Flyout Placement="Bottom">
<Flyout.FlyoutPresenterStyle>
<Style TargetType="FlyoutPresenter">
<Setter Property="Padding" Value="0,8" />
--><!-- Set negative top margin to make the flyout align exactly with the button --><!--
<Setter Property="Margin" Value="0,-4,0,0" />
</Style>
</Flyout.FlyoutPresenterStyle>
<winui:ItemsRepeaterScrollHost>
<ScrollViewer VerticalScrollBarVisibility="Auto">
<winui:ItemsRepeater
x:Name="TopNavMenuItemsOverflowHost"
ItemTemplate="{TemplateBinding MenuItemTemplateSelector}"
AutomationProperties.AccessibilityView = "Content">
<winui:ItemsRepeater.Layout>
<winui:StackLayout Orientation="Vertical"/>
</winui:ItemsRepeater.Layout>
</winui:ItemsRepeater>
</ScrollViewer>
</winui:ItemsRepeaterScrollHost>
</Flyout>
</Button.Flyout>
</Button>
<ContentControl
x:Name="PaneCustomContentOnTopPane"
IsTabStop="False"
VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Grid.Column="5"/>
<Grid
x:Name="TopPaneAutoSuggestArea"
Height="{ThemeResource NavigationViewTopPaneHeight}"
Grid.Column="6">
<ContentControl
x:Name="TopPaneAutoSuggestBoxPresenter"
Margin="12,0,12,0"
MinWidth="200"
IsTabStop="False"
HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Center"/>
</Grid>
<ContentControl
x:Name="PaneFooterOnTopPane"
IsTabStop="False"
VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Grid.Column="7" />
--><!-- UNO TODO --><!--
<winui:NavigationViewItem x:Name="SettingsTopNavPaneItem" Grid.Column="8" Icon="Home" />
--><!--<winui:NavigationViewItem x:Name="SettingsTopNavPaneItem" Style="{ThemeResource MUX_NavigationViewSettingsItemStyleWhenOnTopPane}" Grid.Column="8" Icon="Home" />--><!--
</Grid>
<Border Background="{ThemeResource Border-NavigationBar}"
Height="1" />
<Border
x:Name="TopNavContentOverlayAreaGrid"
Child="{TemplateBinding ContentOverlay}" />
</StackPanel>
<SplitView
x:Name="RootSplitView"
Background="{TemplateBinding Background}"
CompactPaneLength="{TemplateBinding CompactPaneLength}"
DisplayMode="Inline"
IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}"
IsTabStop="False"
OpenPaneLength="{TemplateBinding OpenPaneLength}"
PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}"
Grid.Row="1">
<SplitView.Pane>
<Grid
x:Name="PaneContentGrid"
Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="0" />
--><!-- above button margin + back button space --><!--
<RowDefinition x:Name="PaneContentGridToggleButtonRow" Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="8" />
--><!-- above list margin --><!--
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="8" />
</Grid.RowDefinitions>
<Grid x:Name="ContentPaneTopPadding"
Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}"/>
<Grid Grid.Row="2" Height="{StaticResource PaneToggleButtonHeight}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock
x:Name="PaneTitleTextBlock"
Grid.Column="0"
Text="{TemplateBinding PaneTitle}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Style="{StaticResource NavigationViewItemHeaderTextStyle}"/>
<ContentControl
x:Name="PaneHeaderContentBorder"
IsTabStop="False"
VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Grid.Column="1" />
</Grid>
<Grid
x:Name="AutoSuggestArea"
Grid.Row="3"
Height="{ThemeResource NavigationViewTopPaneHeight}"
VerticalAlignment="Center">
<ContentControl
x:Name="PaneAutoSuggestBoxPresenter"
Margin="{ThemeResource NavigationViewAutoSuggestBoxMargin}"
IsTabStop="False"
HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Center"/>
<Button
x:Name="PaneAutoSuggestButton"
Visibility="Collapsed"
Style="{ThemeResource NavigationViewPaneSearchButtonStyle}"
Width="{TemplateBinding CompactPaneLength}"/>
</Grid>
<ContentControl
x:Name="PaneCustomContentBorder"
IsTabStop="False"
VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Grid.Row="4" />
--><!-- Left nav list --><!--
<winui:ItemsRepeaterScrollHost
Grid.Row="6"
Margin="0,0,0,20"
HorizontalAlignment="Stretch"
VerticalAlignment="Top">
<ScrollViewer
TabNavigation="Once"
VerticalScrollBarVisibility="Auto">
<winui:ItemsRepeater
x:Name="MenuItemsHost"
ItemTemplate="{TemplateBinding MenuItemTemplateSelector}"
AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
AutomationProperties.AccessibilityView = "Content">
<winui:ItemsRepeater.Layout>
<winui:StackLayout Orientation="Vertical"/>
</winui:ItemsRepeater.Layout>
</winui:ItemsRepeater>
</ScrollViewer>
</winui:ItemsRepeaterScrollHost>
<ContentControl
x:Name="FooterContentBorder"
IsTabStop="False"
VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Grid.Row="7" />
<winui:NavigationViewItem x:Name="SettingsNavPaneItem" Grid.Row="8" Icon="Setting" />
</Grid>
</SplitView.Pane>
<SplitView.Content>
<Grid x:Name="ContentGrid">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<ContentControl
x:Name="HeaderContent"
MinHeight="{StaticResource PaneToggleButtonHeight}"
IsTabStop="False"
Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Style="{StaticResource NavigationViewTitleHeaderContentControlTextStyle}"/>
<ContentPresenter
AutomationProperties.LandmarkType="Main"
Grid.Row="1"
Content="{TemplateBinding Content}"/>
</Grid>
</SplitView.Content>
</SplitView>
</Grid>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
-->
<Style x:Key="ToolkitNavViewStyle" TargetType="winui:NavigationView">
<Setter Property="PaneToggleButtonStyle" Value="{StaticResource PaneToggleButtonStyle}" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="CompactPaneLength" Value="{ThemeResource NavigationViewCompactPaneLength}" />
@ -1126,31 +1607,6 @@
Grid.Column="2"/>
<!-- Top nav list -->
<winui:ItemsRepeaterScrollHost
AutomationProperties.LandmarkType="Navigation"
Grid.Column="3"
ScrollViewer.HorizontalScrollMode="Disabled"
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollMode="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Hidden">
<ScrollViewer
HorizontalScrollMode="Disabled"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollMode="Disabled"
VerticalScrollBarVisibility="Hidden">
<winui:ItemsRepeater
x:Name="TopNavMenuItemsHost"
ItemTemplate="{TemplateBinding MenuItemTemplateSelector}"
AutomationProperties.LandmarkType="Navigation"
AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
AutomationProperties.AccessibilityView = "Content">
<winui:ItemsRepeater.Layout>
<winui:StackLayout Orientation="Horizontal"/>
</winui:ItemsRepeater.Layout>
</winui:ItemsRepeater>
</ScrollViewer>
</winui:ItemsRepeaterScrollHost>
<winui:NavigationViewList AutomationProperties.LandmarkType="Navigation" x:Name="TopNavMenuItemsHost" Grid.Column="3" SelectionMode="Single" IsItemClickEnabled="True" ItemTemplate="{TemplateBinding MenuItemTemplate}" ItemTemplateSelector="{TemplateBinding MenuItemTemplateSelector}" ItemContainerStyle="{TemplateBinding MenuItemContainerStyle}" ItemContainerStyleSelector="{TemplateBinding MenuItemContainerStyleSelector}" ScrollViewer.HorizontalScrollMode="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollMode="Disabled" ScrollViewer.VerticalScrollBarVisibility="Hidden" SingleSelectionFollowsFocus="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SingleSelectionFollowsFocus}">
<ListView.ItemsPanel>
<ItemsPanelTemplate>
@ -1183,18 +1639,11 @@
<Setter Property="Margin" Value="0,-4,0,0" />
</Style>
</Flyout.FlyoutPresenterStyle>
<winui:ItemsRepeaterScrollHost>
<ScrollViewer VerticalScrollBarVisibility="Auto">
<winui:ItemsRepeater
x:Name="TopNavMenuItemsOverflowHost"
ItemTemplate="{TemplateBinding MenuItemTemplateSelector}"
AutomationProperties.AccessibilityView = "Content">
<winui:ItemsRepeater.Layout>
<winui:StackLayout Orientation="Vertical"/>
</winui:ItemsRepeater.Layout>
</winui:ItemsRepeater>
</ScrollViewer>
</winui:ItemsRepeaterScrollHost>
<winui:NavigationViewList x:Name="TopNavMenuItemsOverflowHost" ItemTemplate="{TemplateBinding MenuItemTemplate}" ItemTemplateSelector="{TemplateBinding MenuItemTemplateSelector}" ItemContainerStyle="{TemplateBinding MenuItemContainerStyle}" ItemContainerStyleSelector="{TemplateBinding MenuItemContainerStyleSelector}" SingleSelectionFollowsFocus="False" IsItemClickEnabled="True">
<ListView.ItemContainerTransitions>
<TransitionCollection />
</ListView.ItemContainerTransitions>
</winui:NavigationViewList>
</Flyout>
</Button.Flyout>
</Button>
@ -1324,25 +1773,7 @@
Grid.Row="4" />
<!-- Left nav list -->
<winui:ItemsRepeaterScrollHost
Grid.Row="6"
Margin="0,0,0,20"
HorizontalAlignment="Stretch"
VerticalAlignment="Top">
<ScrollViewer
TabNavigation="Once"
VerticalScrollBarVisibility="Auto">
<winui:ItemsRepeater
x:Name="MenuItemsHost"
ItemTemplate="{TemplateBinding MenuItemTemplateSelector}"
AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
AutomationProperties.AccessibilityView = "Content">
<winui:ItemsRepeater.Layout>
<winui:StackLayout Orientation="Vertical"/>
</winui:ItemsRepeater.Layout>
</winui:ItemsRepeater>
</ScrollViewer>
</winui:ItemsRepeaterScrollHost>
<winui:NavigationViewList x:Name="MenuItemsHost" Grid.Row="6" SingleSelectionFollowsFocus="False" Margin="0,0,0,20" SelectionMode="Single" IsItemClickEnabled="True" HorizontalAlignment="Stretch" SelectedItem="{TemplateBinding SelectedItem}" ItemTemplate="{TemplateBinding MenuItemTemplate}" ItemTemplateSelector="{TemplateBinding MenuItemTemplateSelector}" ItemContainerStyle="{TemplateBinding MenuItemContainerStyle}" ItemContainerStyleSelector="{TemplateBinding MenuItemContainerStyleSelector}" />
<ContentControl
x:Name="FooterContentBorder"
@ -1387,6 +1818,4 @@
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>

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

@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>uap10.0.16299</TargetFrameworks>
<!--<TargetFrameworks>uap10.0.16299</TargetFrameworks>-->
<Title>Windows Community Toolkit Animations</Title>
<Description>
This library provides helpers and extensions on top of Windows Composition and XAML storyboards. It is part of the Windows Community Toolkit.
@ -33,7 +33,6 @@
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="3.0.0-dev.405"/>
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1-uno.28" />
<Compile Remove="Effects\Blur.cs" />
<Compile Remove="Effects\Saturation.cs" />

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

@ -5,8 +5,10 @@
using System.Resources;
using System.Runtime.CompilerServices;
#if !HAS_UNO
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: InternalsVisibleTo("UnitTests.UWP")]
[assembly: NeutralResourcesLanguage("en-US")]
[assembly: NeutralResourcesLanguage("en-US")]
#endif

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

@ -60,8 +60,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
{
AutomateTextNotification(peer, Content.ToString());
}
#else
peer = null;
#endif
}
}

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

@ -57,7 +57,6 @@
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="3.0.0-dev.405" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1-uno.28" />
<PackageReference Include="Uno.ColorCode.UWP" Version="2.0.5-gd0f1a63314" />
<Page Remove="Eyedropper/**/*.xaml" />

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

@ -5,8 +5,10 @@
using System.Resources;
using System.Runtime.CompilerServices;
#if !HAS_UNO
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: InternalsVisibleTo("UnitTests.UWP")]
[assembly: NeutralResourcesLanguage("en-US")]
[assembly: NeutralResourcesLanguage("en-US")]
#endif

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

@ -6,7 +6,7 @@ using Windows.UI.Xaml;
namespace Microsoft.Toolkit.Uwp.UI.Controls
{
internal class PretokenStringContainer : DependencyObject, ITokenStringContainer
internal partial class PretokenStringContainer : DependencyObject, ITokenStringContainer
{
public string Text
{

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

@ -176,7 +176,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
{
bool lastDelimited = t[t.Length - 1] == Owner.TokenDelimiter[0];
string[] tokens = t.Split(Owner.TokenDelimiter);
string[] tokens = t.Split(new[] { Owner.TokenDelimiter }, System.StringSplitOptions.RemoveEmptyEntries);
int numberToProcess = lastDelimited ? tokens.Length : tokens.Length - 1;
for (int position = 0; position < numberToProcess; position++)
{

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

@ -30,7 +30,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Extensions
switch (list.SelectionMode)
{
case ListViewSelectionMode.Single:
if (list.SelectedItem == item)
if (list.SelectedItem == (object)item)
{
list.SelectedItem = null;
}

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

@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFramework>uap10.0.16299</TargetFramework>
<!--<TargetFramework>uap10.0.16299</TargetFramework>-->
<LangVersion>8.0</LangVersion>
<Title>Windows Community Toolkit UI</Title>
<Description>
@ -60,7 +60,7 @@
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.UI" Version="3.0.0-dev.405"/>
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1-uno.28" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.2-uno.66" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.16299'">

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

@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>uap10.0.16299</TargetFrameworks>
<!--<TargetFrameworks>uap10.0.16299</TargetFrameworks>-->
<Title>Windows Community Toolkit</Title>
<Description>This package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc.</Description>
<PackageTags>UWP Toolkit Windows</PackageTags>

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

@ -127,14 +127,13 @@ Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Microsoft.Toolkit.Uwp.SampleApp\Microsoft.Toolkit.Uwp.SampleApp.Shared.projitems*{30cb6cf1-80f7-43d5-b619-c737503724b0}*SharedItemsImports = 13
Microsoft.Toolkit.Uwp.SampleApp\Microsoft.Toolkit.Uwp.SampleApp.Shared.projitems*{484385ea-7766-49dc-bd09-f9b5dd035847}*SharedItemsImports = 4
Microsoft.Toolkit.Uwp.SampleApp\Microsoft.Toolkit.Uwp.SampleApp.Shared.projitems*{90fb4995-3b51-42e7-9b79-28ffa701858a}*SharedItemsImports = 5
UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{4e9466d1-d5aa-46ac-801b-c8fdab79f0d4}*SharedItemsImports = 13
UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{5524523e-db0f-41f7-a0d4-43128422a342}*SharedItemsImports = 4
UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
Microsoft.Toolkit.Uwp.SampleApp\Microsoft.Toolkit.Uwp.SampleApp.Shared.projitems*{90fb4995-3b51-42e7-9b79-28ffa701858a}*SharedItemsImports = 5
UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{9b3a94a6-0d29-4523-880b-6938e2efeef7}*SharedItemsImports = 13
UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
Microsoft.Toolkit.Uwp.SampleApp\Microsoft.Toolkit.Uwp.SampleApp.Shared.projitems*{af2b0725-7859-4d38-a340-4474c5040c3f}*SharedItemsImports = 4
UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{bab1caf4-c400-4a7f-a987-c576de63cffd}*SharedItemsImports = 4
UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{d9bdbc68-3d0a-47fc-9c88-0bf769101644}*SharedItemsImports = 5
@ -2162,6 +2161,379 @@ Global
{90FB4995-3B51-42E7-9B79-28FFA701858A}.Release|x64.Build.0 = Release|Any CPU
{90FB4995-3B51-42E7-9B79-28FFA701858A}.Release|x86.ActiveCfg = Release|Any CPU
{90FB4995-3B51-42E7-9B79-28FFA701858A}.Release|x86.Build.0 = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|ARM.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|ARM64.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|iPhone.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|x64.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|x64.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|x86.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.AppStore|x86.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|ARM.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|ARM64.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|iPhone.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|x64.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|x64.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|x86.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|x86.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|Any CPU.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|Any CPU.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|ARM.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|ARM.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|ARM64.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|ARM64.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|iPhone.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|iPhone.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|iPhoneSimulator.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|x64.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|x64.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|x86.ActiveCfg = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Native|x86.Build.0 = Debug|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|Any CPU.Build.0 = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|ARM.ActiveCfg = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|ARM.Build.0 = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|ARM64.ActiveCfg = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|ARM64.Build.0 = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|iPhone.ActiveCfg = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|iPhone.Build.0 = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|x64.ActiveCfg = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|x64.Build.0 = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|x86.ActiveCfg = Release|Any CPU
{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|x86.Build.0 = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|ARM.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|ARM64.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|iPhone.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|x64.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|x64.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|x86.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.AppStore|x86.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|ARM.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|ARM.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|ARM64.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|iPhone.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|x64.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|x64.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|x86.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|x86.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|Any CPU.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|Any CPU.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM64.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM64.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|iPhone.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|iPhone.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|iPhoneSimulator.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x64.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x64.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x86.ActiveCfg = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x86.Build.0 = Debug|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|Any CPU.Build.0 = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|ARM.ActiveCfg = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|ARM.Build.0 = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|ARM64.ActiveCfg = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|ARM64.Build.0 = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|iPhone.ActiveCfg = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|iPhone.Build.0 = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x64.ActiveCfg = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x64.Build.0 = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x86.ActiveCfg = Release|Any CPU
{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x86.Build.0 = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|ARM.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|ARM64.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|iPhone.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|x64.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|x64.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|x86.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.AppStore|x86.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|ARM.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|ARM64.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|iPhone.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|x64.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|x64.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|x86.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|x86.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|Any CPU.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|Any CPU.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|ARM.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|ARM.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|ARM64.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|ARM64.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|iPhone.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|iPhone.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|iPhoneSimulator.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|x64.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|x64.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|x86.ActiveCfg = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Native|x86.Build.0 = Debug|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|Any CPU.Build.0 = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|ARM.ActiveCfg = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|ARM.Build.0 = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|ARM64.ActiveCfg = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|ARM64.Build.0 = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|iPhone.ActiveCfg = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|iPhone.Build.0 = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|x64.ActiveCfg = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|x64.Build.0 = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|x86.ActiveCfg = Release|Any CPU
{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|x86.Build.0 = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|ARM.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|ARM64.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|iPhone.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|x64.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|x64.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|x86.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.AppStore|x86.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|ARM.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|ARM.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|ARM64.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|iPhone.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|x64.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|x64.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|x86.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|x86.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|Any CPU.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|Any CPU.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|ARM.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|ARM.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|ARM64.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|ARM64.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|iPhone.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|iPhone.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|iPhoneSimulator.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|x64.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|x64.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|x86.ActiveCfg = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Native|x86.Build.0 = Debug|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|Any CPU.Build.0 = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|ARM.ActiveCfg = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|ARM.Build.0 = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|ARM64.ActiveCfg = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|ARM64.Build.0 = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|iPhone.ActiveCfg = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|iPhone.Build.0 = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|x64.ActiveCfg = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|x64.Build.0 = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|x86.ActiveCfg = Release|Any CPU
{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|x86.Build.0 = Release|Any CPU
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|Any CPU.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|ARM.Build.0 = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|ARM64.ActiveCfg = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|ARM64.Build.0 = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|ARM64.Deploy.0 = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|iPhone.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|iPhone.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|iPhone.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|x64.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|x64.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|x64.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|x86.ActiveCfg = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|x86.Build.0 = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Ad-Hoc|x86.Deploy.0 = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|Any CPU.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|Any CPU.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|Any CPU.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|ARM.ActiveCfg = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|ARM.Build.0 = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|ARM.Deploy.0 = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|ARM64.ActiveCfg = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|ARM64.Build.0 = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|ARM64.Deploy.0 = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|iPhone.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|iPhone.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|iPhone.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|iPhoneSimulator.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|x64.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|x64.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|x64.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|x86.ActiveCfg = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|x86.Build.0 = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.AppStore|x86.Deploy.0 = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|Any CPU.ActiveCfg = Debug|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM.ActiveCfg = Debug|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM.Build.0 = Debug|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM.Deploy.0 = Debug|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM64.ActiveCfg = Debug|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM64.Build.0 = Debug|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM64.Deploy.0 = Debug|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|iPhone.ActiveCfg = Debug|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x64.ActiveCfg = Debug|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x64.Build.0 = Debug|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x64.Deploy.0 = Debug|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x86.ActiveCfg = Debug|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x86.Build.0 = Debug|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x86.Deploy.0 = Debug|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|Any CPU.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|Any CPU.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|Any CPU.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|ARM.ActiveCfg = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|ARM.Build.0 = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|ARM.Deploy.0 = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|ARM64.ActiveCfg = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|ARM64.Build.0 = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|ARM64.Deploy.0 = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|iPhone.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|iPhone.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|iPhone.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|iPhoneSimulator.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|iPhoneSimulator.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|iPhoneSimulator.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|x64.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|x64.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|x64.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|x86.ActiveCfg = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|x86.Build.0 = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Native|x86.Deploy.0 = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|Any CPU.ActiveCfg = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM.ActiveCfg = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM.Build.0 = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM.Deploy.0 = Release|ARM
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM64.ActiveCfg = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM64.Build.0 = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM64.Deploy.0 = Release|ARM64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|iPhone.ActiveCfg = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|iPhoneSimulator.ActiveCfg = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x64.ActiveCfg = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x64.Build.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x64.Deploy.0 = Release|x64
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x86.ActiveCfg = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x86.Build.0 = Release|x86
{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x86.Deploy.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

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

@ -1,4 +1,8 @@
{
"sdk": {
"version": "3.1.201",
"rollForward": "latestPatch"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.54"
}