xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[src] Make project templates MSBuild-compatible. 

MSBuild wants to copy from IntermediateOutputPath to OutputPath, even if the
assembly doesn't exist in IntermediateOutputPath (and it already exists in
OutputPath). So just set IntermediateOutputPath=OutputPath, which seems to
work fine.

Also make these project files build correctly without custom scripts (custom-
make.sh), since that makes it easier to transform these project files in
xharness (copy them to a different directory).
This commit is contained in:
Rolf Bjarne Kvinge 2016-11-29 15:13:24 +01:00
Родитель 8391a3ca39
Коммит 8d220b46d7
9 изменённых файлов: 51 добавлений и 110 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

29
src/MonoTouch.Dialog-1.templ.csproj
Просмотреть файл

@ -13,46 +13,33 @@
<UseMSBuildEngine>True</UseMSBuildEngine>
<DefineConstants>XAMCORE_2_0</DefineConstants>
<OutputPath>build\ios\reference</OutputPath>
<IntermediateOutputPath>$(OutputPath)</IntermediateOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\ios\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentation>True</GenerateDocumentation>
<NoWarn>3021,3014,3003</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release32' Or '$(Configuration)' == 'Release64' Or '$(Configuration)' == 'Release-bitcode' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\ios\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-bitcode|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\ios\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="Xamarin.iOS" />
<Reference Include="System" />
<Reference Include="System.Xml" />
</ItemGroup>
<PropertyGroup>
<CscToolExe>$(MSBuildProjectDirectory)\custom-make.sh</CscToolExe>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Core" />
<Reference Include="System.Json" />
</ItemGroup>
<ItemGroup>
<!--%FILES%-->

31
src/MonoTouch.Dialog-1.tvos.templ.csproj
Просмотреть файл

@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{48585BC2-D604-4CF2-A827-D887BEA51FD6}</ProjectGuid>
<ProjectGuid>{114214A5-A95C-456A-85BA-1B3F23B7AA0C}</ProjectGuid>
<ProjectTypeGuids>{06FA79CB-D6CD-4721-BB4B-1BD202089C55};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace></RootNamespace>
@ -13,46 +13,33 @@
<UseMSBuildEngine>True</UseMSBuildEngine>
<DefineConstants>XAMCORE_2_0;XAMCORE_3_0</DefineConstants>
<OutputPath>build\tvos\reference</OutputPath>
<IntermediateOutputPath>$(OutputPath)</IntermediateOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\tvos\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentation>True</GenerateDocumentation>
<NoWarn>3021,3014,3003</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release32' Or '$(Configuration)' == 'Release64' Or '$(Configuration)' == 'Release-bitcode' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\tvos\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-bitcode|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\tvos\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="Xamarin.TVOS" />
<Reference Include="System" />
<Reference Include="System.Xml" />
</ItemGroup>
<PropertyGroup>
<CscToolExe>$(MSBuildProjectDirectory)\custom-make.sh</CscToolExe>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Core" />
<Reference Include="System.Json" />
</ItemGroup>
<ItemGroup>
<!--%FILES%-->

34
src/MonoTouch.NUnitLite.templ.csproj
Просмотреть файл

@ -11,49 +11,37 @@
<RootNamespace></RootNamespace>
<AssemblyName>MonoTouch.NUnitLite</AssemblyName>
<UseMSBuildEngine>True</UseMSBuildEngine>
<DefineConstants>XAMCORE_2_0</DefineConstants>
<DefineConstants>NUNITLITE;CLR_4_0;NET_4_5;XAMCORE_2_0;MONOTOUCH</DefineConstants>
<OutputPath>build\ios\reference</OutputPath>
<IntermediateOutputPath>$(OutputPath)</IntermediateOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\ios\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentation>True</GenerateDocumentation>
<NoWarn>3021,3014,3003</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release32' Or '$(Configuration)' == 'Release64' Or '$(Configuration)' == 'Release-bitcode' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\ios\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-bitcode|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\ios\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="Xamarin.iOS" />
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="MonoTouch.Dialog-1" />
</ItemGroup>
<PropertyGroup>
<CscToolExe>$(MSBuildProjectDirectory)\custom-make.sh</CscToolExe>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="MonoTouch.Dialog-1.csproj">
<Project>{48585BC2-D604-4CF2-A827-D887BEA51FD6}</Project>
<Name>MonoTouch.Dialog-1</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<!--%FILES%-->

30
src/MonoTouch.NUnitLite.tvos.templ.csproj
Просмотреть файл

@ -11,36 +11,27 @@
<RootNamespace></RootNamespace>
<AssemblyName>MonoTouch.NUnitLite</AssemblyName>
<UseMSBuildEngine>True</UseMSBuildEngine>
<DefineConstants>NUNITLITE;CLR_4_0;NET_4_5;XAMCORE_2_0;XAMCORE_3_0;MONOTOUCH</DefineConstants>
<OutputPath>build\tvos\reference</OutputPath>
<IntermediateOutputPath>$(OutputPath)</IntermediateOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\tvos\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentation>True</GenerateDocumentation>
<NoWarn>3021,3014,3003</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release32' Or '$(Configuration)' == 'Release64' Or '$(Configuration)' == 'Release-bitcode' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\tvos\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-bitcode|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\tvos\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
@ -48,15 +39,10 @@
<Reference Include="System" />
<Reference Include="System.Xml" />
<ProjectReference Include="MonoTouch.Dialog-1.tvos.csproj">
<Project>{48585BC2-D604-4CF2-A827-D887BEA51FD6}</Project>
<Project>{114214A5-A95C-456A-85BA-1B3F23B7AA0C}</Project>
<Name>MonoTouch.Dialog-1</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup>
<CscToolExe>$(MSBuildProjectDirectory)\custom-make.sh</CscToolExe>
</PropertyGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
<!--%FILES%-->
</ItemGroup>

29
src/MonoTouch.NUnitLite.watchos.templ.csproj
Просмотреть файл

@ -11,37 +11,27 @@
<RootNamespace></RootNamespace>
<AssemblyName>MonoTouch.NUnitLite</AssemblyName>
<UseMSBuildEngine>True</UseMSBuildEngine>
<DefineConstants>XAMCORE_2_0;__UNIFIED__;__WATCHOS__</DefineConstants>
<DefineConstants>NUNITLITE;CLR_4_0;NET_4_5;XAMCORE_2_0;XAMCORE_3_0;MONOTOUCH</DefineConstants>
<OutputPath>build\watch\reference</OutputPath>
<IntermediateOutputPath>$(OutputPath)</IntermediateOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\watch\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentation>True</GenerateDocumentation>
<NoWarn>3021,3014,3003</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release32' Or '$(Configuration)' == 'Release64' Or '$(Configuration)' == 'Release-bitcode' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\watch\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-bitcode|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\watch\reference</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
@ -49,11 +39,6 @@
<Reference Include="System" />
<Reference Include="System.Xml" />
</ItemGroup>
<PropertyGroup>
<CscToolExe>$(MSBuildProjectDirectory)\custom-make.sh</CscToolExe>
</PropertyGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
<!--%FILES%-->
</ItemGroup>

2
src/xamios.tmpl.csproj
Просмотреть файл

@ -10,6 +10,8 @@
<OutputType>Library</OutputType>
<RootNamespace>monotouch</RootNamespace>
<AssemblyName>monotouch</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

2
src/xammac.tmpl.csproj
Просмотреть файл

@ -7,6 +7,8 @@
<OutputType>Library</OutputType>
<RootNamespace>src</RootNamespace>
<AssemblyName>src</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

2
src/xamtvos.tmpl.csproj
Просмотреть файл

@ -10,6 +10,8 @@
<OutputType>Library</OutputType>
<RootNamespace>xamtvos</RootNamespace>
<AssemblyName>xamtvos</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

2
src/xamwatch.tmpl.csproj
Просмотреть файл

@ -10,6 +10,8 @@
<OutputType>Library</OutputType>
<RootNamespace>xamwatch</RootNamespace>
<AssemblyName>xamwatch</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>