Fixing a build break in Helios

Removing Common.Native.targets - to avoid increasing build complexity repo with native projects will have their own target that generates version.h file
This commit is contained in:
moozzyk 2015-05-01 13:16:51 -07:00
parent 6558f1c281
commit f3207ed440
2 changed files with 2 additions and 25 deletions

View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="CreateVersionHeader" BeforeTargets="Build">
<PropertyGroup>
<ProductVersion Condition="'$(ProductVersion)' == ''">0.0.0</ProductVersion>
<FileRevision Condition="'$(FileRevision)' == ''">0</FileRevision>
<FullFileVersion>$(ProductVersion).$(FileRevision)</FullFileVersion>
<BuildVersionSuffix Condition="'$(BuildVersion)' != ''">-$(BuildVersion)</BuildVersionSuffix>
</PropertyGroup>
<ItemGroup>
<VersionHeaderContents Include="// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved." />
<VersionHeaderContents Include="// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information." />
<VersionHeaderContents Include="%0a" />
<VersionHeaderContents Include="// This file is auto-generated" />
<VersionHeaderContents Include="%0a" />
<VersionHeaderContents Include="#define FileVersion $(FullFileVersion.Replace('.', ','))" />
<VersionHeaderContents Include="#define FileVersionStr &quot;$(FullFileVersion)\0&quot;" />
<VersionHeaderContents Include="#define ProductVersion $(ProductVersion.Replace('.', ',')),0" />
<VersionHeaderContents Include="#define ProductVersionStr &quot;$(ProductVersion)$(BuildVersionSuffix)\0&quot;" />
</ItemGroup>
<WriteLinesToFile File="version.h" Lines="@(VersionHeaderContents)" OverWrite="true" />
</Target>
</Project>

View File

@ -112,8 +112,8 @@ default Configuration='${E("Configuration")}'
foreach (var project in nativeProjects)
{
Exec(msbuildPath, project + " /p:Configuration=Platform=Win32" + commonParameters);
Exec(msbuildPath, project + " /p:Configuration=Platform=x64" + commonParameters);
Exec(msbuildPath, project + " /p:Platform=Win32" + commonParameters);
Exec(msbuildPath, project + " /p:Platform=x64" + commonParameters);
}
break;