Merge branch 'master' into NewNuGetToolPackage
This commit is contained in:
Oscar Calvo
Коммит
40a036ad03
|
|
@ -4,13 +4,19 @@
|
|||
|
||||
using System;
|
||||
using System.Windows;
|
||||
#if WPF
|
||||
using System.Windows.Data;
|
||||
#endif
|
||||
using System.Windows.Forms;
|
||||
using Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT;
|
||||
|
||||
namespace Microsoft.Toolkit.Forms.UI.Controls
|
||||
{
|
||||
internal abstract class WebBaseCompatibilityAdapter : DependencyObject, IWebViewCompatibleAdapter
|
||||
internal abstract class WebBaseCompatibilityAdapter :
|
||||
#if WPF
|
||||
DependencyObject,
|
||||
#endif
|
||||
IWebViewCompatibleAdapter
|
||||
{
|
||||
protected WebBaseCompatibilityAdapter()
|
||||
{
|
||||
|
|
@ -19,7 +25,9 @@ namespace Microsoft.Toolkit.Forms.UI.Controls
|
|||
#pragma warning restore CA2214 // Do not call overridable methods in constructors
|
||||
}
|
||||
|
||||
#if WPF
|
||||
public static DependencyProperty SourceProperty { get; } = DependencyProperty.Register(nameof(Source), typeof(Uri), typeof(WebBaseCompatibilityAdapter));
|
||||
#endif
|
||||
|
||||
public abstract Control View { get; }
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<Description>This library provides XAML islands common helpers for native applications. It is part of the Windows Community Toolkit.</Description>
|
||||
<PackageTags>XAML Islands XAMLHost</PackageTags>
|
||||
<PackageId>Microsoft.Toolkit.Win32.UI.XamlApplication</PackageId>
|
||||
<Platforms>x64;x86;AnyCPU</Platforms>
|
||||
<Platforms>x64;x86;ARM;ARM64;AnyCPU</Platforms>
|
||||
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
|
||||
<IsNativeProject>true</IsNativeProject>
|
||||
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
|
||||
|
|
@ -32,12 +32,10 @@
|
|||
<PackagePath>runtimes\win10-x86\native</PackagePath>
|
||||
</Content>
|
||||
|
||||
<!--
|
||||
<Content Include="..\Win32\$(Configuration)\Microsoft.Toolkit.Win32.UI.XamlApplication\Microsoft.Toolkit.Win32.UI.XamlHost.pdb">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>runtimes\win10-x86\native</PackagePath>
|
||||
</Content>
|
||||
-->
|
||||
|
||||
<Content Include="..\Win32\$(Configuration)\Microsoft.Toolkit.Win32.UI.XamlApplication\Microsoft.Toolkit.Win32.UI.XamlHost.pri">
|
||||
<Pack>true</Pack>
|
||||
|
|
@ -49,29 +47,40 @@
|
|||
<PackagePath>runtimes\win10-x64\native</PackagePath>
|
||||
</Content>
|
||||
|
||||
<!--
|
||||
<Content Include="..\x64\$(Configuration)\Microsoft.Toolkit.Win32.UI.XamlApplication\Microsoft.Toolkit.Win32.UI.XamlHost.pdb">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>runtimes\win10-x64\native</PackagePath>
|
||||
</Content>
|
||||
-->
|
||||
|
||||
|
||||
<Content Include="..\x64\$(Configuration)\Microsoft.Toolkit.Win32.UI.XamlApplication\Microsoft.Toolkit.Win32.UI.XamlHost.pri">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>runtimes\win10-x64\native</PackagePath>
|
||||
</Content>
|
||||
|
||||
<Content Include="..\arm\$(Configuration)\Microsoft.Toolkit.Win32.UI.XamlApplication\Microsoft.Toolkit.Win32.UI.XamlHost.dll">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>runtimes\win10-arm\native</PackagePath>
|
||||
</Content>
|
||||
|
||||
<Content Include="..\arm\$(Configuration)\Microsoft.Toolkit.Win32.UI.XamlApplication\Microsoft.Toolkit.Win32.UI.XamlHost.pdb">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>runtimes\win10-arm\native</PackagePath>
|
||||
</Content>
|
||||
|
||||
<Content Include="..\arm\$(Configuration)\Microsoft.Toolkit.Win32.UI.XamlApplication\Microsoft.Toolkit.Win32.UI.XamlHost.pri">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>runtimes\win10-arm\native</PackagePath>
|
||||
</Content>
|
||||
|
||||
<Content Include="..\arm64\$(Configuration)\Microsoft.Toolkit.Win32.UI.XamlApplication\Microsoft.Toolkit.Win32.UI.XamlHost.dll">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>runtimes\win10-arm64\native</PackagePath>
|
||||
</Content>
|
||||
|
||||
<!--
|
||||
<Content Include="..\arm64\$(Configuration)\Microsoft.Toolkit.Win32.UI.XamlApplication\Microsoft.Toolkit.Win32.UI.XamlHost.pdb">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>runtimes\win10-arm64\native</PackagePath>
|
||||
</Content>
|
||||
-->
|
||||
|
||||
<Content Include="..\arm64\$(Configuration)\Microsoft.Toolkit.Win32.UI.XamlApplication\Microsoft.Toolkit.Win32.UI.XamlHost.pri">
|
||||
<Pack>true</Pack>
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\Microsoft.Toolkit.Win32.UI.XamlHost.winmd">
|
||||
<Implementation>Microsoft.Toolkit.Win32.UI.XamlHost.dll</Implementation>
|
||||
<Private Condition="'$(TargetPlatformIdentifier)' != 'UAP'">false</Private>
|
||||
<Private>true</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetPlatformIdentifier)' != 'UAP'">
|
||||
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\Microsoft.Toolkit.Win32.UI.XamlHost.*" />
|
||||
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\lib\uap10.0\Microsoft.Toolkit.Win32.UI.XamlHost.xml" />
|
||||
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\runtimes\win10-$(XamlApp-Platform)\native\Microsoft.Toolkit.Win32.UI.XamlHost.*" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Toolkit.Win32.UI.XamlHost.*" />
|
||||
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Toolkit.Win32.UI.XamlHost.xml" />
|
||||
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(XamlApp-Platform)\native\Microsoft.Toolkit.Win32.UI.XamlHost.*" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -68,207 +68,185 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Win32.UI.
|
|||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|ARM = Debug|ARM
|
||||
Debug|ARM64 = Debug|ARM64
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|ARM = Release|ARM
|
||||
Release|ARM64 = Release|ARM64
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Release|x64.Build.0 = Release|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{B220BE88-944E-45D1-9248-6FAEF53868A3}.Release|x86.Build.0 = Release|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Release|x64.Build.0 = Release|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{10129749-7761-49B8-96B9-94BC833BA60B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Release|x64.Build.0 = Release|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{2E49400E-B114-4FAE-B743-6CB57B500E31}.Release|x86.Build.0 = Release|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Release|x64.Build.0 = Release|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{B4911490-D52E-4CF2-BD14-BA487BDF2240}.Release|x86.Build.0 = Release|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Release|x64.Build.0 = Release|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{8861D7E9-A7C5-4174-8FCE-3DCDF33C318B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Release|x64.Build.0 = Release|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9B054ABA-B5B4-42F4-8E29-97DCCF79C726}.Release|x86.Build.0 = Release|Any CPU
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Debug|ARM.ActiveCfg = Debug|x64
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Debug|ARM64.ActiveCfg = Debug|x64
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Debug|x64.Build.0 = Debug|x64
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Debug|x86.Build.0 = Debug|x86
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Release|ARM.ActiveCfg = Release|x64
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Release|ARM64.ActiveCfg = Release|x64
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Release|x64.ActiveCfg = Release|x64
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Release|x64.Build.0 = Release|x64
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Release|x86.ActiveCfg = Release|x86
|
||||
{D103E448-64B1-407C-B09E-7C61AF9F2740}.Release|x86.Build.0 = Release|x86
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Debug|ARM.ActiveCfg = Debug|x64
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Debug|ARM64.ActiveCfg = Debug|x64
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Debug|x64.Build.0 = Debug|x64
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Debug|x86.Build.0 = Debug|x86
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Release|ARM.ActiveCfg = Release|x64
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Release|ARM64.ActiveCfg = Release|x64
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Release|x64.ActiveCfg = Release|x64
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Release|x64.Build.0 = Release|x64
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Release|x86.ActiveCfg = Release|x86
|
||||
{2FE9AA6A-BD27-438F-9941-221033E4A1DD}.Release|x86.Build.0 = Release|x86
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Debug|ARM.ActiveCfg = Debug|x64
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Debug|ARM64.ActiveCfg = Debug|x64
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Debug|x64.Build.0 = Debug|x64
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Debug|x86.Build.0 = Debug|x86
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Release|ARM.ActiveCfg = Release|x64
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Release|ARM64.ActiveCfg = Release|x64
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Release|x64.ActiveCfg = Release|x64
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Release|x64.Build.0 = Release|x64
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Release|x86.ActiveCfg = Release|x86
|
||||
{45524ED2-8B5A-42E8-97A2-DCA44ECC83AA}.Release|x86.Build.0 = Release|x86
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Release|x64.Build.0 = Release|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{B131E361-78CE-489B-B2C4-130C5FEB70F4}.Release|x86.Build.0 = Release|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Release|x64.Build.0 = Release|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{A6F9DAE8-8CDC-4693-83E7-C9C59D1477FE}.Release|x86.Build.0 = Release|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|x64.Build.0 = Release|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|ARM.ActiveCfg = Debug|x64
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|ARM64.ActiveCfg = Debug|x64
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x64.Build.0 = Debug|x64
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x86.Build.0 = Debug|x86
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|ARM.ActiveCfg = Release|x64
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|ARM64.ActiveCfg = Release|x64
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x64.ActiveCfg = Release|x64
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x64.Build.0 = Release|x64
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x86.ActiveCfg = Release|x86
|
||||
{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x86.Build.0 = Release|x86
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Release|x64.Build.0 = Release|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{F87EDD34-AF48-45C7-9342-49023B882DA1}.Release|x86.Build.0 = Release|Any CPU
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Debug|ARM.ActiveCfg = Debug|x64
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Debug|ARM64.ActiveCfg = Debug|x64
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Debug|x64.Build.0 = Debug|x64
|
||||
|
|
@ -276,58 +254,40 @@ Global
|
|||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Debug|x86.Build.0 = Debug|x86
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Debug|x86.Deploy.0 = Debug|x86
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Release|Any CPU.Deploy.0 = Release|Any CPU
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Release|ARM.ActiveCfg = Release|x64
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Release|ARM64.ActiveCfg = Release|x64
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Release|x64.ActiveCfg = Release|x64
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Release|x64.Build.0 = Release|x64
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Release|x86.ActiveCfg = Release|x86
|
||||
{0F5A016F-981F-485D-871C-F75C4FAE60C5}.Release|x86.Build.0 = Release|x86
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Debug|ARM64.ActiveCfg = Debug|ARM64
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Debug|ARM64.Build.0 = Debug|ARM64
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Debug|x64.Build.0 = Debug|x64
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Debug|x86.Build.0 = Debug|Win32
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Release|ARM.Build.0 = Release|ARM
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Release|ARM64.ActiveCfg = Release|ARM64
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Release|ARM64.Build.0 = Release|ARM64
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Release|x64.ActiveCfg = Release|x64
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Release|x64.Build.0 = Release|x64
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Release|x86.ActiveCfg = Release|Win32
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6}.Release|x86.Build.0 = Release|Win32
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|x64.Build.0 = Release|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93}.Release|x86.Build.0 = Release|Any CPU
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|x64.Build.0 = Debug|x64
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Debug|x86.Build.0 = Debug|x86
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|x64.ActiveCfg = Release|x64
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|x64.Build.0 = Release|x64
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|x86.ActiveCfg = Release|x86
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -351,7 +311,6 @@ Global
|
|||
{0F5A016F-981F-485D-871C-F75C4FAE60C5} = {78966152-2550-4FA3-BDAC-CBEB078E739F}
|
||||
{015A0047-772D-4F1A-88C9-45C18F0ADFB6} = {E3B3FB12-67C0-404C-BA3F-08E65BCC682C}
|
||||
{AF47C3D9-0E6E-4431-BB04-A4B6AA804A93} = {E3B3FB12-67C0-404C-BA3F-08E65BCC682C}
|
||||
{955EF618-DB95-4AF7-83C3-7CAC44543D90} = {E3B3FB12-67C0-404C-BA3F-08E65BCC682C}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {AFDF3CA9-FBAD-4C80-A08A-7B69D21D561E}
|
||||
|
|
|
|||
|
|
@ -20,38 +20,45 @@
|
|||
</ItemGroup>
|
||||
|
||||
<Target Name="CopyAllProjectReferencesOutputs">
|
||||
<MSBuild Projects="@(ProjectReference)" Properties="Configuration=$(Configuration);Platform=$(Platform)" ContinueOnError="true">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="BuildOutputPaths"/>
|
||||
|
||||
<CreateItem Include="@(ProjectReference)" Condition="Exists('%(RelativeDir)\Package.appxmanifest')">
|
||||
<Output ItemName="_AppxProject" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
|
||||
<MSBuild Projects="@(_AppxProject)"
|
||||
Properties="Configuration=$(Configuration);Platform=$(Platform)"
|
||||
Targets="Build;GetPackagingOutputs">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="_AppxBuildOutputPaths" />
|
||||
</MSBuild>
|
||||
|
||||
<CreateItem Include="%(BuildOutputPaths.Identity)" AdditionalMetadata="_Project=%(BuildOutputPaths.MSBuildSourceProjectFile)">
|
||||
<Output ItemName="BuildOutputs" TaskParameter="Include"/>
|
||||
<CreateItem Include="%(_AppxBuildOutputPaths.Identity)" Condition="'%(_AppxBuildOutputPaths.TargetPath)'!=''" AdditionalMetadata="Link=%(_AppxBuildOutputPaths.TargetPath)">
|
||||
<Output ItemName="_AppxBuildOutputs" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
<CreateItem Include="%(BuildOutputs.RelativeDir)*.exe;%(BuildOutputs.RelativeDir)*.dll;%(BuildOutputs.RelativeDir)*.winmd" AdditionalMetadata="_Project=%(BuildOutputs._Project);Dir=%(BuildOutputs.RelativeDir)">
|
||||
<Output ItemName="FilterBin" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
<Copy SourceFiles="%(FilterBin.Identity)" ContinueOnError="true" DestinationFolder="$(OutDir)"/>
|
||||
|
||||
<CreateItem Include="%(BuildOutputs.RelativeDir)*.pri;%(BuildOutputs.RelativeDir)*.xbf">
|
||||
<Output ItemName="FilterPri" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
<Copy SourceFiles="%(FilterPri.Identity)" ContinueOnError="true" DestinationFolder="$(OutDir)\"/>
|
||||
|
||||
<CreateItem Include="%(BuildOutputs.RelativeDir)AppxManifest*.xml">
|
||||
<Output ItemName="AppxManifest" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
<Copy SourceFiles="%(Filter.Identity)" ContinueOnError="true" DestinationFolder="$(OutDir)"/>
|
||||
|
||||
<GetAssemblyIdentity AssemblyFiles="@(FilterBin)" ContinueOnError="true">
|
||||
<Output
|
||||
TaskParameter="Assemblies"
|
||||
ItemName="AssemblyIdentities"/>
|
||||
</GetAssemblyIdentity>
|
||||
|
||||
<CreateItem Include="%(AssemblyIdentities.Dir)*.xbf" AdditionalMetadata="AsmName=%(AssemblyIdentities.Name)">
|
||||
<CreateItem Include="@(_AppxBuildOutputs)" Condition="'%(_AppxBuildOutputs.Extension)'=='.xbf'" >
|
||||
<Output ItemName="FilterXbf" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
<Copy SourceFiles="%(FilterXbf.Identity)" ContinueOnError="true" DestinationFolder="$(OutDir)\%(FilterXbf.AsmName)"/>
|
||||
<CreateItem Include="@(FilterXbf)" AdditionalMetadata="CopyToOutputDirectory=PreserveNewest">
|
||||
<Output ItemName="Content" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
|
||||
<CreateItem Include="@(_AppxBuildOutputs)" Condition="'%(_AppxBuildOutputs.Extension)'=='.pri'" >
|
||||
<Output ItemName="FilterPri" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
<CreateItem Include="@(FilterPri)" AdditionalMetadata="CopyToOutputDirectory=PreserveNewest">
|
||||
<Output ItemName="Content" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
|
||||
<CreateItem Include="@(_AppxBuildOutputs)" Condition="'%(_AppxBuildOutputs.Extension)'=='.winmd'" >
|
||||
<Output ItemName="FilterWinMD" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
<CreateItem Include="@(FilterWinMD)" AdditionalMetadata="CopyToOutputDirectory=PreserveNewest">
|
||||
<Output ItemName="Content" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
|
||||
<CreateItem Include="%(_AppxBuildOutputPaths.RelativeDir)AppxManifest.xml" Condition="Exists('%(_AppxBuildOutputPaths.RelativeDir)AppxManifest.xml')">
|
||||
<Output ItemName="AppxManifest" TaskParameter="Include"/>
|
||||
</CreateItem>
|
||||
|
||||
</Target>
|
||||
|
||||
|
|
@ -128,7 +135,8 @@
|
|||
<activatableClass
|
||||
name='{0}'
|
||||
threadingModel='both'
|
||||
xmlns='urn:schemas-microsoft-com:winrt.v1'/>", typeName);
|
||||
xmlns='urn:schemas-microsoft-com:winrt.v1'/>
|
||||
", typeName);
|
||||
sb.Append(xmlEntry);
|
||||
}
|
||||
var xmlFooter = @"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
<Reference Include="System.Management" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||
<PackageReference Include="System.Management" Version="4.6.0-preview6.19303.8" />
|
||||
<PackageReference Include="System.Management" Version="4.6.0-preview7.19362.9" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\Microsoft.Toolkit.Win32.UI.Controls\Interop\Win32\ExternDll.cs" Link="ExternDll.cs" />
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
|
||||
using System;
|
||||
using System.Security;
|
||||
#if WINFORMS
|
||||
using System.Windows.Forms;
|
||||
#endif
|
||||
using windows = Windows;
|
||||
|
||||
namespace Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
|
||||
using System;
|
||||
using System.Security;
|
||||
#if WINFORMS
|
||||
using System.Windows.Forms;
|
||||
#endif
|
||||
using windows = Windows;
|
||||
|
||||
namespace Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT
|
||||
|
|
@ -36,13 +38,13 @@ namespace Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT
|
|||
IsSuccess = true; // no ability to detect otherwise
|
||||
Uri = e.Uri;
|
||||
}
|
||||
#endif
|
||||
|
||||
#elif WINFORMS
|
||||
internal WebViewControlNavigationCompletedEventArgs(WebBrowserNavigatedEventArgs e)
|
||||
{
|
||||
IsSuccess = true; // no ability to detect otherwise
|
||||
Uri = e.Url;
|
||||
}
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
/// Gets a value indicating whether the navigation completed successfully.
|
||||
|
|
@ -94,8 +96,7 @@ namespace Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT
|
|||
public static WebViewControlNavigationCompletedEventArgs ToWebViewControlNavigationCompletedEventArgs(
|
||||
System.Windows.Navigation.NavigationEventArgs args) =>
|
||||
new WebViewControlNavigationCompletedEventArgs(args);
|
||||
#endif
|
||||
|
||||
#elif WINFORMS
|
||||
/// <summary>
|
||||
/// Performs an implicit conversion from <see cref="WebBrowserNavigatedEventArgs"/> to <see cref="WebViewControlNavigationCompletedEventArgs"/>.
|
||||
/// </summary>
|
||||
|
|
@ -111,5 +112,6 @@ namespace Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT
|
|||
public static WebViewControlNavigationCompletedEventArgs ToWebViewControlNavigationCompletedEventArgs(
|
||||
WebBrowserNavigatedEventArgs args) =>
|
||||
new WebViewControlNavigationCompletedEventArgs(args);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,9 @@
|
|||
|
||||
using System;
|
||||
using System.Security;
|
||||
#if WINFORMS
|
||||
using System.Windows.Forms;
|
||||
#endif
|
||||
using windows = Windows;
|
||||
|
||||
namespace Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ steps:
|
|||
- task: DotNetCoreInstaller@0
|
||||
inputs:
|
||||
packageType: 'sdk'
|
||||
version: '3.0.100-preview6-012264'
|
||||
version: '3.0.100-preview7-012821'
|
||||
displayName: Install Dot Net Core SDK 3.0
|
||||
|
||||
- task: DotNetCoreCLI@2
|
||||
|
|
@ -93,6 +93,24 @@ steps:
|
|||
msbuildArguments: /target:Build
|
||||
restoreNugetPackages: false # Optional
|
||||
|
||||
- task: MSBuild@1
|
||||
displayName: Build ARM Restore
|
||||
inputs:
|
||||
solution: Microsoft.Toolkit.Win32.sln
|
||||
platform: ARM
|
||||
configuration: Release
|
||||
msbuildArguments: /target:Restore
|
||||
restoreNugetPackages: false # Optional
|
||||
|
||||
- task: MSBuild@1
|
||||
displayName: Build ARM
|
||||
inputs:
|
||||
solution: Microsoft.Toolkit.Win32.sln
|
||||
platform: ARM
|
||||
configuration: Release
|
||||
msbuildArguments: /target:Build
|
||||
restoreNugetPackages: false # Optional
|
||||
|
||||
- task: MSBuild@1
|
||||
displayName: Build ARM64 Restore
|
||||
inputs:
|
||||
|
|
|
|||
|
|
@ -215,6 +215,64 @@ Task("Build")
|
|||
MSBuild(win32Solution, buildSettings);
|
||||
}
|
||||
|
||||
{
|
||||
var buildSettings = new MSBuildSettings
|
||||
{
|
||||
PlatformTarget = PlatformTarget.ARM,
|
||||
MaxCpuCount = 1,
|
||||
}
|
||||
.SetConfiguration("Release")
|
||||
.UseToolVersion(MSBuildToolVersion.VS2019)
|
||||
.WithTarget("Restore");
|
||||
|
||||
Information("\nRestore ARM Step");
|
||||
MSBuild(win32Solution, buildSettings);
|
||||
}
|
||||
|
||||
{
|
||||
// Build once with normal dependency ordering
|
||||
var buildSettings = new MSBuildSettings
|
||||
{
|
||||
PlatformTarget = PlatformTarget.ARM,
|
||||
MaxCpuCount = 1,
|
||||
}
|
||||
.SetConfiguration("Release")
|
||||
.UseToolVersion(MSBuildToolVersion.VS2019)
|
||||
.WithTarget("Build");
|
||||
|
||||
Information("\nBuild ARM Step");
|
||||
MSBuild(win32Solution, buildSettings);
|
||||
}
|
||||
|
||||
{
|
||||
var buildSettings = new MSBuildSettings
|
||||
{
|
||||
PlatformTarget = PlatformTarget.ARM64,
|
||||
MaxCpuCount = 1,
|
||||
}
|
||||
.SetConfiguration("Release")
|
||||
.UseToolVersion(MSBuildToolVersion.VS2019)
|
||||
.WithTarget("Restore");
|
||||
|
||||
Information("\nRestore ARM64 Step");
|
||||
MSBuild(win32Solution, buildSettings);
|
||||
}
|
||||
|
||||
{
|
||||
// Build once with normal dependency ordering
|
||||
var buildSettings = new MSBuildSettings
|
||||
{
|
||||
PlatformTarget = PlatformTarget.ARM64,
|
||||
MaxCpuCount = 1,
|
||||
}
|
||||
.SetConfiguration("Release")
|
||||
.UseToolVersion(MSBuildToolVersion.VS2019)
|
||||
.WithTarget("Build");
|
||||
|
||||
Information("\nBuild ARM64 Step");
|
||||
MSBuild(win32Solution, buildSettings);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
Task("InheritDoc")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "3.0.100-preview6-012264"
|
||||
"version": "3.0.100-preview7-012821"
|
||||
}
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче