Skip to content

Commit 35a341e

Browse files
Bump to xamarin/java.interop/master@a33084b3
Changes: dotnet/java-interop@3894cd7...a33084b * [generator] Wrap SupportedOSPlatformAttribute in NET * [build] use $(RollForward)=Major for console apps * [Java.Interop] Conditionally call ManagedPeer.Init() * [generator] Add [SupportedOSPlatform] in assemblies using ApiSince * [global.json] Update Microsoft.Build.NoTargets to 2.0.1. One workaround for this to build: * Add `NET` to `$(DefineConstants)` for the `netcoreapp3.1` build.
1 parent f5db25e commit 35a341e

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

external/Java.Interop

src/Mono.Android/Mono.Android.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343

4444
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
4545
<OutputPath>$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\$(TargetFramework)\</OutputPath>
46+
<!--TODO: eventually remove `NET` when targeting .NET 6-->
47+
<DefineConstants>$(DefineConstants);NET</DefineConstants>
4648
</PropertyGroup>
4749

4850
<PropertyGroup>

0 commit comments

Comments
 (0)