Commit 8c07f66f authored by Ghislain MARY's avatar Ghislain MARY

Fix deployment error of MS2Tester for x86 and ARM platforms.

parent 5be22ef9
......@@ -114,18 +114,10 @@
<None Include="MS2Tester_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<Content Include="Assets\SplashScreen.scale-200.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Assets\Square150x150Logo.scale-200.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Assets\Square44x44Logo.scale-200.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Assets\StoreLogo.scale-200.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Assets\SplashScreen.scale-200.png" />
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />
<Content Include="Assets\StoreLogo.scale-200.png" />
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\Images\nowebcamCIF.jpg" />
<Content Include="Assets\Sounds\arpeggio_8000_mono.wav" />
......@@ -155,8 +147,8 @@
<SubType>Designer</SubType>
</Page>
<Page Include="VideoPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
......

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MS2Tester", "MS2Tester.csproj", "{F9611E8F-6700-4E34-8CD4-47A54981183E}"
EndProject
......@@ -46,12 +46,10 @@ Global
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Debug|Any CPU.ActiveCfg = Debug|Win32
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Debug|ARM.ActiveCfg = Debug|ARM
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Debug|ARM.Build.0 = Debug|ARM
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Debug|ARM.Deploy.0 = Debug|ARM
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Debug|x64.ActiveCfg = Debug|x64
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Debug|x64.Build.0 = Debug|x64
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Debug|x86.ActiveCfg = Debug|Win32
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Debug|x86.Build.0 = Debug|Win32
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Debug|x86.Deploy.0 = Debug|Win32
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Release|Any CPU.ActiveCfg = Release|Win32
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Release|ARM.ActiveCfg = Release|ARM
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Release|ARM.Build.0 = Release|ARM
......@@ -62,16 +60,14 @@ Global
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Release|x86.ActiveCfg = Release|Win32
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Release|x86.Build.0 = Release|Win32
{8A1A89B3-F2DB-4428-A571-F0DFF2E1EEC1}.Release|x86.Deploy.0 = Release|Win32
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Debug|Any CPU.ActiveCfg = Debug|x86
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Debug|ARM.ActiveCfg = Debug|ARM
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Debug|ARM.Build.0 = Debug|ARM
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Debug|x64.ActiveCfg = Debug|x64
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Debug|x64.Build.0 = Debug|x64
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Debug|x86.ActiveCfg = Debug|x86
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Debug|x86.Build.0 = Debug|x86
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Release|Any CPU.Build.0 = Release|Any CPU
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Release|Any CPU.ActiveCfg = Release|x86
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Release|ARM.ActiveCfg = Release|ARM
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Release|ARM.Build.0 = Release|ARM
{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}.Release|x64.ActiveCfg = Release|x64
......
......@@ -3,7 +3,7 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProjectGuid>{1BA81D48-5FC4-47FC-8A08-524C4B2859DD}</ProjectGuid>
<OutputType>winmdobj</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
......@@ -18,25 +18,6 @@
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<PlatformTarget>ARM</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
......
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
"MS2TesterSDK": "2.12.1.208"
"MS2TesterSDK": "2.12.1.380"
},
"frameworks": {
"uap10.0": {}
......
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
"MS2TesterSDK": "2.12.1.208"
"MS2TesterSDK": "2.12.1.380"
},
"frameworks": {
"uap10.0": {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment