Skip to content

Commit 4da2792

Browse files
authored
Bump to xamarin/java.interop/main@e31d9c62 (#7266)
Fixes: #7234 Changes: dotnet/java-interop@a5756ca...e31d9c6 * dotnet/java-interop@e31d9c62: Context: #7285 (comment) (#1029) * dotnet/java-interop@d3ea180c: [generator] Add support for `[ObsoletedOSPlatform]` (#1026) * dotnet/java-interop@6d1ae4ee: [generator] Remove [Obsolete] style compatibility hacks. (#1025) * dotnet/java-interop@440c05ee: [generator] Refactor logic for applying [Obsolete] attributes (#1024) * dotnet/java-interop@9b1d3ab7: [Localization] Import translated resx files (#1018) `generator` can now emit `[ObsoletedOSPlatformAttribute]`. Requires: - Update `Mono.Android.targets` to pass `lang-feature=obsoleted-platform-attributes` to `generator` when building for .NET 7+ - Update `acceptable-breakages-vReference-net7.0.txt` to account for removing existing `[Obsolete]` attributes in favor of the new ones, for .NET 7+ only
1 parent 7b4d4b8 commit 4da2792

File tree

3 files changed

+2856
-1
lines changed

3 files changed

+2856
-1
lines changed

external/Java.Interop

src/Mono.Android/Mono.Android.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
<_FullIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)'))</_FullIntermediateOutputPath>
177177
<_LangFeatures>--lang-features=nullable-reference-types</_LangFeatures>
178178
<_LangFeatures Condition="$(AndroidApiLevel) &gt;= 30">$(_LangFeatures),default-interface-methods,nested-interface-types,interface-constants</_LangFeatures>
179+
<_LangFeatures Condition=" $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '7.0')) ">$(_LangFeatures),obsoleted-platform-attributes</_LangFeatures>
179180
</PropertyGroup>
180181
<Exec
181182
Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(Generator) $(_GenFlags) $(_ApiLevel) $(_Out) $(_Codegen) $(_Fixup) $(_Enums1) $(_Enums2) $(_Versions) $(_Annotations) $(_Assembly) $(_TypeMap) $(_LangFeatures) $(_Dirs) $(_Api) $(_WithJavadocXml)"

0 commit comments

Comments
 (0)