unoplatform
/
Uno.WindowsCommunityToolkit
зеркало из https://github.com/unoplatform/Uno.WindowsCommunityToolkit.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixes for x64 Xaml Islands tests.

This commit is contained in:
Alexandre Zollinger Chohfi 2020-04-07 12:21:02 -07:00
Родитель e76b2478f8
Коммит 3dd889eef2
7 изменённых файлов: 13 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Microsoft.Toolkit.Uwp.UI/Helpers/ThemeListener.cs
Просмотреть файл

@ -93,12 +93,12 @@ namespace Microsoft.Toolkit.Uwp.UI.Helpers
// Note: This can get called multiple times during HighContrast switch, do we care?
private async void Settings_ColorValuesChanged(UISettings sender, object args)
{
// Getting called off thread, so we need to dispatch to request value.
await OnColorValuesChanged();
}
internal Task OnColorValuesChanged()
{
// Getting called off thread, so we need to dispatch to request value.
return DispatcherQueue.ExecuteOnUIThreadAsync(
() =>
{

4
UnitTests/UnitTests.XamlIslands.Package/Package.appxmanifest
Просмотреть файл

@ -8,12 +8,12 @@
<Identity
Name="e9b2d6ff-2c1a-456b-9ebb-813a54796bc9"
Publisher="CN=alzollin"
Publisher="CN=Microsoft"
Version="1.0.0.0" />
<Properties>
<DisplayName>UnitTests.XamlIslands.Package</DisplayName>
<PublisherDisplayName>alzollin</PublisherDisplayName>
<PublisherDisplayName>Microsoft</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo>
</Properties>

8
UnitTests/UnitTests.XamlIslands.UWPApp/FakeTestClasses/Assert.cs
Просмотреть файл

@ -1,4 +1,8 @@
using System;
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
namespace Microsoft.VisualStudio.TestTools.UnitTesting
{
@ -8,7 +12,7 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting
{
if (!expected.Equals(actual))
{
throw new Exception();
throw new Exception($"Assert.AreEqual failed. Expected:<{expected}>. Actual:<{actual}>.");
}
}
}

4
UnitTests/UnitTests.XamlIslands.UWPApp/Package.appxmanifest
Просмотреть файл

@ -8,14 +8,14 @@
<Identity
Name="6f6e2642-66dc-4a18-8341-e2dbb5fcc626"
Publisher="CN=alzollin"
Publisher="CN=Microsoft"
Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="6f6e2642-66dc-4a18-8341-e2dbb5fcc626" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>UnitTests.XamlIslands.UWPApp</DisplayName>
<PublisherDisplayName>alzollin</PublisherDisplayName>
<PublisherDisplayName>Microsoft</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>

3
UnitTests/UnitTests.XamlIslands/Program.cs
Просмотреть файл

@ -46,9 +46,6 @@ namespace UnitTests.XamlIslands
xamlHost.ChildChanged += XamlHost_ChildChanged;
xamlHost.Child = new Frame();
//
// Form1
//
AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
AutoScaleMode = AutoScaleMode.Font;
WindowState = FormWindowState.Maximized;

15
UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
Просмотреть файл

@ -19,19 +19,4 @@
<ProjectReference Include="..\UnitTests.XamlIslands.UWPApp\UnitTests.XamlIslands.UWPApp.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
</Project>

11
Windows Community Toolkit.sln
Просмотреть файл

@ -827,7 +827,8 @@ Global
{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}.Release|x64.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
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@ -852,11 +853,7 @@ Global
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Native|x86.ActiveCfg = Release|x86
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|Any CPU.ActiveCfg = Release|x86
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.ActiveCfg = Release|ARM
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.Build.0 = Release|ARM
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM.Deploy.0 = Release|ARM
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.ActiveCfg = Release|ARM64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.Build.0 = Release|ARM64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|ARM64.Deploy.0 = Release|ARM64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.ActiveCfg = Release|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.Build.0 = Release|x64
{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Release|x64.Deploy.0 = Release|x64
@ -883,11 +880,7 @@ Global
{804D0681-52F6-4E61-864A-699F0AB44B20}.Native|x86.ActiveCfg = Release|x86
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|Any CPU.ActiveCfg = Release|x86
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.ActiveCfg = Release|ARM
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.Build.0 = Release|ARM
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM.Deploy.0 = Release|ARM
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.ActiveCfg = Release|ARM64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.Build.0 = Release|ARM64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|ARM64.Deploy.0 = Release|ARM64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.ActiveCfg = Release|x64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.Build.0 = Release|x64
{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x64.Deploy.0 = Release|x64