Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Aug 17, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9da6dff
fix: Android DesignTimeBuild issue with MsBuild.Sdk.Extras
RLittlesII Aug 16, 2019
d23a251
Fixing Resource.Designer issue
RLittlesII Aug 17, 2019
9437203
fixing ReactiveUI.Testing.csproj
RLittlesII Aug 17, 2019
2c798e7
Fixing all projects that target MonoAndroid
RLittlesII Aug 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cake.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[Paths]
Tools=./tools
Addins=./tools/Addins
Modules=./tools/Modules

[NuGet]
UseInProcessClient=true
1 change: 1 addition & 0 deletions src/Directory.build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*" />
Expand Down
6 changes: 6 additions & 0 deletions src/ReactiveUI.Events/ReactiveUI.Events.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
8 changes: 7 additions & 1 deletion src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -53,5 +59,5 @@
<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
<ProjectReference Include="..\ReactiveUI.Fody\ReactiveUI.Fody.csproj" ReferenceOutputAssembly="False" />
</ItemGroup>
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions src/ReactiveUI.Testing/ReactiveUI.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 6 additions & 0 deletions src/ReactiveUI.Uno/ReactiveUI.Uno.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions src/ReactiveUI/ReactiveUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down