зеркало из https://github.com/microsoft/Win2D.git
Fix managed UAP test project, and re-enable running these tests
This commit is contained in:
Родитель
98953e3ee0
Коммит
feab52b106
|
@ -145,8 +145,7 @@
|
|||
</UAPProject>
|
||||
<UAPProject Include="winrt\test.nativecomponent\winrt.test.nativecomponent.uap.vcxproj" />
|
||||
<UAPProject Include="winrt\test.managed\UAP\winrt.test.managed.uap.csproj">
|
||||
<!-- <AutomatedTests Condition="$(ShouldRunUAPTests)">store</AutomatedTests> TODO: reenable managed UAP tests
|
||||
-->
|
||||
<AutomatedTests Condition="$(ShouldRunUAPTests)">store</AutomatedTests>
|
||||
</UAPProject>
|
||||
<UAPProject Include="samples\SimpleSample\UAP\SimpleSample.uap.csproj" />
|
||||
<UAPProject Include="samples\CoreWindowExample\UAP\CoreWindowExample.uap.csproj" />
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
<Resource Language="x-generate" />
|
||||
</Resources>
|
||||
<Applications>
|
||||
<Application Id="App"
|
||||
Executable="vstest.executionengine.appcontainer.exe"
|
||||
<Application Id="vstest.executionengine.universal.App"
|
||||
Executable="vstest.executionengine.appcontainer.uap.exe"
|
||||
EntryPoint="Microsoft.VisualStudio.TestPlatform.TestExecutor.AppContainer.App">
|
||||
<uap:VisualElements
|
||||
DisplayName="winrt.test.managed.uap"
|
||||
|
@ -32,30 +32,6 @@
|
|||
<uap:SplashScreen Image="Assets\SplashScreen.png" />
|
||||
</uap:VisualElements>
|
||||
</Application>
|
||||
<Application Id="vstest.executionengine.App"
|
||||
Executable="vstest.executionengine.appcontainer.exe"
|
||||
EntryPoint="vstest.executionengine.App">
|
||||
<uap:VisualElements
|
||||
DisplayName="winrt.test.managed.uap"
|
||||
Square150x150Logo="Assets\Logo.png"
|
||||
Square44x44Logo="Assets\SmallLogo.png"
|
||||
Description="winrt.test.managed.uap"
|
||||
BackgroundColor="#464646">
|
||||
<uap:SplashScreen Image="Assets\SplashScreen.png" />
|
||||
</uap:VisualElements>
|
||||
</Application>
|
||||
<Application Id="vstest.executionengine.x86.App"
|
||||
Executable="vstest.executionengine.appcontainer.x86.exe"
|
||||
EntryPoint="vstest.executionengine.x86.App">
|
||||
<uap:VisualElements
|
||||
DisplayName="winrt.test.managed.uap"
|
||||
Square150x150Logo="Assets\Logo.png"
|
||||
Square44x44Logo="Assets\SmallLogo.png"
|
||||
Description="winrt.test.managed.uap"
|
||||
BackgroundColor="#464646">
|
||||
<uap:SplashScreen Image="Assets\SplashScreen.png" />
|
||||
</uap:VisualElements>
|
||||
</Application>
|
||||
</Applications>
|
||||
<Capabilities>
|
||||
<Capability Name="internetClientServer" />
|
||||
|
|
|
@ -14,10 +14,8 @@
|
|||
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<AppxBundle>Never</AppxBundle>
|
||||
<AllowCrossPlatformRetargeting>False</AllowCrossPlatformRetargeting>
|
||||
<UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">14.0</UnitTestPlatformVersion>
|
||||
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
|
||||
<EnableCoreRuntime>false</EnableCoreRuntime>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AppXPackage>True</AppXPackage>
|
||||
|
@ -98,8 +96,8 @@
|
|||
<Name>winrt.test.nativecomponent.uap</Name>
|
||||
<Project>{9936FFEF-2686-4DF6-8D64-2BFA78B1222A}</Project>
|
||||
</ProjectReference>
|
||||
<SDKReference Include="MSTestFramework, Version=$(UnitTestPlatformVersion)" />
|
||||
<SDKReference Include="TestPlatform, Version=$(UnitTestPlatformVersion)" />
|
||||
<SDKReference Include="MSTestFramework.Universal, Version=$(UnitTestPlatformVersion)" />
|
||||
<SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AppxManifest Include="winrt.test.managed.uap.appxmanifest">
|
||||
|
|
Загрузка…
Ссылка в новой задаче