Skip to content

Commit 34760e3

Browse files
jonpryorjonpryor
committed
Bump to xamarin/Java.Interop/main@cbd96668
Changes: dotnet/java-interop@7dc270d...cbd9666 * dotnet/java-interop@cbd96668: [Java.Interop] $(Version) depends on TargetFramework (dotnet#952) * dotnet/java-interop@e587cf6b: [build] Remove the `make prepare-core` targets (dotnet#951) * dotnet/java-interop@e02d8572: [build] Remove globalPackagesFolder override (dotnet#948)
1 parent f9892cc commit 34760e3

File tree

6 files changed

+39
-65
lines changed

6 files changed

+39
-65
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: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,35 @@
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="Java.Runtime.Environment.dll" />
117+
<JIUtilityFile Include="Java.Runtime.Environment.dll.config" Condition=" '$(HostOS)' != 'Windows' " />
118+
<JIUtilityFile Include="Java.Runtime.Environment.pdb" />
119+
<JIUtilityFile Include="Xamarin.Android.Tools.AnnotationSupport.dll" />
120+
<JIUtilityFile Include="Xamarin.Android.Tools.AnnotationSupport.pdb" />
121+
<JIUtilityFile Include="Xamarin.Android.Tools.ApiXmlAdjuster.dll" />
122+
<JIUtilityFile Include="Xamarin.Android.Tools.ApiXmlAdjuster.pdb" />
123+
<JIUtilityFile Include="Xamarin.Android.Tools.Bytecode.dll" />
124+
<JIUtilityFile Include="Xamarin.Android.Tools.Bytecode.pdb" />
125+
<JIUtilityFile Include="Xamarin.Android.Tools.JavadocImporter.dll" />
126+
<JIUtilityFile Include="Xamarin.Android.Tools.JavadocImporter.pdb" />
127+
<JIUtilityFile Include="Xamarin.SourceWriter.dll" />
128+
<JIUtilityFile Include="Xamarin.SourceWriter.pdb" />
129+
</ItemGroup>
101130
<ItemGroup>
102131
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\Mono.Android.Export.dll" />
103132
<_FrameworkFiles Include="$(FrameworkSrcDir)\$(FirstInstallerFrameworkVersion)\Mono.Android.Export.pdb" />
@@ -119,6 +148,7 @@
119148
<_FrameworkFilesWin Include="$(FrameworkSrcDir)\$(BclFrameworkVersion)\Xamarin.Android.NUnitLite.xml" />
120149
</ItemGroup>
121150
<ItemGroup>
151+
<_MSBuildFiles Include="@(JIUtilityFile->'$(MSBuildSrcDir)\%(Identity)')" />
122152
<_MSBuildFiles Include="$(MSBuildSrcDir)\android-support-multidex.jar" />
123153
<_MSBuildFiles Include="$(MSBuildSrcDir)\apksigner.jar" />
124154
<_MSBuildFiles Include="$(MSBuildSrcDir)\aprofutil.exe" ExcludeFromAndroidNETSdk="true" />
@@ -140,23 +170,7 @@
140170
<_MSBuildFiles Include="$(MSBuildSrcDir)\java-source-utils.jar" />
141171
<_MSBuildFiles Include="$(MSBuildSrcDir)\javadoc-to-mdoc.exe" ExcludeFromAndroidNETSdk="true" />
142172
<_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" />
145173
<_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" />
158-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.dll" />
159-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.pdb" />
160174
<_MSBuildFiles Include="$(MSBuildSrcDir)\Java.Runtime.Environment.dll.config" Condition=" '$(HostOS)' != 'Windows' " />
161175
<_MSBuildFiles Include="$(MSBuildSrcDir)\jcw-gen.exe" ExcludeFromAndroidNETSdk="true" />
162176
<_MSBuildFiles Include="$(MSBuildSrcDir)\jcw-gen.pdb" ExcludeFromAndroidNETSdk="true" />
@@ -281,21 +295,11 @@
281295
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Aidl.pdb" />
282296
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.AndroidSdk.dll" />
283297
<_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" />
292298
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Tools.Versions.props" />
293299
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.VisualBasic.targets" ExcludeFromAndroidNETSdk="true" />
294300
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Wear.targets" ExcludeFromAndroidNETSdk="true" />
295301
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Build.AsyncTask.dll" />
296302
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Build.AsyncTask.pdb" />
297-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.SourceWriter.dll" />
298-
<_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.SourceWriter.pdb" />
299303
<_MSBuildFiles Include="$(MSBuildSrcDir)\K4os.Compression.LZ4.dll" />
300304
<_MSBuildFiles Include="$(MSBuildSrcDir)\K4os.Hash.xxHash.dll" />
301305
<_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‎

0 commit comments

Comments
 (0)