Switched to Profile32 (Windows 8.1) for Store apps (including UWP)

This commit is contained in:
Virgile Bello 2016-07-08 13:19:55 +09:00
Родитель 55427e3255
Коммит b9fa0f56c4
7 изменённых файлов: 28 добавлений и 39 удалений

Просмотреть файл

@ -2,6 +2,7 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}</ProjectGuid>
@ -9,47 +10,39 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CppNet</RootNamespace>
<AssemblyName>CppNet</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFrameworkProfile>Profile32</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Bin\UWP\Debug\</OutputPath>
<IntermediateOutputPath>obj\UWP\Debug</IntermediateOutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<OutputPath>Bin\Store\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;WINDOWS_STORE</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\UWP\Release\</OutputPath>
<IntermediateOutputPath>obj\UWP\Release</IntermediateOutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<OutputPath>Bin\Store\Release\</OutputPath>
<DefineConstants>TRACE;WINDOWS_STORE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
<None Include="project.json" />
<!-- A reference to the entire .NET Framework is automatically included -->
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\CppNet.rd.xml" />
<TargetPlatform Include="Windows, Version=8.1" />
<TargetPlatform Include="WindowsPhoneApp, Version=8.1" />
</ItemGroup>
<ItemGroup />
<Import Project="CppNetShared.projitems" Label="Shared" />
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

Просмотреть файл

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppNet_Uwp", "CppNet_Uwp.csproj", "{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppNet_Store", "CppNet_Store.csproj", "{C2FD9262-69F8-4B75-9AB1-FF359C9143E9}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CppNetShared", "CppNetShared.shproj", "{8D8A8527-A2A6-494E-8D19-7BB23CBB7BC8}"
EndProject

Просмотреть файл

@ -14,6 +14,7 @@
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
#if !WINDOWS_STORE
using System;
using System.IO;
@ -65,3 +66,4 @@ public class FileLexerSource : LexerSource {
}
}
#endif

Просмотреть файл

@ -1,4 +1,5 @@
using System;
#if !WINDOWS_STORE
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -47,3 +48,4 @@ namespace CppNet
}
}
}
#endif

Просмотреть файл

@ -14,6 +14,7 @@
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
#if !WINDOWS_STORE
using System;
using System.IO;
@ -38,3 +39,4 @@ namespace CppNet
}
}
}
#endif

Просмотреть файл

@ -123,7 +123,9 @@ public class Preprocessor : IDisposable {
this.frameworkspath = new List<String>();
this.features = Feature.NONE;
this.warnings = Warning.NONE;
#if !WINDOWS_STORE
this.filesystem = new JavaFileSystem();
#endif
this.listener = null;
}
@ -132,12 +134,14 @@ public class Preprocessor : IDisposable {
addInput(initial);
}
#if !WINDOWS_STORE
/** Equivalent to
* 'new Preprocessor(new {@link FileLexerSource}(file))'
*/
public Preprocessor(FileInfo file) :
this(new FileLexerSource(file)) {
}
#endif
/**
* Sets the VirtualFileSystem used by this Preprocessor.
@ -250,6 +254,7 @@ public class Preprocessor : IDisposable {
inputs.Add(source);
}
#if !WINDOWS_STORE
/**
* Adds input for the Preprocessor.
*
@ -258,6 +263,7 @@ public class Preprocessor : IDisposable {
public void addInput(FileInfo file) {
addInput(new FileLexerSource(file));
}
#endif
/**

Просмотреть файл

@ -1,16 +0,0 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0"
},
"frameworks": {
"uap10.0": {}
},
"runtimes": {
"win10-arm": {},
"win10-arm-aot": {},
"win10-x86": {},
"win10-x86-aot": {},
"win10-x64": {},
"win10-x64-aot": {}
}
}