Skip to content

Commit db56e38

Browse files
jonpryorjonpryor
authored
Bump to xamarin/Java.Interop/main@cbd96668 (#6737)
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (#948) Of particular note is dotnet/java-interop@cbd96668, which changes the version of `Java.Interop.dll` in the net6.0 profile from 0.1.0.0 to 6.0.0.0, and the version of "utility libs" like `Xamarin.SourceWriter.dll` from being identical to their non-net6.0 counterparts, to instead having `6.0.0.*` version numbers. This change in turn necessitates: * Updating `build-tools/create-packs` and `build-tools/installers` so that the "utility libs" are grabbed from their appropriate build directory, so that we don't distribute e.g. "legacy" `Xamarin.SourceWriter, Version=0.2.0.0` in the .net 6 package. * Updating `tests/**/*.csproj` to specify a "full" `$(TargetFramework)`=net6.0-android32 instead of `$(TargetFramework)`=net6.0-android. If we don't use the "full" version, we'll use the net6.0-android31.0 targeting pack, which has the wrong version for `Java.Interop.dll`, possibly resulting in compilation errors: error CS0433: The type 'JavaObject' exists in both 'Java.Interop, Version=0.1.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065' and 'Java.Interop, Version=6.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065'. dotnet/java-interop@e587cf6b simplified the Java.Interop build system, necessitating changes to `build-tools/xaprepare` -- `make prepare-core` is no longer needed -- but also required adding `Java.Runtime.Environment.csproj` to `Xamarin.Android.sln`, so that it's build-time Target could properly create `Java.Runtime.Environment.dll.config`. TODO: Better deal with the `Java.Interop.dll` version change that is now part of `net6.0-android32.0`. We should consider "removing" the `net6.0-android31.0` targeting pack, and make `net6.0-android` be an alias for `net6.0-android32.0`.
1 parent e4bd531 commit db56e38

File tree

14 files changed

+45
-72
lines changed

14 files changed

+45
-72
lines changed

‎Xamarin.Android.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaType
154154
EndProject
155155
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "relnote-gen", "tools\relnote-gen\relnote-gen.csproj", "{D8E14B43-E929-4C18-9FA6-2C3DC47EFC17}"
156156
EndProject
157+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Runtime.Environment", "external\Java.Interop\src\Java.Runtime.Environment\Java.Runtime.Environment.csproj", "{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}"
158+
EndProject
157159
Global
158160
GlobalSection(SharedMSBuildProjectFiles) = preSolution
159161
src\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems*{3f1f2f50-af1a-4a5a-bedb-193372f068d7}*SharedItemsImports = 5
@@ -426,6 +428,10 @@ Global
426428
{D8E14B43-E929-4C18-9FA6-2C3DC47EFC17}.Debug|AnyCPU.Build.0 = Debug|Any CPU
427429
{D8E14B43-E929-4C18-9FA6-2C3DC47EFC17}.Release|AnyCPU.ActiveCfg = Release|Any CPU
428430
{D8E14B43-E929-4C18-9FA6-2C3DC47EFC17}.Release|AnyCPU.Build.0 = Release|Any CPU
431+
{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
432+
{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Debug|AnyCPU.Build.0 = Debug|Any CPU
433+
{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Release|AnyCPU.ActiveCfg = Release|Any CPU
434+
{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B}.Release|AnyCPU.Build.0 = Release|Any CPU
429435
EndGlobalSection
430436
GlobalSection(SolutionProperties) = preSolution
431437
HideSolutionNode = FALSE
@@ -496,6 +502,7 @@ Global
496502
{1FED3F23-1175-42AA-BE87-EF1E8DB52F8B} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
497503
{4EFCED6E-9A6B-453A-94E4-CE4B736EC684} = {864062D3-A415-4A6F-9324-5820237BA058}
498504
{D8E14B43-E929-4C18-9FA6-2C3DC47EFC17} = {864062D3-A415-4A6F-9324-5820237BA058}
505+
{C0E44558-FEE3-4DD3-986A-3F46DD1BF41B} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
499506
EndGlobalSection
500507
GlobalSection(ExtensibilityGlobals) = postSolution
501508
SolutionGuid = {53A1F287-EFB2-4D97-A4BB-4A5E145613F6}

‎build-tools/create-packs/Microsoft.Android.Sdk.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ core workload SDK packs imported by WorkloadManifest.targets.
7070
<_PackageFiles Include="$(XAInstallPrefix)xbuild\Xamarin\Android\Microsoft.Android.Sdk.ILLink.pdb" PackagePath="tools" />
7171
<_PackageFiles Include="$(XAInstallPrefix)xbuild\Xamarin\Android\%(_LocalizationLanguages.Identity)\Microsoft.Android.Sdk.ILLink.resources.dll" PackagePath="tools\%(_LocalizationLanguages.Identity)" />
7272
<_PackageFiles Include="$(ToolsSourceDir)**" PackagePath="tools" />
73+
<_PackageFiles Include="@(JIUtilityFile->'$(NetCoreAppToolsSourceDir)%(Identity)')" PackagePath="tools" />
7374
<_PackageFiles Include="$(NetCoreAppToolsSourceDir)class-parse.dll" PackagePath="tools" />
7475
<_PackageFiles Include="$(NetCoreAppToolsSourceDir)class-parse.pdb" PackagePath="tools" />
7576
<_PackageFiles Include="$(NetCoreAppToolsSourceDir)class-parse.runtimeconfig.json" PackagePath="tools" />

‎build-tools/installers/create-installers.targets‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,32 @@
9898
<_DesignerFilesUnix Include="$(MSBuildSrcDir)\$(HostOS)\bcl\**\*" />
9999
<_DesignerFilesWin Include="$(MSBuildSrcDir)\bcl\**\* "/>
100100
</ItemGroup>
101+
<ItemGroup>
102+
<JIUtilityFile Include="Java.Interop.Localization.dll" />
103+
<JIUtilityFile Include="Java.Interop.Localization.pdb" />
104+
<JIUtilityFile Include="Java.Interop.Tools.Cecil.dll" />
105+
<JIUtilityFile Include="Java.Interop.Tools.Cecil.pdb" />
106+
<JIUtilityFile Include="Java.Interop.Tools.Diagnostics.dll" />
107+
<JIUtilityFile Include="Java.Interop.Tools.Diagnostics.pdb" />
108+
<JIUtilityFile Include="Java.Interop.Tools.Generator.dll" />
109+
<JIUtilityFile Include="Java.Interop.Tools.Generator.pdb" />
110+
<JIUtilityFile Include="Java.Interop.Tools.JavaCallableWrappers.dll" />
111+
<JIUtilityFile Include="Java.Interop.Tools.JavaCallableWrappers.pdb" />
112+
<JIUtilityFile Include="Java.Interop.Tools.JavaSource.dll" />
113+
<JIUtilityFile Include="Java.Interop.Tools.JavaSource.pdb" />
114+
<JIUtilityFile Include="Java.Interop.Tools.JavaTypeSystem.dll" />
115+
<JIUtilityFile Include="Java.Interop.Tools.JavaTypeSystem.pdb" />
116+
<JIUtilityFile Include="Xamarin.Android.Tools.AnnotationSupport.dll" />
117+
<JIUtilityFile Include="Xamarin.Android.Tools.AnnotationSupport.pdb" />
118+
<JIUtilityFile Include="Xamarin.Android.Tools.ApiXmlAdjuster.dll" />
119+
<JIUtilityFile Include="Xamarin.Android.Tools.ApiXmlAdjuster.pdb" />
120+
<JIUtilityFile Include="Xamarin.Android.Tools.Bytecode.dll" />
121+
<JIUtilityFile Include="Xamarin.Android.Tools.Bytecode.pdb" />
122+
<JIUtilityFile Include="Xamarin.Android.Tools.JavadocImporter.dll" />
123+
<JIUtilityFile Include="Xamarin.Android.Tools.JavadocImporter.pdb" />
124+
<JIUtilityFile Include="Xamarin.SourceWriter.dll" />
125+
<JIUtilityFile Include="Xamarin.SourceWriter.pdb" />
126+
</ItemGroup>
101127
<ItemGroup>
102128
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\Mono.Android.Export.dll" />
103129
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\Mono.Android.Export.pdb" />
@@ -119,6 +145,7 @@
119145
<_FrameworkFilesWin Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Xamarin.Android.NUnitLite.xml" />
120146
</ItemGroup>
121147
<ItemGroup>
148+
<_MSBuildFiles Include="@(JIUtilityFile->'$(MSBuildSrcDir)\%(Identity)')" ExcludeFromAndroidNETSdk="true"/>
122149
<_MSBuildFiles Include="$(MSBuildSrcDir)\android-support-multidex.jar" />
123150
<_MSBuildFiles Include="$(MSBuildSrcDir)\apksigner.jar" />
124151
<_MSBuildFiles Include="$(MSBuildSrcDir)\aprofutil.exe" ExcludeFromAndroidNETSdk="true" />
@@ -140,21 +167,7 @@
140167
<_MSBuildFiles Include="$(MSBuildSrcDir)\java-source-utils.jar" />
141168
<_MSBuildFiles Include="$(MSBuildSrcDir)\javadoc-to-mdoc.exe" ExcludeFromAndroidNETSdk="true" />
142169
<_MSBuildFiles Include="$(MSBuildSrcDir)\javadoc-to-mdoc.pdb" ExcludeFromAndroidNETSdk="true" />
143-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Localization.dll" />
144-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Localization.pdb" />
145170
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.dll.config" />
146-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Cecil.dll" />
147-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Cecil.pdb" />
148-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Diagnostics.dll" />
149-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Diagnostics.pdb" />
150-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Generator.dll" />
151-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.Generator.pdb" />
152-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaCallableWrappers.dll" />
153-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaCallableWrappers.pdb" />
154-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaSource.dll" />
155-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaSource.pdb" />
156-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaTypeSystem.dll" />
157-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Interop.Tools.JavaTypeSystem.pdb" />
158171
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.dll" />
159172
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.pdb" />
160173
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.dll.config" Condition=" '$(HostOS)' != 'Windows' " />
@@ -281,21 +294,11 @@
281294
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Aidl.pdb" />
282295
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.AndroidSdk.dll" />
283296
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.AndroidSdk.pdb" />
284-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.AnnotationSupport.dll" />
285-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.AnnotationSupport.pdb" />
286-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.ApiXmlAdjuster.dll" />
287-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.ApiXmlAdjuster.pdb" />
288-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Bytecode.dll" />
289-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Bytecode.pdb" />
290-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.JavadocImporter.dll" />
291-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.JavadocImporter.pdb" />
292297
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Versions.props" />
293298
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.VisualBasic.targets" ExcludeFromAndroidNETSdk="true" />
294299
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Wear.targets" ExcludeFromAndroidNETSdk="true" />
295300
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Build.AsyncTask.dll" />
296301
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Build.AsyncTask.pdb" />
297-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.SourceWriter.dll" />
298-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.SourceWriter.pdb" />
299302
<_MSBuildFiles Include="$(MSBuildSrcDir)\K4os.Compression.LZ4.dll" />
300303
<_MSBuildFiles Include="$(MSBuildSrcDir)\K4os.Hash.xxHash.dll" />
301304
<_MSBuildFiles Include="$(MSBuildSrcDir)\ELFSharp.dll" />

‎build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternalJavaInterop.Unix.cs‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternalJavaInterop.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ public Step_PrepareExternalJavaInterop ()
1212

1313
protected override async Task<bool> Execute (Context context)
1414
{
15-
// make prepare-core on Unix
16-
var result = await ExecuteOSSpecific (context);
17-
if (!result)
18-
return false;
19-
2015
string javaInteropDir = context.Properties.GetRequiredValue (KnownProperties.JavaInteropFullPath);
2116
var dotnetPath = context.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);
2217
var dotnetTool = Path.Combine (dotnetPath, "dotnet");

‎external/Java.Interop‎

‎tests/CodeBehind/BuildTests/CodeBehindBuildTests.NET.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0-android</TargetFramework>
3+
<TargetFramework>net6.0-android$(AndroidLatestStableApiLevel)</TargetFramework>
44
<RootNamespace>Xamarin.Android.Tests.CodeBehindBuildTests</RootNamespace>
55
<OutputType>Exe</OutputType>
66
<AndroidGenerateLayoutBindings>True</AndroidGenerateLayoutBindings>

‎tests/CodeBehind/CommonSampleLibrary/CommonSampleLibrary.NET.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0-android</TargetFramework>
3+
<TargetFramework>net6.0-android$(AndroidLatestStableApiLevel)</TargetFramework>
44
<RootNamespace>CommonSampleLibrary</RootNamespace>
55
<AssemblyName>CommonSampleLibrary</AssemblyName>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

‎tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\Configuration.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net6.0-android</TargetFramework>
6+
<TargetFramework>net6.0-android$(AndroidLatestStableApiLevel)</TargetFramework>
77
<RootNamespace>Java.Interop_Tests</RootNamespace>
88
<AssemblyName>Java.Interop-Tests</AssemblyName>
99
<OutputType>Library</OutputType>

‎tests/Mono.Android-Tests/Mono.Android-Test.Library/Mono.Android-Test.Library.NET.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" >
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-android</TargetFramework>
4+
<TargetFramework>net6.0-android$(AndroidLatestStableApiLevel)</TargetFramework>
55
<RootNamespace>Xamarin.Android.RuntimeTests</RootNamespace>
66
<OutputType>Library</OutputType>
77
<AppDesignerFolder>Properties</AppDesignerFolder>

0 commit comments

Comments
 (0)