From 394645a666ecbbec136ab3bcb6042a2bf896d9de Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Wed, 22 Jul 2020 16:45:45 -0500 Subject: [PATCH 1/5] Rebase --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index da5a9800306..9ba458b4717 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit da5a980030610c77cb9398fead4a7a0bced73e83 +Subproject commit 9ba458b4717d348ab61f1dfe886a44a1905f4e57 From d1562814539afada6018a7c9ef38e3ce476dfa55 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Wed, 22 Jul 2020 20:14:15 -0500 Subject: [PATCH 2/5] Add Xamarin.SourceWriter to installer. --- build-tools/installers/create-installers.targets | 2 ++ external/Java.Interop | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index e5abae9efd3..87bf350a40a 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -262,6 +262,8 @@ <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Wear.targets" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " /> <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Build.AsyncTask.dll" /> <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Build.AsyncTask.pdb" /> + <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.SourceWriter.dll" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " /> + <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.SourceWriter.pdb" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " /> <_MSBuildFiles Include="$(MSBuildSrcDir)\K4os.Compression.LZ4.dll" /> diff --git a/external/Java.Interop b/external/Java.Interop index 9ba458b4717..0b7df58ea00 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 9ba458b4717d348ab61f1dfe886a44a1905f4e57 +Subproject commit 0b7df58ea009cde2cadc3e2f3201b544365ec4e8 From f26adef8af84980bb2381a6c961128c9a6d03262 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Tue, 11 Aug 2020 08:57:28 -0500 Subject: [PATCH 3/5] Add to Xamarin.Android.sln. --- Xamarin.Android.sln | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Xamarin.Android.sln b/Xamarin.Android.sln index 28b289c8b71..e2cb2288644 100644 --- a/Xamarin.Android.sln +++ b/Xamarin.Android.sln @@ -138,6 +138,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Android.Sdk.ILLin EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Generator", "external\Java.Interop\src\Java.Interop.Tools.Generator\Java.Interop.Tools.Generator.csproj", "{2CE4CD4B-B7B7-4EAE-A9BE-2699824D6096}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.SourceWriter", "external\Java.Interop\src\Xamarin.SourceWriter\Xamarin.SourceWriter.csproj", "{86A8DEFE-7ABB-4097-9389-C249581E243D}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems*{3f1f2f50-af1a-4a5a-bedb-193372f068d7}*SharedItemsImports = 4 @@ -377,6 +379,10 @@ Global {2CE4CD4B-B7B7-4EAE-A9BE-2699824D6096}.Debug|AnyCPU.Build.0 = Debug|Any CPU {2CE4CD4B-B7B7-4EAE-A9BE-2699824D6096}.Release|AnyCPU.ActiveCfg = Release|Any CPU {2CE4CD4B-B7B7-4EAE-A9BE-2699824D6096}.Release|AnyCPU.Build.0 = Release|Any CPU + {86A8DEFE-7ABB-4097-9389-C249581E243D}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU + {86A8DEFE-7ABB-4097-9389-C249581E243D}.Debug|AnyCPU.Build.0 = Debug|Any CPU + {86A8DEFE-7ABB-4097-9389-C249581E243D}.Release|AnyCPU.ActiveCfg = Release|Any CPU + {86A8DEFE-7ABB-4097-9389-C249581E243D}.Release|AnyCPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -440,6 +446,7 @@ Global {D28957BF-5E66-4D60-B528-22820C60AC82} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62} {071D9096-65BB-4359-822E-09788439F210} = {04E3E11E-B47D-4599-8AFC-50515A95E715} {2CE4CD4B-B7B7-4EAE-A9BE-2699824D6096} = {04E3E11E-B47D-4599-8AFC-50515A95E715} + {86A8DEFE-7ABB-4097-9389-C249581E243D} = {04E3E11E-B47D-4599-8AFC-50515A95E715} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {53A1F287-EFB2-4D97-A4BB-4A5E145613F6} From a64236bb5011c9b427c061ac5f23ad4a8ee13deb Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Tue, 11 Aug 2020 10:26:58 -0500 Subject: [PATCH 4/5] Update JdkInfo to have $(JavaSdkDirectory). --- .../xaprepare/xaprepare/Resources/JdkInfo.Windows.props.in | 1 + .../xaprepare/xaprepare/Steps/Step_GenerateFiles.Windows.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/build-tools/xaprepare/xaprepare/Resources/JdkInfo.Windows.props.in b/build-tools/xaprepare/xaprepare/Resources/JdkInfo.Windows.props.in index a25069e5353..7514a8e46be 100644 --- a/build-tools/xaprepare/xaprepare/Resources/JdkInfo.Windows.props.in +++ b/build-tools/xaprepare/xaprepare/Resources/JdkInfo.Windows.props.in @@ -15,5 +15,6 @@ @java@ @javac@ @jar@ + @javahome@ diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Windows.cs b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Windows.cs index 4b7ae71929f..43a7bcc9456 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Windows.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Windows.cs @@ -23,6 +23,7 @@ partial void AddOSSpecificSteps (Context context, List steps) { "@javac@", context.OS.JavaCPath }, { "@java@", context.OS.JavaPath }, { "@jar@", context.OS.JarPath }, + { "@javahome@", context.OS.JavaHome }, }; var step = new GeneratedPlaceholdersFile ( From a371d6ed144638ae4d821baed0a0e636fb12ca82 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Tue, 11 Aug 2020 11:39:54 -0500 Subject: [PATCH 5/5] Always include Xamarin.SourceWriter in installers. --- build-tools/installers/create-installers.targets | 4 ++-- external/Java.Interop | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index 87bf350a40a..330c8708874 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -262,8 +262,8 @@ <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Android.Wear.targets" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " /> <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Build.AsyncTask.dll" /> <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.Build.AsyncTask.pdb" /> - <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.SourceWriter.dll" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " /> - <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.SourceWriter.pdb" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " /> + <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.SourceWriter.dll" /> + <_MSBuildFiles Include="$(MSBuildSrcDir)\Xamarin.SourceWriter.pdb" /> <_MSBuildFiles Include="$(MSBuildSrcDir)\K4os.Compression.LZ4.dll" /> diff --git a/external/Java.Interop b/external/Java.Interop index 0b7df58ea00..6bbb00aa3fd 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 0b7df58ea009cde2cadc3e2f3201b544365ec4e8 +Subproject commit 6bbb00aa3fdfdb61f3b5167b6bb025f62a54ccdf