From ad9a32da081226c742872f874d904b1cb8a28bcb Mon Sep 17 00:00:00 2001 From: Redth Date: Sun, 3 Jun 2018 11:27:21 -0400 Subject: [PATCH 01/13] Use XAJavaInterop1 Codegen target --- animated-vector-drawable/source/Animated-Vector-Drawable.csproj | 1 + appcompat-v7/source/V7-AppCompat.csproj | 1 + arch-core/common/source/Arch.Core.Common.csproj | 1 + arch-core/runtime/source/Arch.Core.Runtime.csproj | 1 + arch-lifecycle/common/source/Arch.Lifecycle.Common.csproj | 1 + .../extensions/source/Arch.Lifecycle.Extensions.csproj | 1 + arch-lifecycle/runtime/source/Arch.Lifecycle.Runtime.csproj | 1 + cardview-v7/source/V7-CardView.csproj | 1 + constraint-layout/source/ConstraintLayout.csproj | 1 + customtabs/source/CustomTabs.csproj | 1 + design/source/Design.csproj | 1 + exifinterface/source/Exif.csproj | 1 + gridlayout-v7/source/V7-GridLayout.csproj | 1 + leanback-v17/source/V17-Leanback.csproj | 1 + mediarouter-v7/source/V7-MediaRouter.csproj | 1 + palette-v7/source/V7-Palette.csproj | 1 + percent/source/Percent.csproj | 1 + preference-leanback-v17/source/V17-Preference-Leanback.csproj | 1 + preference-v14/source/V14-Preference.csproj | 1 + preference-v7/source/V7-Preference.csproj | 1 + recommendation/source/Recommendation.csproj | 1 + recyclerview-v7/source/V7-RecyclerView.csproj | 1 + renderscript-v8/source/V8-RenderScript.csproj | 1 + support-annotations/source/Annotations.csproj | 1 + support-compat/source/Compat.csproj | 1 + support-content/source/Content.csproj | 1 + support-core-ui/source/Core-UI.csproj | 1 + support-core-utils/source/Core-Utils.csproj | 1 + support-dynamic-animation/source/DynamicAnimation.csproj | 1 + support-emoji-appcompat/source/Emoji-AppCompat.csproj | 1 + support-emoji-bundled/source/Emoji-Bundled.csproj | 1 + support-emoji/source/Emoji.csproj | 1 + support-fragment/source/Fragment.csproj | 1 + support-media-compat/source/Media-Compat.csproj | 1 + support-tv-provider/source/TV-Provider.csproj | 1 + support-v13/source/V13.csproj | 1 + support-v4/source/V4.csproj | 1 + support-vector-drawable/source/Vector-Drawable.csproj | 1 + transition/source/Transition.csproj | 1 + wear/source/Wear.csproj | 1 + 40 files changed, 40 insertions(+) diff --git a/animated-vector-drawable/source/Animated-Vector-Drawable.csproj b/animated-vector-drawable/source/Animated-Vector-Drawable.csproj index 209a927..359759a 100644 --- a/animated-vector-drawable/source/Animated-Vector-Drawable.csproj +++ b/animated-vector-drawable/source/Animated-Vector-Drawable.csproj @@ -19,6 +19,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/appcompat-v7/source/V7-AppCompat.csproj b/appcompat-v7/source/V7-AppCompat.csproj index 2d2cff1..e086a67 100644 --- a/appcompat-v7/source/V7-AppCompat.csproj +++ b/appcompat-v7/source/V7-AppCompat.csproj @@ -19,6 +19,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/arch-core/common/source/Arch.Core.Common.csproj b/arch-core/common/source/Arch.Core.Common.csproj index be85961..8870bb3 100644 --- a/arch-core/common/source/Arch.Core.Common.csproj +++ b/arch-core/common/source/Arch.Core.Common.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/arch-core/runtime/source/Arch.Core.Runtime.csproj b/arch-core/runtime/source/Arch.Core.Runtime.csproj index d4b8726..13a9f9e 100644 --- a/arch-core/runtime/source/Arch.Core.Runtime.csproj +++ b/arch-core/runtime/source/Arch.Core.Runtime.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/arch-lifecycle/common/source/Arch.Lifecycle.Common.csproj b/arch-lifecycle/common/source/Arch.Lifecycle.Common.csproj index dc7f432..850501e 100644 --- a/arch-lifecycle/common/source/Arch.Lifecycle.Common.csproj +++ b/arch-lifecycle/common/source/Arch.Lifecycle.Common.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/arch-lifecycle/extensions/source/Arch.Lifecycle.Extensions.csproj b/arch-lifecycle/extensions/source/Arch.Lifecycle.Extensions.csproj index b1d99bb..1816286 100644 --- a/arch-lifecycle/extensions/source/Arch.Lifecycle.Extensions.csproj +++ b/arch-lifecycle/extensions/source/Arch.Lifecycle.Extensions.csproj @@ -13,6 +13,7 @@ Assets true class-parse + XAJavaInterop1 true diff --git a/arch-lifecycle/runtime/source/Arch.Lifecycle.Runtime.csproj b/arch-lifecycle/runtime/source/Arch.Lifecycle.Runtime.csproj index 3489284..77e0438 100644 --- a/arch-lifecycle/runtime/source/Arch.Lifecycle.Runtime.csproj +++ b/arch-lifecycle/runtime/source/Arch.Lifecycle.Runtime.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/cardview-v7/source/V7-CardView.csproj b/cardview-v7/source/V7-CardView.csproj index 0c8165f..f9e49af 100644 --- a/cardview-v7/source/V7-CardView.csproj +++ b/cardview-v7/source/V7-CardView.csproj @@ -18,6 +18,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/constraint-layout/source/ConstraintLayout.csproj b/constraint-layout/source/ConstraintLayout.csproj index f99cf4c..d8508ae 100644 --- a/constraint-layout/source/ConstraintLayout.csproj +++ b/constraint-layout/source/ConstraintLayout.csproj @@ -13,6 +13,7 @@ Assets false class-parse + XAJavaInterop1 true diff --git a/customtabs/source/CustomTabs.csproj b/customtabs/source/CustomTabs.csproj index b6a5814..81ae4e8 100644 --- a/customtabs/source/CustomTabs.csproj +++ b/customtabs/source/CustomTabs.csproj @@ -17,6 +17,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 true diff --git a/design/source/Design.csproj b/design/source/Design.csproj index 7756a4f..bb7a900 100644 --- a/design/source/Design.csproj +++ b/design/source/Design.csproj @@ -17,6 +17,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 true diff --git a/exifinterface/source/Exif.csproj b/exifinterface/source/Exif.csproj index ed64cc3..86f5421 100644 --- a/exifinterface/source/Exif.csproj +++ b/exifinterface/source/Exif.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 true diff --git a/gridlayout-v7/source/V7-GridLayout.csproj b/gridlayout-v7/source/V7-GridLayout.csproj index 4e374af..779e52d 100644 --- a/gridlayout-v7/source/V7-GridLayout.csproj +++ b/gridlayout-v7/source/V7-GridLayout.csproj @@ -19,6 +19,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/leanback-v17/source/V17-Leanback.csproj b/leanback-v17/source/V17-Leanback.csproj index 6f36b32..cab615d 100644 --- a/leanback-v17/source/V17-Leanback.csproj +++ b/leanback-v17/source/V17-Leanback.csproj @@ -18,6 +18,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/mediarouter-v7/source/V7-MediaRouter.csproj b/mediarouter-v7/source/V7-MediaRouter.csproj index cefc267..f710fdd 100644 --- a/mediarouter-v7/source/V7-MediaRouter.csproj +++ b/mediarouter-v7/source/V7-MediaRouter.csproj @@ -19,6 +19,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/palette-v7/source/V7-Palette.csproj b/palette-v7/source/V7-Palette.csproj index 2175052..67a0ab2 100644 --- a/palette-v7/source/V7-Palette.csproj +++ b/palette-v7/source/V7-Palette.csproj @@ -19,6 +19,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/percent/source/Percent.csproj b/percent/source/Percent.csproj index 5bbe92d..e7f4702 100644 --- a/percent/source/Percent.csproj +++ b/percent/source/Percent.csproj @@ -19,6 +19,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/preference-leanback-v17/source/V17-Preference-Leanback.csproj b/preference-leanback-v17/source/V17-Preference-Leanback.csproj index 3e461d2..2098ae3 100644 --- a/preference-leanback-v17/source/V17-Preference-Leanback.csproj +++ b/preference-leanback-v17/source/V17-Preference-Leanback.csproj @@ -19,6 +19,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/preference-v14/source/V14-Preference.csproj b/preference-v14/source/V14-Preference.csproj index 9a41c77..cb388f4 100644 --- a/preference-v14/source/V14-Preference.csproj +++ b/preference-v14/source/V14-Preference.csproj @@ -20,6 +20,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/preference-v7/source/V7-Preference.csproj b/preference-v7/source/V7-Preference.csproj index 1780f60..50ed0e3 100644 --- a/preference-v7/source/V7-Preference.csproj +++ b/preference-v7/source/V7-Preference.csproj @@ -20,6 +20,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/recommendation/source/Recommendation.csproj b/recommendation/source/Recommendation.csproj index f87bbcf..ab5be4a 100644 --- a/recommendation/source/Recommendation.csproj +++ b/recommendation/source/Recommendation.csproj @@ -19,6 +19,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/recyclerview-v7/source/V7-RecyclerView.csproj b/recyclerview-v7/source/V7-RecyclerView.csproj index cbf4306..3645213 100644 --- a/recyclerview-v7/source/V7-RecyclerView.csproj +++ b/recyclerview-v7/source/V7-RecyclerView.csproj @@ -19,6 +19,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/renderscript-v8/source/V8-RenderScript.csproj b/renderscript-v8/source/V8-RenderScript.csproj index a8dd06c..b0859d8 100644 --- a/renderscript-v8/source/V8-RenderScript.csproj +++ b/renderscript-v8/source/V8-RenderScript.csproj @@ -18,6 +18,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/support-annotations/source/Annotations.csproj b/support-annotations/source/Annotations.csproj index ee104f9..b706272 100644 --- a/support-annotations/source/Annotations.csproj +++ b/support-annotations/source/Annotations.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-compat/source/Compat.csproj b/support-compat/source/Compat.csproj index 036e5f9..f6fdbff 100644 --- a/support-compat/source/Compat.csproj +++ b/support-compat/source/Compat.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-content/source/Content.csproj b/support-content/source/Content.csproj index 94888aa..4645c55 100644 --- a/support-content/source/Content.csproj +++ b/support-content/source/Content.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-core-ui/source/Core-UI.csproj b/support-core-ui/source/Core-UI.csproj index 58f0e75..c027201 100644 --- a/support-core-ui/source/Core-UI.csproj +++ b/support-core-ui/source/Core-UI.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-core-utils/source/Core-Utils.csproj b/support-core-utils/source/Core-Utils.csproj index 81b78ed..301ca9d 100644 --- a/support-core-utils/source/Core-Utils.csproj +++ b/support-core-utils/source/Core-Utils.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-dynamic-animation/source/DynamicAnimation.csproj b/support-dynamic-animation/source/DynamicAnimation.csproj index b5f85c8..cf643ad 100644 --- a/support-dynamic-animation/source/DynamicAnimation.csproj +++ b/support-dynamic-animation/source/DynamicAnimation.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-emoji-appcompat/source/Emoji-AppCompat.csproj b/support-emoji-appcompat/source/Emoji-AppCompat.csproj index 95ddf44..bc84ab8 100644 --- a/support-emoji-appcompat/source/Emoji-AppCompat.csproj +++ b/support-emoji-appcompat/source/Emoji-AppCompat.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-emoji-bundled/source/Emoji-Bundled.csproj b/support-emoji-bundled/source/Emoji-Bundled.csproj index 7164e4b..2872da6 100644 --- a/support-emoji-bundled/source/Emoji-Bundled.csproj +++ b/support-emoji-bundled/source/Emoji-Bundled.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-emoji/source/Emoji.csproj b/support-emoji/source/Emoji.csproj index b438dbc..0e6dae5 100644 --- a/support-emoji/source/Emoji.csproj +++ b/support-emoji/source/Emoji.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-fragment/source/Fragment.csproj b/support-fragment/source/Fragment.csproj index 698e3a7..7eb1fa0 100644 --- a/support-fragment/source/Fragment.csproj +++ b/support-fragment/source/Fragment.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-media-compat/source/Media-Compat.csproj b/support-media-compat/source/Media-Compat.csproj index 47dcf8b..1239b3b 100644 --- a/support-media-compat/source/Media-Compat.csproj +++ b/support-media-compat/source/Media-Compat.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-tv-provider/source/TV-Provider.csproj b/support-tv-provider/source/TV-Provider.csproj index 7246cea..ed3f99c 100644 --- a/support-tv-provider/source/TV-Provider.csproj +++ b/support-tv-provider/source/TV-Provider.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 true diff --git a/support-v13/source/V13.csproj b/support-v13/source/V13.csproj index ea551eb..eac9bcd 100644 --- a/support-v13/source/V13.csproj +++ b/support-v13/source/V13.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-v4/source/V4.csproj b/support-v4/source/V4.csproj index 3578871..20a5b62 100644 --- a/support-v4/source/V4.csproj +++ b/support-v4/source/V4.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 8.0.30703 2.0 diff --git a/support-vector-drawable/source/Vector-Drawable.csproj b/support-vector-drawable/source/Vector-Drawable.csproj index 6b73cb2..c323884 100644 --- a/support-vector-drawable/source/Vector-Drawable.csproj +++ b/support-vector-drawable/source/Vector-Drawable.csproj @@ -19,6 +19,7 @@ 8.0.30703 2.0 class-parse + XAJavaInterop1 true diff --git a/transition/source/Transition.csproj b/transition/source/Transition.csproj index fb2f030..b1caac6 100644 --- a/transition/source/Transition.csproj +++ b/transition/source/Transition.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 true diff --git a/wear/source/Wear.csproj b/wear/source/Wear.csproj index 0c8ab1a..c7028d8 100644 --- a/wear/source/Wear.csproj +++ b/wear/source/Wear.csproj @@ -16,6 +16,7 @@ true publickey.snk --> class-parse + XAJavaInterop1 true From 947513e062e92e0c1f8591aeadeffb0caa74c450 Mon Sep 17 00:00:00 2001 From: Redth Date: Sun, 3 Jun 2018 11:27:26 -0400 Subject: [PATCH 02/13] Bump nuget versions --- build.cake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.cake b/build.cake index 92deb38..7dfd6d5 100644 --- a/build.cake +++ b/build.cake @@ -43,7 +43,7 @@ var BUILD_CONFIG = Argument ("config", "Release"); var NUGET_PRE = ""; -var NUGET_VERSION = "27.0.2" + NUGET_PRE; +var NUGET_VERSION = "27.0.2.1" + NUGET_PRE; var COMPONENT_VERSION = "27.0.2.0"; var AAR_VERSION = "27.0.2"; @@ -53,11 +53,11 @@ var ARCH_LIFECYCLE_COMMON_AAR_VERSION = "1.0.3"; var ARCH_LIFECYCLE_RUNTIME_AAR_VERSION = "1.0.3"; var ARCH_LIFECYCLE_EXTENSIONS_AAR_VERSION = "1.0.0"; -var ARCH_CORE_COMMON_NUGET_VERSION = "1.0.0" + NUGET_PRE; -var ARCH_CORE_RUNTIME_NUGET_VERSION = "1.0.0" + NUGET_PRE; -var ARCH_LIFECYCLE_COMMON_NUGET_VERSION = "1.0.3" + NUGET_PRE; -var ARCH_LIFECYCLE_RUNTIME_NUGET_VERSION = "1.0.3" + NUGET_PRE; -var ARCH_LIFECYCLE_EXTENSIONS_NUGET_VERSION = "1.0.0" + NUGET_PRE; +var ARCH_CORE_COMMON_NUGET_VERSION = "1.0.0.1" + NUGET_PRE; +var ARCH_CORE_RUNTIME_NUGET_VERSION = "1.0.0.1" + NUGET_PRE; +var ARCH_LIFECYCLE_COMMON_NUGET_VERSION = "1.0.3.1" + NUGET_PRE; +var ARCH_LIFECYCLE_RUNTIME_NUGET_VERSION = "1.0.3.1" + NUGET_PRE; +var ARCH_LIFECYCLE_EXTENSIONS_NUGET_VERSION = "1.0.0.1" + NUGET_PRE; var DOC_VERSION = "2017-12-18"; From 653ad51a7e9f3c83175084f472d0a19af072b587 Mon Sep 17 00:00:00 2001 From: Redth Date: Sun, 3 Jun 2018 12:58:46 -0400 Subject: [PATCH 03/13] Use local cake.packages.config --- build.sh | 15 ++++++++++----- cake.packages.config | 4 ++++ 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 cake.packages.config diff --git a/build.sh b/build.sh index b9e1252..ff05e89 100755 --- a/build.sh +++ b/build.sh @@ -47,11 +47,16 @@ fi # Make sure that packages.config exist. if [ ! -f "$TOOLS_DIR/packages.config" ]; then - echo "Downloading packages.config..." - curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages - if [ $? -ne 0 ]; then - echo "An error occurred while downloading packages.config." - exit 1 + if [ ! -f "$SCRIPT_DIR/cake.packages.config" ]; then + echo "Downloading packages.config..." + curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages + if [ $? -ne 0 ]; then + echo "An error occurred while downloading packages.config." + exit 1 + fi + else + echo "using local cake.packages.config..." + cp "$SCRIPT_DIR/cake.packages.config" "$TOOLS_DIR/packages.config" fi fi diff --git a/cake.packages.config b/cake.packages.config new file mode 100644 index 0000000..ef65880 --- /dev/null +++ b/cake.packages.config @@ -0,0 +1,4 @@ + + + + From a7a641e89130d54d8e861339d404c812fbdbbbf7 Mon Sep 17 00:00:00 2001 From: Redth Date: Mon, 4 Jun 2018 09:57:14 -0700 Subject: [PATCH 04/13] Update some cake dependencies/addins --- build.cake | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/build.cake b/build.cake index 7dfd6d5..a5cc008 100644 --- a/build.cake +++ b/build.cake @@ -1,34 +1,26 @@ // Tools needed by cake addins #tool nuget:?package=XamarinComponent&version=1.1.0.49 #tool nuget:?package=ILRepack&version=2.0.13 -#tool nuget:?package=Cake.MonoApiTools&version=1.0.10 +#tool nuget:?package=Cake.MonoApiTools&version=2.0.0 #tool nuget:?package=Microsoft.DotNet.BuildTools.GenAPI&version=1.0.0-beta-00081 #tool nuget:?package=NUnit.Runners&version=2.6.4 #tool nuget:?package=Paket -#tool nuget:?package=VSWhere - -// Dependencies of Cake Addins - this should be removed once -// Cake 0.23 is out -#addin nuget:?package=SharpZipLib&version=0.86.0 -#addin nuget:?package=Newtonsoft.Json&version=9.0.1 -#addin nuget:?package=semver&version=2.0.4 -#addin nuget:?package=YamlDotNet&version=4.2.1 -#addin nuget:?package=NuGet.Core&version=2.14.0 // Cake Addins -#addin nuget:?package=Cake.FileHelpers&version=2.0.0 -#addin nuget:?package=Cake.Json&version=2.0.28 -#addin nuget:?package=Cake.Yaml&version=2.0.0 -#addin nuget:?package=Cake.Xamarin&version=2.0.1 -#addin nuget:?package=Cake.XCode&version=3.0.0 -#addin nuget:?package=Cake.Xamarin.Build&version=3.0.6 -#addin nuget:?package=Cake.Compression&version=0.1.4 -#addin nuget:?package=Cake.Android.SdkManager&version=2.0.1 -#addin nuget:?package=Cake.Android.Adb&version=2.0.4 - -// Not yet cake 0.22+ compatible (requires --settings_skipverification=true) -#addin nuget:?package=Cake.MonoApiTools&version=1.0.10 -#addin nuget:?package=Cake.Xamarin.Binding.Util&version=1.0.2 +#addin nuget:?package=Cake.FileHelpers&version=3.0.0 +#addin nuget:?package=Cake.Json&version=3.0.1 +#addin nuget:?package=Newtonsoft.Json&version=9.0.1 +#addin nuget:?package=Cake.Yaml&version=2.1.0 +#addin nuget:?package=YamlDotNet&version=4.2.1 +#addin nuget:?package=Cake.Xamarin&version=3.0.0 +#addin nuget:?package=Cake.XCode&version=4.0.0 +#addin nuget:?package=Cake.Xamarin.Build&version=4.0.0 +#addin nuget:?package=SharpZipLib&version=0.86.0 +#addin nuget:?package=Cake.Compression&version=0.1.6 +#addin nuget:?package=Cake.Android.SdkManager&version=3.0.0 +#addin nuget:?package=Cake.Android.Adb&version=3.0.0 +#addin nuget:?package=Cake.MonoApiTools&version=2.0.0 +#addin nuget:?package=Cake.Xamarin.Binding.Util&version=2.0.0 // From Cake.Xamarin.Build, dumps out versions of things LogSystemInfo (); From 9bdbd4b98bf2ca8ac7eef9d7836fa43e6419db29 Mon Sep 17 00:00:00 2001 From: Redth Date: Mon, 4 Jun 2018 09:57:34 -0700 Subject: [PATCH 05/13] Disable old binding workarounds --- .../source/Additions/Additions.cs | 146 +++++++++--------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/support-dynamic-animation/source/Additions/Additions.cs b/support-dynamic-animation/source/Additions/Additions.cs index 37bf854..5ed9095 100644 --- a/support-dynamic-animation/source/Additions/Additions.cs +++ b/support-dynamic-animation/source/Additions/Additions.cs @@ -1,86 +1,86 @@ -using System; -using Android.Runtime; +// using System; +// using Android.Runtime; -namespace Android.Support.Animation -{ - internal static class __JniCtorUtil - { - internal static unsafe void CtorImpl(Java.Lang.Object sender, Type classType, IntPtr classRef, IntPtr methodId, string jniSignature, JValue* args, Action setHandle) - { - if (sender.Handle != IntPtr.Zero) - return; +// namespace Android.Support.Animation +// { +// internal static class __JniCtorUtil +// { +// internal static unsafe void CtorImpl(Java.Lang.Object sender, Type classType, IntPtr classRef, IntPtr methodId, string jniSignature, JValue* args, Action setHandle) +// { +// if (sender.Handle != IntPtr.Zero) +// return; - try - { - if (((object)sender).GetType() != classType) - { - setHandle( - global::Android.Runtime.JNIEnv.StartCreateInstance(((object)sender).GetType(), jniSignature, args), - JniHandleOwnership.TransferLocalRef); - global::Android.Runtime.JNIEnv.FinishCreateInstance(((global::Java.Lang.Object)sender).Handle, jniSignature, args); - return; - } +// try +// { +// if (((object)sender).GetType() != classType) +// { +// setHandle( +// global::Android.Runtime.JNIEnv.StartCreateInstance(((object)sender).GetType(), jniSignature, args), +// JniHandleOwnership.TransferLocalRef); +// global::Android.Runtime.JNIEnv.FinishCreateInstance(((global::Java.Lang.Object)sender).Handle, jniSignature, args); +// return; +// } - if (methodId == IntPtr.Zero) - methodId = JNIEnv.GetMethodID(classRef, "", jniSignature); - setHandle( - global::Android.Runtime.JNIEnv.StartCreateInstance(classRef, methodId, args), - JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance(((global::Java.Lang.Object)sender).Handle, classRef, methodId, args); - } - finally - { - } - } - } +// if (methodId == IntPtr.Zero) +// methodId = JNIEnv.GetMethodID(classRef, "", jniSignature); +// setHandle( +// global::Android.Runtime.JNIEnv.StartCreateInstance(classRef, methodId, args), +// JniHandleOwnership.TransferLocalRef); +// JNIEnv.FinishCreateInstance(((global::Java.Lang.Object)sender).Handle, classRef, methodId, args); +// } +// finally +// { +// } +// } +// } - public partial class SpringAnimation - { - private const string CTOR_1 = "(Ljava/lang/Object;Landroid/support/animation/FloatPropertyCompat;)V"; - static IntPtr id_ctor_1; +// public partial class SpringAnimation +// { +// private const string CTOR_1 = "(Ljava/lang/Object;Landroid/support/animation/FloatPropertyCompat;)V"; +// static IntPtr id_ctor_1; - [Register(".ctor", CTOR_1, "")] - public unsafe SpringAnimation(global::Java.Lang.Object @object, FloatPropertyCompat @property) - : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer) - { - JValue* __args = stackalloc JValue[2]; - __args[0] = new JValue(@object); - __args[1] = new JValue(@property); +// [Register(".ctor", CTOR_1, "")] +// public unsafe SpringAnimation(global::Java.Lang.Object @object, FloatPropertyCompat @property) +// : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer) +// { +// JValue* __args = stackalloc JValue[2]; +// __args[0] = new JValue(@object); +// __args[1] = new JValue(@property); - __JniCtorUtil.CtorImpl(this, typeof(SpringAnimation), class_ref, id_ctor_1, CTOR_1, __args, SetHandle); - } +// __JniCtorUtil.CtorImpl(this, typeof(SpringAnimation), class_ref, id_ctor_1, CTOR_1, __args, SetHandle); +// } - private const string JNI_CTOR_2 = "(Ljava/lang/Object;Landroid/support/animation/FloatPropertyCompat;F)V"; - static IntPtr id_ctor_2; +// private const string JNI_CTOR_2 = "(Ljava/lang/Object;Landroid/support/animation/FloatPropertyCompat;F)V"; +// static IntPtr id_ctor_2; - [Register(".ctor", JNI_CTOR_2, "")] - public unsafe SpringAnimation(global::Java.Lang.Object @object, FloatPropertyCompat @property, float finalPosition) - : base(IntPtr.Zero, JniHandleOwnership.DoNotTransfer) - { - JValue* __args = stackalloc JValue[3]; - __args[0] = new JValue(@object); - __args[1] = new JValue(@property); - __args[2] = new JValue(finalPosition); +// [Register(".ctor", JNI_CTOR_2, "")] +// public unsafe SpringAnimation(global::Java.Lang.Object @object, FloatPropertyCompat @property, float finalPosition) +// : base(IntPtr.Zero, JniHandleOwnership.DoNotTransfer) +// { +// JValue* __args = stackalloc JValue[3]; +// __args[0] = new JValue(@object); +// __args[1] = new JValue(@property); +// __args[2] = new JValue(finalPosition); - __JniCtorUtil.CtorImpl(this, typeof(SpringAnimation), class_ref, id_ctor_2, JNI_CTOR_2, __args, SetHandle); - } - } +// __JniCtorUtil.CtorImpl(this, typeof(SpringAnimation), class_ref, id_ctor_2, JNI_CTOR_2, __args, SetHandle); +// } +// } - public partial class FlingAnimation - { - private const string JNI_CTOR_1 = "(Ljava/lang/Object;Landroid/support/animation/FloatPropertyCompat;)V"; - static IntPtr id_ctor_1; +// public partial class FlingAnimation +// { +// private const string JNI_CTOR_1 = "(Ljava/lang/Object;Landroid/support/animation/FloatPropertyCompat;)V"; +// static IntPtr id_ctor_1; - [Register(".ctor", JNI_CTOR_1, "")] - public unsafe FlingAnimation(global::Java.Lang.Object @object, FloatPropertyCompat @property) - : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer) - { - JValue* __args = stackalloc JValue[2]; - __args[0] = new JValue(@object); - __args[1] = new JValue(@property); +// [Register(".ctor", JNI_CTOR_1, "")] +// public unsafe FlingAnimation(global::Java.Lang.Object @object, FloatPropertyCompat @property) +// : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer) +// { +// JValue* __args = stackalloc JValue[2]; +// __args[0] = new JValue(@object); +// __args[1] = new JValue(@property); - __JniCtorUtil.CtorImpl(this, typeof(FlingAnimation), class_ref, id_ctor_1, JNI_CTOR_1, __args, SetHandle); - } - } -} +// __JniCtorUtil.CtorImpl(this, typeof(FlingAnimation), class_ref, id_ctor_1, JNI_CTOR_1, __args, SetHandle); +// } +// } +// } From 2957fff62cba4813b55b8a2011205342850368b4 Mon Sep 17 00:00:00 2001 From: Redth Date: Mon, 4 Jun 2018 09:59:04 -0700 Subject: [PATCH 06/13] Diff against 27.0.2 --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index a5cc008..0b82a85 100644 --- a/build.cake +++ b/build.cake @@ -68,7 +68,7 @@ var REFERENCE_DOCS_URL = "https://developer.android.com/reference/"; var REFERENCE_DOCS_PACKAGELIST_URL = REFERENCE_DOCS_URL + "android/support/package-list"; // We grab the previous release's api-info.xml to use as a comparison for this build's generated info to make an api-diff -var BASE_API_INFO_URL = EnvironmentVariable("MONO_API_INFO_XML_URL") ?? "https://github.com/xamarin/AndroidSupportComponents/releases/download/26.1.0/api-info.xml"; +var BASE_API_INFO_URL = EnvironmentVariable("MONO_API_INFO_XML_URL") ?? "https://github.com/xamarin/AndroidSupportComponents/releases/download/27.0.2/api-info.xml"; var CPU_COUNT = 1; var USE_MSBUILD_ON_MAC = true; From 53ae09f6fca42f6188468e835affb93e16f59830 Mon Sep 17 00:00:00 2001 From: Redth Date: Mon, 4 Jun 2018 12:58:33 -0700 Subject: [PATCH 07/13] Fix nuspec dep reference version placeholder --- support-compat/nuget/template.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support-compat/nuget/template.nuspec b/support-compat/nuget/template.nuspec index 6f5b02d..75c43c8 100644 --- a/support-compat/nuget/template.nuspec +++ b/support-compat/nuget/template.nuspec @@ -15,7 +15,7 @@ - + From 8c690f3158c14e45435275a9bb41d76bf24af12a Mon Sep 17 00:00:00 2001 From: Redth Date: Mon, 11 Jun 2018 17:01:18 -0400 Subject: [PATCH 08/13] Added `AndroidFragmentType` msbuild property The upcoming code behind generation feature requires knowing the type of `Fragment` to use in some cases. By default it uses `Android.App.Fragment`, but if the user installs the support fragment package, we want to default to use `Android.Support.V4.App.Fragment` instead. This inclusion of a msbuild property should override the default and use the support library version instead. --- support-fragment/nuget/merge.targets | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 support-fragment/nuget/merge.targets diff --git a/support-fragment/nuget/merge.targets b/support-fragment/nuget/merge.targets new file mode 100644 index 0000000..6d66bb8 --- /dev/null +++ b/support-fragment/nuget/merge.targets @@ -0,0 +1,6 @@ + + + + Android.Support.V4.App.Fragment + + From d4b66df131e66c547fe7e699f7c1bee2e791a0c0 Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 3 Jul 2018 11:46:01 -0400 Subject: [PATCH 09/13] Docs are no longer downloaded, Metadata is cached --- build.cake | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/build.cake b/build.cake index b23f081..fc0ab4c 100644 --- a/build.cake +++ b/build.cake @@ -64,8 +64,6 @@ var MAVEN_REPO_URL = "https://dl.google.com/dl/android/maven2/"; var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r27-macosx.zip"; var ANDROID_SDK_VERSION = IsRunningOnWindows () ? "v8.0" : "android-26"; var RENDERSCRIPT_FOLDER = "android-8.1.0"; -var REFERENCE_DOCS_URL = "https://developer.android.com/reference/"; -var REFERENCE_DOCS_PACKAGELIST_URL = REFERENCE_DOCS_URL + "android/support/package-list"; // We grab the previous release's api-info.xml to use as a comparison for this build's generated info to make an api-diff var BASE_API_INFO_URL = EnvironmentVariable("MONO_API_INFO_XML_URL") ?? "https://github.com/xamarin/AndroidSupportComponents/releases/download/27.0.2/api-info.xml"; @@ -604,36 +602,7 @@ Task ("buildtasks") Task ("droiddocs") .Does (() => { - EnsureDirectoryExists("./output"); - - var compressedDocsFile = "./output/docs-" + DOC_VERSION + ".zip"; - - if (!FileExists(compressedDocsFile)) { - if (IsRunningOnWindows ()) - StartProcess ("util/droiddocs.exe", "scrape --out ./docs --url " + REFERENCE_DOCS_URL + " --package-list-source " + REFERENCE_DOCS_PACKAGELIST_URL + " --package-filter \"android.support\""); - else - StartProcess ("mono", "util/droiddocs.exe scrape --out ./docs --url " + REFERENCE_DOCS_URL + " --package-list-source " + REFERENCE_DOCS_PACKAGELIST_URL + " --package-filter \"android.support\""); - - // Scraper misses a few files we require - EnsureDirectoryExists("./docs/reference"); - DownloadFile(REFERENCE_DOCS_URL + "classes.html", "./docs/reference/classes.html"); - CopyFile ("./docs/reference/classes.html", "./docs/reference/index.html"); - DownloadFile(REFERENCE_DOCS_URL + "packages.html", "./docs/reference/packages.html"); - - - ZipCompress ("./docs", compressedDocsFile); - } - - if (!DirectoryExists("./docs")) - Unzip (compressedDocsFile, "./docs"); - - if (!FileExists("./Metadata.generated.xml")) { - // Generate metadata file from docs - if (IsRunningOnWindows ()) - StartProcess ("util/droiddocs.exe", "transform --out ./Metadata.generated.xml --type Metadata --dir ./docs --prefix \"/reference/\" --package-filter \"android.support\""); - else - StartProcess ("mono", "util/droiddocs.exe transform --out ./Metadata.generated.xml --type Metadata --dir ./docs --prefix \"/reference/\" --package-filter \"android.support\""); - } + // This is now cached in the repo in Metadata.generated.xml }); Task ("clean") From 0aa19f2204e003fabed03d91f9ab796920308c3f Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 3 Jul 2018 11:46:14 -0400 Subject: [PATCH 10/13] Fix bootstrapperto use cake.pacakges.config --- build.ps1 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/build.ps1 b/build.ps1 index 82529cf..cf92349 100644 --- a/build.ps1 +++ b/build.ps1 @@ -106,6 +106,7 @@ $PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" $PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" $ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" $MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" +$CAKE_PACKAGES_CONFIG = Join-Path $PSScriptRoot "cake.packages.config" # Make sure tools folder exists if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { @@ -115,11 +116,16 @@ if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { # Make sure that packages.config exist. if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch { - Throw "Could not download packages.config." + if (!(Test-Path $CAKE_PACKAGES_CONFIG)) { + Write-Verbose -Message "Downloading packages.config..." + try { + $wc = GetProxyEnabledWebClient + $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch { + Throw "Could not download packages.config." + } + } else { + Write-Verbose -Message "using local cake.packages.config..." + Copy-Item $CAKE_PACKAGES_CONFIG $PACKAGES_CONFIG } } @@ -232,4 +238,4 @@ $cakeArguments += $ScriptArgs # Start Cake Write-Host "Running build script..." &$CAKE_EXE $cakeArguments -exit $LASTEXITCODE +exit $LASTEXITCODE \ No newline at end of file From 5a39847753ebf0d62ea755f48bbe2a754b86596f Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 3 Jul 2018 14:27:07 -0400 Subject: [PATCH 11/13] Download docs from external --- build.cake | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/build.cake b/build.cake index fc0ab4c..52e0dda 100644 --- a/build.cake +++ b/build.cake @@ -64,6 +64,8 @@ var MAVEN_REPO_URL = "https://dl.google.com/dl/android/maven2/"; var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r27-macosx.zip"; var ANDROID_SDK_VERSION = IsRunningOnWindows () ? "v8.0" : "android-26"; var RENDERSCRIPT_FOLDER = "android-8.1.0"; +var DOCS_URL = "https://bosstoragemirror.blob.core.windows.net/android-docs-scraper/ea/ea65204c51cf20873c17c32584f3b12ed390ac55/android-support.zip"; +var REFERENCE_DOCS_URL = "https://developer.android.com/reference/"; // We grab the previous release's api-info.xml to use as a comparison for this build's generated info to make an api-diff var BASE_API_INFO_URL = EnvironmentVariable("MONO_API_INFO_XML_URL") ?? "https://github.com/xamarin/AndroidSupportComponents/releases/download/27.0.2/api-info.xml"; @@ -602,7 +604,17 @@ Task ("buildtasks") Task ("droiddocs") .Does (() => { - // This is now cached in the repo in Metadata.generated.xml + if (!FileExists("./externals/docs.zip")) + DownloadFile(DOCS_URL, "./externals/docs.zip"); + + if (DirectoryExists("./docs")) + DeleteDirectory("./docs", true); + + Unzip("./externals/docs.zip", "./docs"); + + DownloadFile(REFERENCE_DOCS_URL + "classes.html", "./docs/reference/classes.html"); + CopyFile ("./docs/reference/classes.html", "./docs/reference/index.html"); + DownloadFile(REFERENCE_DOCS_URL + "packages.html", "./docs/reference/packages.html"); }); Task ("clean") From 0eb2996ca9cab9d25ba8d5e0835440568d483bf5 Mon Sep 17 00:00:00 2001 From: Redth Date: Fri, 20 Jul 2018 16:05:54 -0400 Subject: [PATCH 12/13] Make sure folder is created --- build.cake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.cake b/build.cake index 52e0dda..66c0139 100644 --- a/build.cake +++ b/build.cake @@ -612,6 +612,8 @@ Task ("droiddocs") Unzip("./externals/docs.zip", "./docs"); + EnsureDirectoryExists("./docs/reference/"); + DownloadFile(REFERENCE_DOCS_URL + "classes.html", "./docs/reference/classes.html"); CopyFile ("./docs/reference/classes.html", "./docs/reference/index.html"); DownloadFile(REFERENCE_DOCS_URL + "packages.html", "./docs/reference/packages.html"); From 4619472a3d05db307d3625ee876201a991d26523 Mon Sep 17 00:00:00 2001 From: Redth Date: Fri, 20 Jul 2018 16:32:49 -0400 Subject: [PATCH 13/13] More docs download fixes --- build.cake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.cake b/build.cake index 66c0139..ad1d4ec 100644 --- a/build.cake +++ b/build.cake @@ -604,12 +604,16 @@ Task ("buildtasks") Task ("droiddocs") .Does (() => { + EnsureDirectoryExists("./externals/"); + if (!FileExists("./externals/docs.zip")) DownloadFile(DOCS_URL, "./externals/docs.zip"); if (DirectoryExists("./docs")) DeleteDirectory("./docs", true); + EnsureDirectoryExists("./docs/"); + Unzip("./externals/docs.zip", "./docs"); EnsureDirectoryExists("./docs/reference/");