Skip to content

Commit b32de3e

Browse files
glennawatsonglennawatson
authored
Fix: Add Java.Interop to all MonoAndroid projects (#2996)
1 parent 7432100 commit b32de3e

File tree

11 files changed

+70
-9
lines changed

11 files changed

+70
-9
lines changed

‎.github/workflows/ci-build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
uses: actions/checkout@v2
4141
with:
4242
fetch-depth: 0
43+
lfs: true
4344

4445
- name: Install .NET Core
4546
uses: actions/[email protected]

‎src/Directory.build.props‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,7 @@
3939
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
4040
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
4141
</PropertyGroup>
42-
43-
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
44-
<!-- Hack to get around invalid version of Java.Interop -->
45-
<Reference Include="Java.Interop">
46-
<!-- Path to a VS 2019 Java.Interop.dll -->
47-
<HintPath>C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\MonoAndroid\v1.0\Java.Interop.dll</HintPath>
48-
</Reference>
49-
</ItemGroup>
50-
42+
5143
<ItemGroup Condition="$(IsTestProject)">
5244
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
5345
<PackageReference Include="xunit" Version="2.4.1" />

‎src/Java.Interop.dll‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:bf36e42a425d140c6217c512bfe15862ed062a1715d74562475c2547bc5376e1
3+
size 208760

‎src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;</PackageTags>
1010
</PropertyGroup>
1111

12+
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
13+
<!-- Hack to get around invalid version of Java.Interop -->
14+
<Reference Include="Java.Interop">
15+
<!-- Path to a VS 2019 Java.Interop.dll -->
16+
<HintPath>..\Java.Interop.dll</HintPath>
17+
</Reference>
18+
</ItemGroup>
19+
1220
<ItemGroup>
1321
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="28.*" />
1422
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.*" />

‎src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;</PackageTags>
1010
</PropertyGroup>
1111

12+
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
13+
<!-- Hack to get around invalid version of Java.Interop -->
14+
<Reference Include="Java.Interop">
15+
<!-- Path to a VS 2019 Java.Interop.dll -->
16+
<HintPath>..\Java.Interop.dll</HintPath>
17+
</Reference>
18+
</ItemGroup>
19+
1220
<ItemGroup>
1321
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
1422
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.3" />

‎src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@
99
<Nullable>enable</Nullable>
1010
<LangVersion>preview</LangVersion>
1111
</PropertyGroup>
12+
13+
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
14+
<!-- Hack to get around invalid version of Java.Interop -->
15+
<Reference Include="Java.Interop">
16+
<!-- Path to a VS 2019 Java.Interop.dll -->
17+
<HintPath>..\Java.Interop.dll</HintPath>
18+
</Reference>
19+
</ItemGroup>
20+
1221
<ItemGroup>
1322
<Compile Remove="Resources\**" />
1423
<EmbeddedResource Remove="Resources\**" />

‎src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
<LangVersion>preview</LangVersion>
1717
</PropertyGroup>
1818

19+
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
20+
<!-- Hack to get around invalid version of Java.Interop -->
21+
<Reference Include="Java.Interop">
22+
<!-- Path to a VS 2019 Java.Interop.dll -->
23+
<HintPath>..\Java.Interop.dll</HintPath>
24+
</Reference>
25+
</ItemGroup>
26+
1927
<ItemGroup>
2028
<PackageReference Include="Fody" Version="6.6.0" PrivateAssets="None" />
2129
<PackageReference Include="FodyPackaging" Version="6.6.0" PrivateAssets="All" />

‎src/ReactiveUI.Testing/ReactiveUI.Testing.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@
1111
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;test;</PackageTags>
1212
</PropertyGroup>
1313

14+
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
15+
<!-- Hack to get around invalid version of Java.Interop -->
16+
<Reference Include="Java.Interop">
17+
<!-- Path to a VS 2019 Java.Interop.dll -->
18+
<HintPath>..\Java.Interop.dll</HintPath>
19+
</Reference>
20+
</ItemGroup>
21+
1422
<ItemGroup>
1523
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
1624
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />

‎src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
<DefineConstants>$(DefineConstants);WASM</DefineConstants>
1515
</PropertyGroup>
1616

17+
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
18+
<!-- Hack to get around invalid version of Java.Interop -->
19+
<Reference Include="Java.Interop">
20+
<!-- Path to a VS 2019 Java.Interop.dll -->
21+
<HintPath>..\Java.Interop.dll</HintPath>
22+
</Reference>
23+
</ItemGroup>
24+
1725
<ItemGroup>
1826
<EmbeddedResource Remove="Resources\**" />
1927
<None Remove="Resources\**" />

‎src/ReactiveUI.Uno/ReactiveUI.Uno.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
<DefineConstants>$(DefineConstants);WASM</DefineConstants>
1616
</PropertyGroup>
1717

18+
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
19+
<!-- Hack to get around invalid version of Java.Interop -->
20+
<Reference Include="Java.Interop">
21+
<!-- Path to a VS 2019 Java.Interop.dll -->
22+
<HintPath>..\Java.Interop.dll</HintPath>
23+
</Reference>
24+
</ItemGroup>
25+
1826
<ItemGroup>
1927
<EmbeddedResource Remove="Resources\**" />
2028
<None Remove="Resources\**" />

0 commit comments

Comments
 (0)