chore: Uno adjustments
This commit is contained in:
Jerome Laban
Родитель
31c12cbf7e
Коммит
16c556bbae
|
|
@ -90,7 +90,7 @@
|
|||
Updating to recent would solve the problem, but we don't want to force dependend projects to upgrade their version of Uno.UI.
|
||||
-->
|
||||
<PackageReference Include="Uno.SourceGenerationTasks"
|
||||
Version="3.1.0" />
|
||||
Version="3.2.0-dev.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -7,48 +7,49 @@
|
|||
<WasmPWAManifestFile Condition="'$(Configuration)'=='Release'">manifest.json</WasmPWAManifestFile>
|
||||
<NoWarn>$(NoWarm);Uno0001</NoWarn>
|
||||
<MonoRuntimeDebuggerEnabled Condition="'$(Configuration)'=='Debug'">true</MonoRuntimeDebuggerEnabled>
|
||||
<UseAOT Condition="$([MSBuild]::IsOsPlatform('Linux')) or ( $([MSBuild]::IsOsPlatform('Windows')) and '$(BUILD_REPOSITORY_PROVIDER)'=='' )">true</UseAOT>
|
||||
<!--<WasmShellMonoRuntimeExecutionMode Condition="'$(UseAOT)'=='true'">FullAOT</WasmShellMonoRuntimeExecutionMode>-->
|
||||
<!--<WasmShellGenerateAOTProfile>true</WasmShellGenerateAOTProfile>-->
|
||||
<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>
|
||||
<WasmShellEnableLongPathSupport>false</WasmShellEnableLongPathSupport>
|
||||
|
||||
<UnoUIUseRoslynSourceGenerators>false</UnoUIUseRoslynSourceGenerators>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<WasmShellMonoEnvironment Include="MONO_GC_PARAMS" Value="soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep" />
|
||||
</ItemGroup>
|
||||
<UseAOT Condition="$([MSBuild]::IsOsPlatform('Linux')) or ( $([MSBuild]::IsOsPlatform('Windows')) and '$(BUILD_REPOSITORY_PROVIDER)'=='' )">true</UseAOT>
|
||||
<!--<WasmShellMonoRuntimeExecutionMode Condition="'$(UseAOT)'=='true'">FullAOT</WasmShellMonoRuntimeExecutionMode>-->
|
||||
<!--<WasmShellGenerateAOTProfile>true</WasmShellGenerateAOTProfile>-->
|
||||
<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>
|
||||
<WasmShellEnableLongPathSupport>false</WasmShellEnableLongPathSupport>
|
||||
|
||||
<!--
|
||||
<UnoUIUseRoslynSourceGenerators>false</UnoUIUseRoslynSourceGenerators>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<WasmShellMonoEnvironment Include="MONO_GC_PARAMS" Value="soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep" />
|
||||
</ItemGroup>
|
||||
|
||||
<!--
|
||||
<ItemGroup>
|
||||
<WasmShellEnableAotProfile Condition="'$(UseAOT)'=='true'" Include="aot.profile" />
|
||||
</ItemGroup>
|
||||
-->
|
||||
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Uno.UI.WebAssembly" Version="3.6.0-dev.359" />
|
||||
<PackageReference Include="Uno.Wasm.Bootstrap" Version="2.0.0-dev.180" />
|
||||
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.180" />
|
||||
<PackageReference Include="Uno.UI.WebAssembly" Version="3.10.0-dev.156" />
|
||||
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.0.0-dev.127" />
|
||||
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.0.0-dev.127" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
|
||||
<PackageReference Include="Microsoft.TypeScript.Compiler" Version="2.8.3" />
|
||||
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="2.8.3" />
|
||||
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.33" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
|
||||
</ItemGroup>
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Behaviors\Microsoft.Toolkit.Uwp.UI.Behaviors.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Behaviors\Microsoft.Toolkit.Uwp.UI.Behaviors.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -363,7 +363,6 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
|
|||
{
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// If we don't have internet, then try to see if we have a packaged copy
|
||||
if (imageStream == null)
|
||||
|
|
@ -376,6 +375,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
|
|||
{
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
return imageStream;
|
||||
}
|
||||
|
|
@ -706,8 +706,8 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
|
|||
// typeof(UserToPersonConverter)) // Search in Microsoft.Toolkit.Graph.Controls
|
||||
ScrollItemPlacement.Default.GetType(), // Search in Microsoft.Toolkit.Uwp.UI
|
||||
EasingType.Default.GetType(), // Microsoft.Toolkit.Uwp.UI.Animations
|
||||
ImageBlendMode.Multiply.GetType(), // Search in Microsoft.Toolkit.Uwp.UI.Media
|
||||
#if !HAS_UNO
|
||||
ImageBlendMode.Multiply.GetType(), // Search in Microsoft.Toolkit.Uwp.UI.Media
|
||||
Interaction.Enabled.GetType(), // Microsoft.Toolkit.Uwp.Input.GazeInteraction
|
||||
#endif
|
||||
DataGridGridLinesVisibility.None.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.DataGrid
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
|
|||
{
|
||||
private const string _recentSamplesStorageKey = "uct-recent-samples";
|
||||
|
||||
public static bool ShowUnoUnsupported { get; set; } = false;
|
||||
|
||||
private static List<SampleCategory> _samplesCategories;
|
||||
private static SemaphoreSlim _semaphore = new SemaphoreSlim(1);
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
<Page.Resources>
|
||||
<local:SampleCommand x:Key="SampleCommand" />
|
||||
|
||||
<DataTemplate x:Name="NormalTemplate">
|
||||
|
||||
<DataTemplate x:Key="NormalTemplate">
|
||||
<TextBlock Text="{Binding}" Foreground="Green" VerticalAlignment="Center" FontWeight="Bold"></TextBlock>
|
||||
</DataTemplate>
|
||||
|
||||
<DataTemplate x:Name="AlternateTemplate">
|
||||
<DataTemplate x:Key="AlternateTemplate">
|
||||
<TextBlock Text="{Binding}" Foreground="Red" VerticalAlignment="Center" FontWeight="Bold"></TextBlock>
|
||||
</DataTemplate>
|
||||
</Page.Resources>
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Behaviors
|
|||
/// <summary>
|
||||
/// A target for the <see cref="FocusBehavior"/>.
|
||||
/// </summary>
|
||||
public sealed class FocusTarget : DependencyObject
|
||||
public sealed partial class FocusTarget : DependencyObject
|
||||
{
|
||||
/// <summary>
|
||||
/// The DP to store the <see cref="Control"/> property value.
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
|
|||
private readonly SpriteVisual _shadowVisual;
|
||||
private Border _border;
|
||||
|
||||
private static bool IsSupported { get; } = ApiInformation.IsMethodPresent("Windows.UI.Composition.Compositor", "CreateDropShadow");
|
||||
private static bool IsSupported { get; } = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.UI.Composition.Compositor", "CreateDropShadow");
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="DropShadowPanel"/> class.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
|
|||
/// Display <see cref="MetadataItem"/>s separated by bullets.
|
||||
/// </summary>
|
||||
[TemplatePart(Name = TextContainerPart, Type = typeof(TextBlock))]
|
||||
public sealed class MetadataControl : Control
|
||||
public sealed partial class MetadataControl : Control
|
||||
{
|
||||
/// <summary>
|
||||
/// The DP to store the <see cref="Separator"/> property value.
|
||||
|
|
|
|||
|
|
@ -52,10 +52,11 @@
|
|||
<!-- BEGIN UNO SPECIFIC -->
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701;CS0436</NoWarn>
|
||||
<PackageId>Uno.Microsoft.Toolkit.Uwp.UI.Controls.Core</PackageId>
|
||||
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Core</RootNamespace>
|
||||
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
|
||||
|
|
|
|||
|
|
@ -306,7 +306,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
|
|||
// Sweep red
|
||||
newRgbColor = new Color
|
||||
{
|
||||
R = Convert.ToByte(Math.Clamp(channelValue, 0.0, 255.0)),
|
||||
R = Convert.ToByte(MathEx.Clamp(channelValue, 0.0, 255.0)),
|
||||
G = baseRgbColor.G,
|
||||
B = baseRgbColor.B,
|
||||
A = baseRgbColor.A
|
||||
|
|
@ -333,7 +333,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
|
|||
newRgbColor = new Color
|
||||
{
|
||||
R = baseRgbColor.R,
|
||||
G = Convert.ToByte(Math.Clamp(channelValue, 0.0, 255.0)),
|
||||
G = Convert.ToByte(MathEx.Clamp(channelValue, 0.0, 255.0)),
|
||||
B = baseRgbColor.B,
|
||||
A = baseRgbColor.A
|
||||
};
|
||||
|
|
@ -360,7 +360,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
|
|||
{
|
||||
R = baseRgbColor.R,
|
||||
G = baseRgbColor.G,
|
||||
B = Convert.ToByte(Math.Clamp(channelValue, 0.0, 255.0)),
|
||||
B = Convert.ToByte(MathEx.Clamp(channelValue, 0.0, 255.0)),
|
||||
A = baseRgbColor.A
|
||||
};
|
||||
}
|
||||
|
|
@ -387,7 +387,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
|
|||
R = baseRgbColor.R,
|
||||
G = baseRgbColor.G,
|
||||
B = baseRgbColor.B,
|
||||
A = Convert.ToByte(Math.Clamp(channelValue, 0.0, 255.0))
|
||||
A = Convert.ToByte(MathEx.Clamp(channelValue, 0.0, 255.0))
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -43,10 +43,11 @@
|
|||
<!-- BEGIN UNO SPECIFIC -->
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701;CS0436</NoWarn>
|
||||
<PackageId>Uno.Microsoft.Toolkit.Uwp.UI.Controls.Input</PackageId>
|
||||
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Input</RootNamespace>
|
||||
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>uap10.0.17763</TargetFrameworks>
|
||||
|
|
@ -34,13 +34,6 @@
|
|||
Orbit;View ;OrbitView ;
|
||||
</PackageTags>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
|
||||
<DebugType>Full</DebugType>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
|
||||
<PackageId>Uno.Microsoft.Toolkit.Uwp.UI.Controls.Layout</PackageId>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\ControlHelpers.XamlHost.cs" Link="ControlHelpers.XamlHost.cs" />
|
||||
|
|
@ -49,21 +42,26 @@
|
|||
<ItemGroup>
|
||||
<PRIResource Include="Strings\en-US\Resources.resw" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- BEGIN UNO SPECIFIC -->
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
|
||||
<PackageId>Uno.Microsoft.Toolkit.Uwp.UI.Controls.Layout</PackageId>
|
||||
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Layout</RootNamespace>
|
||||
|
||||
<!-- BEGIN UNO SPECIFIC -->
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
|
||||
<PackageId>Uno.Microsoft.Toolkit.Uwp.UI.Controls.Layout</PackageId>
|
||||
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
|
||||
<PackageReference Remove="Microsoft.UI.Xaml" />
|
||||
<PackageReference Include="Uno.UI"
|
||||
Version="3.4.0" />
|
||||
</ItemGroup>
|
||||
<!-- END UNO SPECIFIC -->
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
|
||||
<PackageReference Remove="Microsoft.UI.Xaml" />
|
||||
<PackageReference Include="Uno.UI" Version="3.4.0" />
|
||||
</ItemGroup>
|
||||
<!-- END UNO SPECIFIC -->
|
||||
|
||||
<Import Project="$(BuildToolsDirectory)Windows.Toolkit.UWP.Controls.targets" />
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>uap10.0.17763</TargetFrameworks>
|
||||
|
|
@ -22,8 +22,6 @@
|
|||
<PackageReference Include="ColorCode.UWP" Version="2.0.6" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(BuildToolsDirectory)Windows.Toolkit.UWP.Controls.targets" />
|
||||
|
||||
<!--
|
||||
HACK: Fix the 'ProjectReference' inclusion of duplicate UWP resources.
|
||||
The UWP project system includes the 'Controls.Core' project's resources because
|
||||
|
|
@ -44,15 +42,14 @@
|
|||
<TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
|
||||
<PackageId>Uno.Microsoft.Toolkit.Uwp.UI.Controls.Markdown</PackageId>
|
||||
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</RootNamespace>
|
||||
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
|
||||
<PackageReference Include="Uno.UI"
|
||||
Version="3.4.0" />
|
||||
<PackageReference Include="Uno.ColorCode.UWP"
|
||||
Version="2.0.8-gd42a883502" />
|
||||
<PackageReference Include="Uno.UI" Version="3.4.0" />
|
||||
<PackageReference Include="Uno.ColorCode.UWP" Version="2.0.8-gd42a883502" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid10.0' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
|
||||
|
|
@ -62,4 +59,6 @@
|
|||
|
||||
<!-- END UNO SPECIFIC -->
|
||||
|
||||
<Import Project="$(BuildToolsDirectory)Windows.Toolkit.UWP.Controls.targets" />
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -44,8 +44,9 @@
|
|||
<TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
|
||||
<PackageId>Uno.Microsoft.Toolkit.Uwp.UI.Controls.Media</PackageId>
|
||||
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Media</RootNamespace>
|
||||
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
|
||||
|
|
|
|||
|
|
@ -44,8 +44,9 @@
|
|||
<TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
|
||||
<PackageId>Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives</PackageId>
|
||||
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</RootNamespace>
|
||||
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<!-- BEGIN UNO SPECIFIC -->
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
|
||||
<NoWarn>$(NoWarn);Uno0001;NU1701;CS0436</NoWarn>
|
||||
<PackageId>Uno.Microsoft.Toolkit.Uwp.UI.Controls</PackageId>
|
||||
|
||||
<!-- Validation fails as the generated document is too big -->
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ namespace Microsoft.Toolkit.Uwp
|
|||
throw t.Exception;
|
||||
}
|
||||
|
||||
if (t.IsCompletedSuccessfully)
|
||||
if (t.IsCompleted && t.Status == TaskStatus.RanToCompletion)
|
||||
{
|
||||
CurrentPageIndex += 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Co
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Mvvm.SourceGenerators", "Microsoft.Toolkit.Mvvm.SourceGenerators\Microsoft.Toolkit.Mvvm.SourceGenerators.csproj", "{E24D1146-5AD8-498F-A518-4890D8BF4937}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.SourceGenerators", "UnitTests\UnitTests.SourceGenerators\UnitTests.SourceGenerators.csproj", "{338C3BE4-2E71-4F21-AD30-03FDBB47A272}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.SourceGenerators", "UnitTests\UnitTests.SourceGenerators\UnitTests.SourceGenerators.csproj", "{338C3BE4-2E71-4F21-AD30-03FDBB47A272}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.SampleApp.Skia.Gtk", "Microsoft.Toolkit.Uwp.SampleApp.Skia.Gtk\Microsoft.Toolkit.Uwp.SampleApp.Skia.Gtk.csproj", "{78E1235D-49D7-4E92-B670-66C555A54D9F}"
|
||||
EndProject
|
||||
|
|
@ -172,9 +172,7 @@ Global
|
|||
UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{5f720475-e263-4a5a-8c88-2b805b45b5bc}*SharedItemsImports = 5
|
||||
Microsoft.Toolkit.Uwp.SampleApp\Microsoft.Toolkit.Uwp.SampleApp.Shared.projitems*{78e1235d-49d7-4e92-b670-66c555a54d9f}*SharedItemsImports = 5
|
||||
Microsoft.Toolkit.Uwp.SampleApp\Microsoft.Toolkit.Uwp.SampleApp.Shared.projitems*{90fb4995-3b51-42e7-9b79-28ffa701858a}*SharedItemsImports = 5
|
||||
UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
|
||||
UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{94994424-5f60-4cd8-aba2-101779066208}*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
|
||||
Microsoft.Toolkit.Uwp.SampleApp\Microsoft.Toolkit.Uwp.SampleApp.Shared.projitems*{af2b0725-7859-4d38-a340-4474c5040c3f}*SharedItemsImports = 4
|
||||
UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{c8182ef0-77fb-4b43-a588-c71748a309c7}*SharedItemsImports = 5
|
||||
|
|
@ -1603,24 +1601,24 @@ Global
|
|||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.AppStore|x64.Build.0 = Release|x64
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.AppStore|x86.ActiveCfg = Release|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.AppStore|x86.Build.0 = Release|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.ActiveCfg = Debug|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.ActiveCfg = Debug|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|iPhone.ActiveCfg = Debug|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.Build.0 = Debug|x64
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.Build.0 = Debug|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.ActiveCfg = Release|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.ActiveCfg = Release|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|iPhone.ActiveCfg = Release|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|iPhoneSimulator.ActiveCfg = Release|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.ActiveCfg = Release|x64
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.Build.0 = Release|x64
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.ActiveCfg = Release|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.Build.0 = Release|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.Build.0 = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.Build.0 = Release|Any CPU
|
||||
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
|
||||
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
|
||||
|
|
@ -1663,20 +1661,6 @@ Global
|
|||
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.AppStore|x86.ActiveCfg = Release|x86
|
||||
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.AppStore|x86.Build.0 = Release|x86
|
||||
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.AppStore|x86.Deploy.0 = Release|x86
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.Build.0 = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.Build.0 = Release|Any CPU
|
||||
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Build.0 = Debug|ARM
|
||||
|
|
@ -2392,9 +2376,9 @@ Global
|
|||
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM.ActiveCfg = Release|x86
|
||||
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM.Build.0 = Release|x86
|
||||
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.ActiveCfg = Release|x86
|
||||
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.Build.0 = Release|x86
|
||||
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|iPhone.ActiveCfg = Release|x86
|
||||
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|iPhoneSimulator.ActiveCfg = Release|x86
|
||||
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.Build.0 = Release|x86
|
||||
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.ActiveCfg = Release|x86
|
||||
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.Build.0 = Release|x86
|
||||
{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.ActiveCfg = Release|x86
|
||||
|
|
@ -2418,9 +2402,9 @@ Global
|
|||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM.ActiveCfg = Debug|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM.Build.0 = Debug|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM64.ActiveCfg = Debug|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM64.Build.0 = Debug|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|iPhone.ActiveCfg = Debug|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM64.Build.0 = Debug|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x64.ActiveCfg = Debug|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x64.Build.0 = Debug|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x86.ActiveCfg = Debug|x86
|
||||
|
|
@ -2430,9 +2414,9 @@ Global
|
|||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM.ActiveCfg = Release|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM.Build.0 = Release|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM64.ActiveCfg = Release|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM64.Build.0 = Release|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|iPhone.ActiveCfg = Release|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|iPhoneSimulator.ActiveCfg = Release|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM64.Build.0 = Release|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.ActiveCfg = Release|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.Build.0 = Release|x86
|
||||
{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.ActiveCfg = Release|x86
|
||||
|
|
@ -2512,9 +2496,9 @@ Global
|
|||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM.ActiveCfg = Debug|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM.Build.0 = Debug|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.ActiveCfg = Debug|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.Build.0 = Debug|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|iPhone.ActiveCfg = Debug|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.Build.0 = Debug|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x64.ActiveCfg = Debug|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x64.Build.0 = Debug|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.ActiveCfg = Debug|x86
|
||||
|
|
@ -2524,9 +2508,9 @@ Global
|
|||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM.ActiveCfg = Release|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM.Build.0 = Release|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.ActiveCfg = Release|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.Build.0 = Release|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|iPhone.ActiveCfg = Release|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|iPhoneSimulator.ActiveCfg = Release|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.Build.0 = Release|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.ActiveCfg = Release|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.Build.0 = Release|x86
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.ActiveCfg = Release|x86
|
||||
|
|
@ -2587,6 +2571,118 @@ Global
|
|||
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x64.Build.0 = Release|Any CPU
|
||||
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x86.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|ARM64.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|ARM64.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|x64.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Ad-Hoc|x86.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|Any CPU.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|ARM.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|ARM.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|ARM64.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|ARM64.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|iPhone.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|iPhone.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|x64.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|x64.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|x86.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.AppStore|x86.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|iPhone.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|iPhone.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|iPhone.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x64.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x86.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|ARM64.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|ARM64.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|x64.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Ad-Hoc|x86.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|Any CPU.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|ARM.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|ARM.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|ARM64.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|ARM64.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|iPhone.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|iPhone.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|x64.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|x64.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|x86.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.AppStore|x86.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|iPhone.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|iPhone.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|iPhone.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x64.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x86.Build.0 = Release|Any CPU
|
||||
{78E1235D-49D7-4E92-B670-66C555A54D9F}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{78E1235D-49D7-4E92-B670-66C555A54D9F}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
|
||||
{78E1235D-49D7-4E92-B670-66C555A54D9F}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -2643,46 +2739,6 @@ Global
|
|||
{78E1235D-49D7-4E92-B670-66C555A54D9F}.Release|x64.Build.0 = Release|Any CPU
|
||||
{78E1235D-49D7-4E92-B670-66C555A54D9F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{78E1235D-49D7-4E92-B670-66C555A54D9F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x64.Build.0 = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x86.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x64.Build.0 = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -2729,8 +2785,8 @@ Global
|
|||
{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
|
||||
{3307BC1D-5D71-41C6-A1B3-B113B8242D08} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
|
||||
{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
|
||||
{78E1235D-49D7-4E92-B670-66C555A54D9F} = {9AD30620-667D-433C-9961-8D885EE7B762}
|
||||
{338C3BE4-2E71-4F21-AD30-03FDBB47A272} = {B30036C4-D514-4E5B-A323-587A061772CE}
|
||||
{78E1235D-49D7-4E92-B670-66C555A54D9F} = {9AD30620-667D-433C-9961-8D885EE7B762}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}
|
||||
|
|
|
|||
|
|
@ -34,5 +34,12 @@
|
|||
</BuildOutputInPackage>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- BEGIN UNO SPECIFIC -->
|
||||
<ItemGroup Condition="'$(TargetFramework)'!='uap10.0.17763'">
|
||||
<PackageReference Remove="Microsoft.UI.Xaml" />
|
||||
</ItemGroup>
|
||||
<!-- END UNO SPECIFIC -->
|
||||
|
||||
|
||||
</Project>
|
||||
Загрузка…
Ссылка в новой задаче