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:
Родитель
33e9eda383
Коммит
dbc33b8f7f
|
@ -0,0 +1,7 @@
|
||||||
|
[Paths]
|
||||||
|
Tools=./tools
|
||||||
|
Addins=./tools/Addins
|
||||||
|
Modules=./tools/Modules
|
||||||
|
|
||||||
|
[NuGet]
|
||||||
|
UseInProcessClient=true
|
|
@ -28,6 +28,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
|
<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
|
||||||
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
|
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
|
||||||
|
<DesignTimeBuild>false</DesignTimeBuild>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
|
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
|
||||||
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
|
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
|
||||||
|
|
|
@ -6,7 +6,13 @@
|
||||||
<PackageId>ReactiveUI.AndroidSupport</PackageId>
|
<PackageId>ReactiveUI.AndroidSupport</PackageId>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Remove="$(AndroidResgenFile)"/>
|
||||||
|
</ItemGroup>
|
||||||
|
</Target>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="27.0.*" />
|
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="27.0.*" />
|
||||||
<PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.*" />
|
<PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.*" />
|
||||||
|
|
|
@ -9,6 +9,12 @@
|
||||||
<NoWarn>$(NoWarn);CS1570;CA1812</NoWarn>
|
<NoWarn>$(NoWarn);CS1570;CA1812</NoWarn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Remove="$(AndroidResgenFile)"/>
|
||||||
|
</ItemGroup>
|
||||||
|
</Target>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Remove="*.cs" />
|
<Compile Remove="*.cs" />
|
||||||
<None Include="*.cs" />
|
<None Include="*.cs" />
|
||||||
|
|
|
@ -13,6 +13,12 @@
|
||||||
<IsPackable Condition=" '$(OS)' != 'Windows_NT' ">false</IsPackable>
|
<IsPackable Condition=" '$(OS)' != 'Windows_NT' ">false</IsPackable>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Remove="$(AndroidResgenFile)"/>
|
||||||
|
</ItemGroup>
|
||||||
|
</Target>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Fody" Version="5.1.1" PrivateAssets="None" />
|
<PackageReference Include="Fody" Version="5.1.1" PrivateAssets="None" />
|
||||||
|
@ -53,5 +59,5 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
|
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
|
||||||
<ProjectReference Include="..\ReactiveUI.Fody\ReactiveUI.Fody.csproj" ReferenceOutputAssembly="False" />
|
<ProjectReference Include="..\ReactiveUI.Fody\ReactiveUI.Fody.csproj" ReferenceOutputAssembly="False" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -9,6 +9,12 @@
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Remove="$(AndroidResgenFile)"/>
|
||||||
|
</ItemGroup>
|
||||||
|
</Target>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.6" />
|
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.6" />
|
||||||
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
|
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
|
||||||
|
|
|
@ -13,6 +13,12 @@
|
||||||
<DefineConstants>HAS_UNO;WASM</DefineConstants>
|
<DefineConstants>HAS_UNO;WASM</DefineConstants>
|
||||||
</PropertyGroup>
|
</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')) ">
|
<ItemGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
|
||||||
<PackageReference Include="Uno.UI" Version="1.*" />
|
<PackageReference Include="Uno.UI" Version="1.*" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
|
@ -9,6 +9,12 @@
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Target Name="_RemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Remove="$(AndroidResgenFile)"/>
|
||||||
|
</ItemGroup>
|
||||||
|
</Target>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Remove="Platforms\**\*.cs" />
|
<Compile Remove="Platforms\**\*.cs" />
|
||||||
<None Include="Platforms\**\*.cs" />
|
<None Include="Platforms\**\*.cs" />
|
||||||
|
|
Загрузка…
Ссылка в новой задаче