fix: Android DesignTimeBuild issue with MsBuild.Sdk.Extras (#2137)

* fix: Android DesignTimeBuild issue with MsBuild.Sdk.Extras

* Fixing Resource.Designer issue

* Fixing ReactiveUI.Testing.csproj

* Fixing all projects that target MonoAndroid
This commit is contained in:
Rodney Littles II 2019-08-16 19:41:25 -05:00 коммит произвёл GitHub
Родитель 33e9eda383
Коммит dbc33b8f7f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 46 добавлений и 2 удалений

7
cake.config Normal file
Просмотреть файл

@ -0,0 +1,7 @@
[Paths]
Tools=./tools
Addins=./tools/Addins
Modules=./tools/Modules
[NuGet]
UseInProcessClient=true

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

@ -28,6 +28,7 @@
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
<DesignTimeBuild>false</DesignTimeBuild>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>

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

@ -6,7 +6,13 @@
<PackageId>ReactiveUI.AndroidSupport</PackageId>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
<ItemGroup>
<Compile Remove="$(AndroidResgenFile)"/>
</ItemGroup>
</Target>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="27.0.*" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.*" />

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

@ -9,6 +9,12 @@
<NoWarn>$(NoWarn);CS1570;CA1812</NoWarn>
</PropertyGroup>
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
<ItemGroup>
<Compile Remove="$(AndroidResgenFile)"/>
</ItemGroup>
</Target>
<ItemGroup>
<Compile Remove="*.cs" />
<None Include="*.cs" />

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

@ -13,6 +13,12 @@
<IsPackable Condition=" '$(OS)' != 'Windows_NT' ">false</IsPackable>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
<ItemGroup>
<Compile Remove="$(AndroidResgenFile)"/>
</ItemGroup>
</Target>
<ItemGroup>
<PackageReference Include="Fody" Version="5.1.1" PrivateAssets="None" />
@ -53,5 +59,5 @@
<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
<ProjectReference Include="..\ReactiveUI.Fody\ReactiveUI.Fody.csproj" ReferenceOutputAssembly="False" />
</ItemGroup>
</ItemGroup>
</Project>

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

@ -9,6 +9,12 @@
<LangVersion>latest</LangVersion>
</PropertyGroup>
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
<ItemGroup>
<Compile Remove="$(AndroidResgenFile)"/>
</ItemGroup>
</Target>
<ItemGroup>
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.6" />
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />

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

@ -13,6 +13,12 @@
<DefineConstants>HAS_UNO;WASM</DefineConstants>
</PropertyGroup>
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
<ItemGroup>
<Compile Remove="$(AndroidResgenFile)"/>
</ItemGroup>
</Target>
<ItemGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
<PackageReference Include="Uno.UI" Version="1.*" />
</ItemGroup>

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

@ -9,6 +9,12 @@
<LangVersion>latest</LangVersion>
</PropertyGroup>
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
<ItemGroup>
<Compile Remove="$(AndroidResgenFile)"/>
</ItemGroup>
</Target>
<ItemGroup>
<Compile Remove="Platforms\**\*.cs" />
<None Include="Platforms\**\*.cs" />