diff --git a/.gitignore b/.gitignore index c6ce46c7..00c41b83 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ packages/ externals/ output/ docs/ +.vs/ *.xam *.DS_Store @@ -26,3 +27,4 @@ Resource.designer.cs component.yaml Details.md /generated.targets +*.commit \ No newline at end of file diff --git a/AndroidSupport.sln b/AndroidSupport.sln index 15a6d608..8e947776 100644 --- a/AndroidSupport.sln +++ b/AndroidSupport.sln @@ -57,9 +57,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "support-anno EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicAnimation", "support-dynamic-animation\source\DynamicAnimation.csproj", "{157F6FC3-90D1-40D5-91D0-A2552034B41A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstantVideo", "instantvideo\source\InstantVideo.csproj", "{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TV-Provider", "support-tv-provider\source\TV-Provider.csproj", "{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wearable", "wearable\source\Wearable.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji-Bundled", "support-emoji-bundled\source\Emoji-Bundled.csproj", "{44CC369D-0196-4C80-88D1-C2016998263F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji-AppCompat", "support-emoji-appcompat\source\Emoji-AppCompat.csproj", "{6824FF5C-9F50-4DE2-BF34-0314071FF83C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji", "support-emoji\source\Emoji.csproj", "{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wear", "wear\source\Wear.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -179,10 +185,22 @@ Global {157F6FC3-90D1-40D5-91D0-A2552034B41A}.Debug|Any CPU.Build.0 = Debug|Any CPU {157F6FC3-90D1-40D5-91D0-A2552034B41A}.Release|Any CPU.ActiveCfg = Release|Any CPU {157F6FC3-90D1-40D5-91D0-A2552034B41A}.Release|Any CPU.Build.0 = Release|Any CPU - {137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Release|Any CPU.Build.0 = Release|Any CPU + {0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Release|Any CPU.Build.0 = Release|Any CPU + {44CC369D-0196-4C80-88D1-C2016998263F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44CC369D-0196-4C80-88D1-C2016998263F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44CC369D-0196-4C80-88D1-C2016998263F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44CC369D-0196-4C80-88D1-C2016998263F}.Release|Any CPU.Build.0 = Release|Any CPU + {6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Release|Any CPU.Build.0 = Release|Any CPU + {B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Release|Any CPU.Build.0 = Release|Any CPU {F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.Build.0 = Debug|Any CPU {F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Metadata.common.xml b/Metadata.common.xml new file mode 100644 index 00000000..fe15e539 --- /dev/null +++ b/Metadata.common.xml @@ -0,0 +1,3 @@ + + > + diff --git a/Metadata.generated.xml b/Metadata.generated.xml index 6feead8f..94ea084b 100644 --- a/Metadata.generated.xml +++ b/Metadata.generated.xml @@ -190,12 +190,6 @@ parent abl layoutDirection - parent - child - parentWidthMeasureSpec - widthUsed - parentHeightMeasureSpec - heightUsed coordinatorLayout child target @@ -245,8 +239,6 @@ source flags interpolator - appBarLayout - verticalOffset context attrs parent @@ -672,7 +664,6 @@ size useCompatPadding visibility - listener @in loader superState @@ -930,63 +921,13 @@ tag defaultValue output + degree + altitude tag value + location latitude longitude - other - author - availability - contentId - duration - intent - intentUri - interactionCount - interactionType - externalId - itemCount - position - live - logoUri - price - ratio - previewVideoUri - releaseDate - releaseDate - price - ratio - transientValue - type - other - other - audioLanguages - genres - contentRatings - description - episodeNumber - episodeNumber - numericalEpisodeNumber - episodeTitle - programId - data - flag - flag - flag - flag - longDescription - posterArtUri - reviewRating - reviewRatingStyle - searchable - seasonNumber - numericalSeasonNumber - seasonNumber - seasonTitle - thumbnailUri - title - height - width - other other appLinkColor appLinkIconUri @@ -1025,16 +966,92 @@ channelId logoUri other + audioLanguages + author + availability + genres channelId + contentId + contentRatings + description + duration + episodeNumber + episodeNumber + numericalEpisodeNumber + episodeTitle + programId + intent + intentUri + interactionCount + interactionType + data + flag + flag + flag + flag + externalId + itemCount + position + live + logoUri + longDescription + price + ratio + posterArtUri + previewVideoUri + releaseDate + releaseDate + reviewRating + reviewRatingStyle + searchable + seasonNumber + numericalSeasonNumber + seasonNumber + seasonTitle + price + ratio + thumbnailUri + title + transientValue + type + height + width weight other cursor other + audioLanguages genres + genres channelId + contentRatings + description endTimeUtcMillis + episodeNumber + episodeNumber + numericalEpisodeNumber + episodeTitle + programId + data + flag + flag + flag + flag + longDescription + posterArtUri prohibited + reviewRating + reviewRatingStyle + searchable + seasonNumber + numericalSeasonNumber + seasonNumber + seasonTitle startTimeUtcMillis + thumbnailUri + title + height + width other other cursor @@ -1066,10 +1083,60 @@ uri uri uri + uri context channelId other + audioLanguages + author + availability + genres + contentId + contentRatings + description + duration + episodeNumber + episodeNumber + numericalEpisodeNumber + episodeTitle + programId + intent + intentUri + interactionCount + interactionType + data + flag + flag + flag + flag + externalId + itemCount lastEngagementTimeUtcMillis + position + live + logoUri + longDescription + price + ratio + posterArtUri + previewVideoUri + releaseDate + releaseDate + reviewRating + reviewRatingStyle + searchable + seasonNumber + numericalSeasonNumber + seasonNumber + seasonTitle + price + ratio + thumbnailUri + title + transientValue + type + height + width watchNextType other cursor @@ -1126,16 +1193,16 @@ attrs defStyle attrs - metadataLoader + metadataLoader initCallback color emojiSpanIndicatorEnabled replaceAll initCallback throwable - throwable - metadataRepo - loaderCallback + loaderCallback + throwable + metadataRepo inputConnection editable beforeLength @@ -1168,8 +1235,11 @@ start end fm + totalMs context request + handler + policy typeface inputStream typeface @@ -1232,6 +1302,19 @@ inputConnection outAttrs maxEmojiCount + context + context + attrs + context + attrs + defStyleAttr + context + attrs + defStyleAttr + defStyleRes + inputMethodService + ei + replaceStrategy context context attrs @@ -1420,6 +1503,11 @@ resource resource sceneRoot + transition + transition + transition + transition + transition sceneRoot transition sceneRoot @@ -2613,14 +2701,6 @@ preferKeyLineOverHighEdge preferKeyLineOverLowEdge position - itemViewHolder - item - rowViewHolder - row - itemViewHolder - item - rowViewHolder - row child focused direction @@ -2898,9 +2978,6 @@ height scaleType text - editText - keyCode - @event listener alignToBaseline viewId @@ -4006,6 +4083,10 @@ metricTypeFlags activity activity + context + component + jobId + work context cls jobId @@ -4014,6 +4095,7 @@ intent flags startId + interruptIfStopped inflater container savedInstanceState @@ -4101,7 +4183,6 @@ autoCancel icon category - channelId channelId argb colorize @@ -4149,7 +4230,6 @@ tickerText views tickerText - durationMs durationMs b pattern @@ -4214,7 +4294,6 @@ notification notification notification - notification notification notification notification @@ -4222,7 +4301,6 @@ notification notification notification - notification notification notification packageName @@ -4816,6 +4894,8 @@ customAction args enabled + rating + extras rating repeatMode shuffleMode @@ -4871,6 +4951,8 @@ pos enabled rating + rating + extras repeatMode shuffleMode enabled @@ -5158,6 +5240,8 @@ key maxSize maxSize + a + b first second a @@ -5649,6 +5733,7 @@ view view v + view view type view @@ -6206,6 +6291,23 @@ vertical horizontal vertical + context + canvas + alpha + width + height + show + scale + color + centerRadius + colorFilter + colors + rotation + start + end + strokeCap + strokeWidth + size button button button @@ -7854,6 +7956,8 @@ allCaps context resId + unit + size context context attrs @@ -8656,6 +8760,11 @@ view velocityX velocityY + rv + e + disallowIntercept + rv + e recyclerView newState recyclerView @@ -8673,6 +8782,11 @@ view viewCount holder + rv + e + disallowIntercept + rv + e dx dy dx @@ -10684,11 +10798,36 @@ attrs insets drawable + layout + context + context + attrs + context + attrs + defStyleAttr + context + attrs + defStyleAttr + defStyleRes + color + colors + indeterminate + listener + rotation + strokeWidth + totalTime context child anchorOffsetXY child parent + canvas + alpha + color + clipEnabled + cf + drawable + radius layout layout layout diff --git a/animated-vector-drawable/nuget/template.nuspec b/animated-vector-drawable/nuget/template.nuspec index d6eaf5fb..1e6b75a2 100644 --- a/animated-vector-drawable/nuget/template.nuspec +++ b/animated-vector-drawable/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/animated-vector-drawable_128x128.png - + - + - + diff --git a/animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj b/animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj index d6f68bdd..1cc14dfc 100644 --- a/animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj +++ b/animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj @@ -9,7 +9,7 @@ Library VectorDrawableSample VectorDrawableSample - v7.1 + v8.0 True Resources\Resource.designer.cs Resource diff --git a/animated-vector-drawable/source/Animated-Vector-Drawable.csproj b/animated-vector-drawable/source/Animated-Vector-Drawable.csproj index 24cb0fa5..e64bfa27 100644 --- a/animated-vector-drawable/source/Animated-Vector-Drawable.csproj +++ b/animated-vector-drawable/source/Animated-Vector-Drawable.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.Animated.Vector.Drawable - v7.0 + v8.0 @@ -62,6 +62,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/appcompat-v7/nuget/template.nuspec b/appcompat-v7/nuget/template.nuspec index 642f7b74..3516328f 100644 --- a/appcompat-v7/nuget/template.nuspec +++ b/appcompat-v7/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v7-appcompat_128x128.png - + @@ -26,9 +26,9 @@ - - - + + + diff --git a/appcompat-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/appcompat-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj index a1dd2a8b..77bb3802 100644 --- a/appcompat-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/appcompat-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -18,7 +18,7 @@ Resources Assets False - v7.0 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/appcompat-v7/source/V7-AppCompat.csproj b/appcompat-v7/source/V7-AppCompat.csproj index 44b88c81..52df7328 100644 --- a/appcompat-v7/source/V7-AppCompat.csproj +++ b/appcompat-v7/source/V7-AppCompat.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.v7.AppCompat - v7.0 + v8.0 @@ -66,6 +66,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/build.cake b/build.cake index 0b359b3f..a560a2e7 100644 --- a/build.cake +++ b/build.cake @@ -1,15 +1,7 @@ -#tool nuget:?package=ILRepack&version=2.0.10 -#tool nuget:?package=XamarinComponent -#tool nuget:?package=Cake.MonoApiTools -#tool nuget:?package=Microsoft.DotNet.BuildTools.GenAPI&version=1.0.0-beta-00081 - -#addin nuget:?package=Cake.Compression -#addin nuget:?package=Cake.Json -#addin nuget:?package=Cake.XCode -#addin nuget:?package=Cake.Xamarin -#addin nuget:?package=Cake.Xamarin.Build&version=2.0.18 -#addin nuget:?package=Cake.FileHelpers -#addin nuget:?package=Cake.MonoApiTools +// Loads our list of addins from the tools folder +// this assumes using the new bootstrapper build.sh in the root folder +// which downloads the required files +#load "./tools/addins.cake" // From Cake.Xamarin.Build, dumps out versions of things LogSystemInfo (); @@ -17,22 +9,26 @@ LogSystemInfo (); var TARGET = Argument ("t", Argument ("target", "Default")); var BUILD_CONFIG = Argument ("config", "Release"); -var NUGET_VERSION = "25.4.0.2"; -var COMPONENT_VERSION = "25.4.0.0"; -var AAR_VERSION = "25.4.0"; -var DOC_VERSION = "2017-08-22"; -var XBD_VERSION = "0.4.6"; +// Lists all the artifacts and their versions for com.android.support.* +// https://dl.google.com/dl/android/maven2/com/android/support/group-index.xml +// Master list of all the packages in the repo: +// https://dl.google.com/dl/android/maven2/master-index.xml + +var NUGET_VERSION = "26.0.2"; +var COMPONENT_VERSION = "26.0.2.0"; +var AAR_VERSION = "26.0.2"; +var DOC_VERSION = "2017-09-05"; var SUPPORT_PKG_NAME = "com.android.support"; // FROM: https://dl.google.com/android/repository/addon2-1.xml var MAVEN_REPO_URL = "https://dl.google.com/dl/android/maven2/"; -var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r26-rc2-macosx.zip"; -var ANDROID_SDK_VERSION = IsRunningOnWindows () ? "v7.1" : "android-25"; -var RENDERSCRIPT_FOLDER = "android-O"; +var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r26-macosx.zip"; +var ANDROID_SDK_VERSION = IsRunningOnWindows () ? "v8.0" : "android-26"; +var RENDERSCRIPT_FOLDER = "android-8.0.0"; // 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 = "https://github.com/xamarin/AndroidSupportComponents/releases/download/25.4.0.1/api-info.xml"; +var BASE_API_INFO_URL = "https://github.com/xamarin/AndroidSupportComponents/releases/download/25.4.0.2/api-info.xml"; var CPU_COUNT = System.Environment.ProcessorCount; var USE_MSBUILD_ON_MAC = true; @@ -53,7 +49,6 @@ var ARTIFACTS = new [] { new ArtifactInfo (SUPPORT_PKG_NAME, "leanback-v17", "Xamarin.Android.Support.v17.Leanback", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "design", "Xamarin.Android.Support.Design", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "percent", "Xamarin.Android.Support.Percent", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), - new ArtifactInfo (SUPPORT_PKG_NAME, "instantvideo", "Xamarin.Android.Support.InstantVideo", "26.0.0-alpha1", "26.0.0-alpha1", COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "customtabs", "Xamarin.Android.Support.CustomTabs", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "preference-v7", "Xamarin.Android.Support.v7.Preference", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "preference-v14", "Xamarin.Android.Support.v14.Preference", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), @@ -67,14 +62,14 @@ var ARTIFACTS = new [] { new ArtifactInfo (SUPPORT_PKG_NAME, "support-dynamic-animation", "Xamarin.Android.Support.Dynamic.Animation", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "support-media-compat", "Xamarin.Android.Support.Media.Compat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "support-fragment", "Xamarin.Android.Support.Fragment", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), - //new ArtifactInfo (SUPPORT_PKG_NAME, "support-tv-provider", "Xamarin.Android.Support.TV.Provider", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), + new ArtifactInfo (SUPPORT_PKG_NAME, "support-tv-provider", "Xamarin.Android.Support.TV.Provider", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "transition", "Xamarin.Android.Support.Transition", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "exifinterface", "Xamarin.Android.Support.Exif", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), - new ArtifactInfo (SUPPORT_PKG_NAME, "wearable", "Xamarin.Android.Support.Wearable", "26.0.0-alpha1", "26.0.0-alpha1", COMPONENT_VERSION), + new ArtifactInfo (SUPPORT_PKG_NAME, "wear", "Xamarin.Android.Support.Wear", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "support-annotations", "Xamarin.Android.Support.Annotations", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION, true), - //new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji", "Xamarin.Android.Support.Emoji", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), - //new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji-appcompat", "Xamarin.Android.Support.Emoji.AppCompat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), - //new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji-bundled", "Xamarin.Android.Support.Emoji.Bundled", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), + new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji", "Xamarin.Android.Support.Emoji", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), + new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji-appcompat", "Xamarin.Android.Support.Emoji.AppCompat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), + new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji-bundled", "Xamarin.Android.Support.Emoji.Bundled", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), new ArtifactInfo (SUPPORT_PKG_NAME, "renderscript-v8", "Xamarin.Android.Support.v8.RenderScript", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION), }; @@ -145,10 +140,10 @@ var buildSpec = new BuildSpec { new DefaultSolutionBuilder { SolutionPath = "./percent/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, new DefaultSolutionBuilder { SolutionPath = "./recommendation/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, new DefaultSolutionBuilder { SolutionPath = "./support-v4/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, - new DefaultSolutionBuilder { SolutionPath = "./appcompat-v7/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, + //new DefaultSolutionBuilder { SolutionPath = "./appcompat-v7/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, new DefaultSolutionBuilder { SolutionPath = "./cardview-v7/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, new DefaultSolutionBuilder { SolutionPath = "./gridlayout-v7/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, - new DefaultSolutionBuilder { SolutionPath = "./mediarouter-v7/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, + //new DefaultSolutionBuilder { SolutionPath = "./mediarouter-v7/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, new DefaultSolutionBuilder { SolutionPath = "./palette-v7/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, new DefaultSolutionBuilder { SolutionPath = "./preference-v7/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, new DefaultSolutionBuilder { SolutionPath = "./recyclerview-v7/samples/AndroidSupportSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC }, @@ -168,7 +163,7 @@ var buildSpec = new BuildSpec { new Component { ManifestDirectory = "./percent/component" }, new Component { ManifestDirectory = "./recommendation/component" }, new Component { ManifestDirectory = "./support-v4/component" }, - new Component { ManifestDirectory = "./appcompat-v7/component" }, + //new Component { ManifestDirectory = "./appcompat-v7/component" }, new Component { ManifestDirectory = "./cardview-v7/component" }, new Component { ManifestDirectory = "./gridlayout-v7/component" }, new Component { ManifestDirectory = "./palette-v7/component" }, @@ -283,7 +278,7 @@ Task ("merge").IsDependentOn ("libs").Does (() => CopyAttrs = true, AllowMultiple = true, //TargetKind = ILRepack.TargetKind.Dll, - Libs = new List { + Libs = new List { MONODROID_PATH }, }); @@ -305,6 +300,7 @@ Task ("component-setup").Does (() => } }); + Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals") .Does (() => { @@ -367,7 +363,7 @@ Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals") // Transform all template.nuspec files var nuspecText = FileReadText(art.ArtifactId + "/nuget/template.nuspec"); - nuspecText = nuspecText.Replace ("$xbdversion$", XBD_VERSION); + //nuspecText = nuspecText.Replace ("$xbdversion$", XBD_VERSION); var nuspecFile = new FilePath(art.ArtifactId + "/nuget/" + art.NugetId + ".nuspec"); FileWriteText(nuspecFile, nuspecText); var xNuspec = System.Xml.Linq.XDocument.Load (MakeAbsolute(nuspecFile).FullPath); @@ -391,7 +387,7 @@ Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals") }); Task ("nuget").IsDependentOn ("nuget-setup").IsDependentOn ("nuget-base").IsDependentOn ("libs"); -//Task ("nuget").IsDependentOn ("nuget-base").IsDependentOn ("libs"); + Task ("component").IsDependentOn ("component-docs").IsDependentOn ("component-setup").IsDependentOn ("component-base").IsDependentOn ("libs"); @@ -475,7 +471,7 @@ Task ("component-docs").Does (() => }); //Task ("libs").IsDependentOn ("nuget-setup").IsDependentOn ("genapi").IsDependentOn ("libs-base"); -Task ("libs").IsDependentOn ("genapi").IsDependentOn ("libs-base"); +Task ("libs").IsDependentOn("buildtasks").IsDependentOn ("genapi").IsDependentOn ("libs-base"); //Task ("libs").IsDependentOn ("libs-base"); Task ("genapi").IsDependentOn ("libs-base").IsDependentOn ("externals").Does (() => { @@ -513,7 +509,7 @@ Task ("genapi").IsDependentOn ("libs-base").IsDependentOn ("externals").Does (() }); } - DotNetBuild ("./AndroidSupport.TypeForwarders.sln", c => c.Configuration = BUILD_CONFIG); + MSBuild ("./AndroidSupport.TypeForwarders.sln", c => c.Configuration = BUILD_CONFIG); CopyFile ("./support-v4/source/bin/" + BUILD_CONFIG + "/Xamarin.Android.Support.v4.dll", "./output/Xamarin.Android.Support.v4.dll"); }); @@ -522,7 +518,7 @@ Task ("buildtasks").Does (() => { NuGetRestore ("./support-vector-drawable/buildtask/Vector-Drawable-BuildTasks.csproj"); - DotNetBuild ("./support-vector-drawable/buildtask/Vector-Drawable-BuildTasks.csproj", c => c.Configuration = BUILD_CONFIG); + MSBuild ("./support-vector-drawable/buildtask/Vector-Drawable-BuildTasks.csproj", c => c.Configuration = BUILD_CONFIG); }); @@ -551,16 +547,15 @@ Task ("droiddocs").Does(() => 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\""); - } + 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\""); + } }); - SetupXamarinBuildTasks (buildSpec, Tasks, Task); RunTarget (TARGET); diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index 64a35786..00000000 --- a/build.ps1 +++ /dev/null @@ -1,147 +0,0 @@ -<# - -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. - -.DESCRIPTION -This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) -and execute your Cake build script with the parameters you provide. - -.PARAMETER Script -The build script to execute. -.PARAMETER Target -The build script target to run. -.PARAMETER Configuration -The build configuration to use. -.PARAMETER Verbosity -Specifies the amount of information to be displayed. -.PARAMETER Experimental -Tells Cake to use the latest Roslyn release. -.PARAMETER WhatIf -Performs a dry run of the build script. -No tasks will be executed. -.PARAMETER Mono -Tells Cake to use the Mono scripting engine. - -.LINK -http://cakebuild.net - -#> - -[CmdletBinding()] -Param( - [string]$Script = "build.cake", - [string]$Target = "Default", - [string]$Configuration = "Release", - [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity = "Verbose", - [switch]$Experimental, - [Alias("DryRun","Noop")] - [switch]$WhatIf, - [switch]$Mono, - [switch]$SkipToolPackageRestore, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -Write-Host "Preparing to run build script..." - -$PS_SCRIPT_ROOT = split-path -parent $MyInvocation.MyCommand.Definition; -$TOOLS_DIR = Join-Path $PSScriptRoot "tools" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" -$NUGET_URL = "http://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" -$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" -$CAKE_PACKAGES_CONFIG = Join-Path $PSScriptRoot "cake.packages.config" - -# Should we use mono? -$UseMono = ""; -if($Mono.IsPresent) { - Write-Verbose -Message "Using the Mono based scripting engine." - $UseMono = "-mono" -} - -# Should we use the new Roslyn? -$UseExperimental = ""; -if($Experimental.IsPresent -and !($Mono.IsPresent)) { - Write-Verbose -Message "Using experimental version of Roslyn." - $UseExperimental = "-experimental" -} - -# Is this a dry run? -$UseDryRun = ""; -if($WhatIf.IsPresent) { - $UseDryRun = "-dryrun" -} - -# Make sure tools folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { - Write-Verbose -Message "Creating tools directory..." - New-Item -Path $TOOLS_DIR -Type directory | out-null -} - -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - if (!(Test-Path $CAKE_PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $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 - } -} - -# Let's just skip this check and always download nuget.exe -# Try find NuGet.exe in path if not exists -# if (!(Test-Path $NUGET_EXE)) { -# Write-Verbose -Message "Trying to find nuget.exe in PATH..." -# $existingPaths = $Env:Path -Split ';' | Where-Object { Test-Path $_ } -# $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 -# if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { -# Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." -# $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName -# } -#} - -# Try download NuGet.exe if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." - try { - (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE) - } catch { - Throw "Could not download NuGet.exe." - } -} - -# Save nuget.exe path to environment to be available to child processed -$ENV:NUGET_EXE = $NUGET_EXE - -# Restore tools from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) -{ - # Restore packages from NuGet. - Push-Location - Set-Location $TOOLS_DIR - - Write-Verbose -Message "Restoring tools from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - Write-Verbose -Message ($NuGetOutput | out-string) - - Pop-Location - if ($LASTEXITCODE -ne 0) - { - exit $LASTEXITCODE - } -} - -# Make sure that Cake has been installed. -if (!(Test-Path $CAKE_EXE)) { - Throw "Could not find Cake.exe at $CAKE_EXE" -} - -# Start Cake -Write-Host "Running build script..." -Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs" -exit $LASTEXITCODE diff --git a/build.sh b/build.sh index 002cace1..811aa684 100644 --- a/build.sh +++ b/build.sh @@ -1,103 +1,27 @@ -#!/usr/bin/env bash -############################################################### -# This is the Cake bootstrapper script that is responsible for -# downloading Cake and all specified tools from NuGet. -############################################################### - -# Define directories. +COMMIT="f61d7eda6d3ce4112a79937c8cceb94ad5aa081c" +URL="https://raw.githubusercontent.com/xamarin/XamarinComponents/$COMMIT/Util/Bootstrapper/cake.sh" SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -TOOLS_DIR=$SCRIPT_DIR/tools -export NUGET_EXE=$TOOLS_DIR/nuget.exe -CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe - -# Define default arguments. -SCRIPT="build.cake" -TARGET="Default" -CONFIGURATION="Release" -VERBOSITY="verbose" -DRYRUN= -SHOW_VERSION=false -SCRIPT_ARGUMENTS=() +SCRIPT="$SCRIPT_DIR/cake.sh" -# Parse arguments. -for i in "$@"; do - case $1 in - -s|--script) SCRIPT="$2"; shift ;; - -t|--target) TARGET="$2"; shift ;; - -c|--configuration) CONFIGURATION="$2"; shift ;; - -v|--verbosity) VERBOSITY="$2"; shift ;; - -d|--dryrun) DRYRUN="-dryrun" ;; - --version) SHOW_VERSION=true ;; - --) shift; SCRIPT_ARGUMENTS+=("$@"); break ;; - *) SCRIPT_ARGUMENTS+=("$1") ;; - esac - shift -done +# Get the commit last used to grab these files so we can check if an update's needed +commitTxt="" +if [ -f "$SCRIPT.commit" ]; then commitTxt=$(cat "$SCRIPT.commit"); fi -# Make sure the tools folder exist. -if [ ! -d "$TOOLS_DIR" ]; then - mkdir "$TOOLS_DIR" -fi +# If the cached file's commit doesn't match our desired, or if it's 'master' go download the right version +if [[ "$commitTxt" != "$COMMIT" || "$commitTxt" == "master" ]]; then -# Make sure that packages.config exist. -if [ ! -f "$TOOLS_DIR/packages.config" ]; then - if [ ! -f "$SCRIPT_DIR/cake.packages.config" ]; then - echo "Downloading packages.config..." - curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/bootstrapper/packages - if [ $? -ne 0 ]; then - echo "An error occured 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 - -# Download NuGet if it does not exist. -if [ ! -f "$NUGET_EXE" ]; then - echo "Downloading NuGet..." - curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/v3.4.4/NuGet.exe - # v3/Latest URL: https://dist.nuget.org/win-x86-commandline/latest/nuget.exe - if [ $? -ne 0 ]; then - echo "An error occured while downloading nuget.exe." - exit 1 - fi -fi + echo "Downloading $SCRIPT..." -# BEGIN TEMP WORKAROUND -# There is a bug in Mono's System.IO.Compression -# This binary fixes the bug for now -# Download System.IO.Compression if it does not exist. -SYSIOCOMP=$TOOLS_DIR/System.IO.Compression.dll -if [ ! -f "$SYSIOCOMP" ]; then - echo "Downloading System.IO.Compression.dll ..." - curl -Lsfo "$SYSIOCOMP" http://xamarin-components-binaries.s3.amazonaws.com/System.IO.Compression.dll + # Download the script + curl -Lsfo $SCRIPT $URL if [ $? -ne 0 ]; then - echo "An error occured while downloading System.IO.Compression.dll." + echo "An error occured while downloading $SCRIPT." exit 1 fi -fi -# END TEMP WORKAROUND -# Restore tools from NuGet. -pushd "$TOOLS_DIR" >/dev/null -mono "$NUGET_EXE" install -ExcludeVersion -if [ $? -ne 0 ]; then - echo "Could not restore NuGet packages." - exit 1 + # Write out the commit hash used to cache for future runs + echo $COMMIT > "$SCRIPT.commit" fi -popd >/dev/null -# Make sure that Cake has been installed. -if [ ! -f "$CAKE_EXE" ]; then - echo "Could not find Cake.exe at '$CAKE_EXE'." - exit 1 -fi - -# Start Cake -if $SHOW_VERSION; then - exec mono "$CAKE_EXE" -version -else - exec mono "$CAKE_EXE" $SCRIPT -verbosity=$VERBOSITY -configuration=$CONFIGURATION -target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}" -fi +export BOOTSTRAPPER_COMMIT="$COMMIT" +sh $SCRIPT $@ diff --git a/cake.packages.config b/cake.packages.config deleted file mode 100644 index 85fc75c4..00000000 --- a/cake.packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cardview-v7/nuget/template.nuspec b/cardview-v7/nuget/template.nuspec index 77b1bfc9..865a4626 100644 --- a/cardview-v7/nuget/template.nuspec +++ b/cardview-v7/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/cardview_128x128.png - + - + - + diff --git a/cardview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/cardview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj index 78c7dbdd..1cee4792 100644 --- a/cardview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/cardview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -16,7 +16,7 @@ Assets False AndroidSupportSample - v7.0 + v8.0 Properties\AndroidManifest.xml armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/cardview-v7/source/V7-CardView.csproj b/cardview-v7/source/V7-CardView.csproj index 54e76e4e..85762134 100644 --- a/cardview-v7/source/V7-CardView.csproj +++ b/cardview-v7/source/V7-CardView.csproj @@ -11,7 +11,7 @@ Assets False Xamarin.Android.Support.v7.CardView - v7.0 + v8.0 @@ -57,6 +57,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/constraint-layout-solver/source/ConstraintLayoutSolver.csproj b/constraint-layout-solver/source/ConstraintLayoutSolver.csproj index 7f60e9ff..e6b286a1 100644 --- a/constraint-layout-solver/source/ConstraintLayoutSolver.csproj +++ b/constraint-layout-solver/source/ConstraintLayoutSolver.csproj @@ -8,7 +8,7 @@ Library Android.Support.Constraints Xamarin.Android.Support.Constraint.Layout.Solver - v7.0 + v8.0 Resources Assets false diff --git a/constraint-layout/samples/ConstraintLayoutSample/ConstraintLayoutSample.csproj b/constraint-layout/samples/ConstraintLayoutSample/ConstraintLayoutSample.csproj index 5920c60c..ae2584d8 100644 --- a/constraint-layout/samples/ConstraintLayoutSample/ConstraintLayoutSample.csproj +++ b/constraint-layout/samples/ConstraintLayoutSample/ConstraintLayoutSample.csproj @@ -8,7 +8,7 @@ Library ConstraintLayoutSample ConstraintLayoutSample - v7.0 + v8.0 True Resources\Resource.designer.cs Resource diff --git a/constraint-layout/source/ConstraintLayout.csproj b/constraint-layout/source/ConstraintLayout.csproj index c6b89da9..7a23e3f9 100644 --- a/constraint-layout/source/ConstraintLayout.csproj +++ b/constraint-layout/source/ConstraintLayout.csproj @@ -8,7 +8,7 @@ Library ConstraintLayout Xamarin.Android.Support.Constraint.Layout - v7.0 + v8.0 Resources Assets false diff --git a/customtabs/nuget/template.nuspec b/customtabs/nuget/template.nuspec index 2e63e355..a760add6 100644 --- a/customtabs/nuget/template.nuspec +++ b/customtabs/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/customtabs_128x128.png - + - + - + diff --git a/customtabs/samples/ChromeCustomTabsSample/ChromeCustomTabsSample.csproj b/customtabs/samples/ChromeCustomTabsSample/ChromeCustomTabsSample.csproj index c751bd2a..0b4aec92 100644 --- a/customtabs/samples/ChromeCustomTabsSample/ChromeCustomTabsSample.csproj +++ b/customtabs/samples/ChromeCustomTabsSample/ChromeCustomTabsSample.csproj @@ -16,7 +16,7 @@ True False ChromeCustomTabsSample - v7.0 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 None diff --git a/customtabs/source/CustomTabs.csproj b/customtabs/source/CustomTabs.csproj index c976447e..3f54915b 100644 --- a/customtabs/source/CustomTabs.csproj +++ b/customtabs/source/CustomTabs.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.CustomTabs - v7.0 + v8.0 @@ -60,6 +60,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/design/nuget/template.nuspec b/design/nuget/template.nuspec index 63e8c3cb..e0014271 100644 --- a/design/nuget/template.nuspec +++ b/design/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/design_128x128.png - + @@ -28,9 +28,9 @@ - + - + diff --git a/design/samples/Cheesesquare/Cheesesquare.csproj b/design/samples/Cheesesquare/Cheesesquare.csproj index 5a79bc06..fc0465fd 100644 --- a/design/samples/Cheesesquare/Cheesesquare.csproj +++ b/design/samples/Cheesesquare/Cheesesquare.csproj @@ -16,7 +16,7 @@ True false Cheesesquare - v7.1 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/design/source/Design.csproj b/design/source/Design.csproj index eb16be79..184f9320 100644 --- a/design/source/Design.csproj +++ b/design/source/Design.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.Design - v7.0 + v8.0 @@ -57,6 +57,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/exifinterface/nuget/template.nuspec b/exifinterface/nuget/template.nuspec index 95f3ba6a..c03354d8 100644 --- a/exifinterface/nuget/template.nuspec +++ b/exifinterface/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/exifinterface_128x128.png - + - + - + diff --git a/exifinterface/source/Exif.csproj b/exifinterface/source/Exif.csproj index 2d676d98..9f81dff4 100644 --- a/exifinterface/source/Exif.csproj +++ b/exifinterface/source/Exif.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Exif - v7.0 + v8.0 @@ -58,6 +58,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/gridlayout-v7/nuget/template.nuspec b/gridlayout-v7/nuget/template.nuspec index 2ea86189..2d7e3229 100644 --- a/gridlayout-v7/nuget/template.nuspec +++ b/gridlayout-v7/nuget/template.nuspec @@ -13,16 +13,16 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/gridlayout_128x128.png - + - + - + diff --git a/gridlayout-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/gridlayout-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj index 34926f48..6d51f010 100644 --- a/gridlayout-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/gridlayout-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -17,7 +17,7 @@ Assets False AndroidSupportSample - v7.0 + v8.0 Properties\AndroidManifest.xml armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/gridlayout-v7/source/V7-GridLayout.csproj b/gridlayout-v7/source/V7-GridLayout.csproj index 1de0bf52..4b1ad671 100644 --- a/gridlayout-v7/source/V7-GridLayout.csproj +++ b/gridlayout-v7/source/V7-GridLayout.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.v7.GridLayout - v7.0 + v8.0 @@ -61,6 +61,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/instantvideo/nuget/template.nuspec b/instantvideo/nuget/template.nuspec deleted file mode 100644 index f6fd0f73..00000000 --- a/instantvideo/nuget/template.nuspec +++ /dev/null @@ -1,29 +0,0 @@ - - - - Xamarin.Android.Support.InstantVideo - Xamarin Android Support Library - InstantVideo - $version$ - Xamarin Inc. - Xamarin Inc. - true - InstantVideo Android Support Library C# bindings for Xamarin - Copyright © Microsoft Corporation - https://github.com/xamarin/AndroidSupportComponents/ - https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md - https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/instantvideo_128x128.png - - - - - - - - - - - - - - - diff --git a/instantvideo/source/InstantVideo.csproj b/instantvideo/source/InstantVideo.csproj deleted file mode 100644 index ea1ea3de..00000000 --- a/instantvideo/source/InstantVideo.csproj +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Debug - AnyCPU - {137DABCD-BAC3-4CA6-B55B-A0ED565DC20E} - {10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Android.Support.InstantVideo - Resources - Assets - Xamarin.Android.Support.InstantVideo - v7.0 - - class-parse - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - None - false - - - full - true - bin\Release - prompt - 4 - false - false - - - - ..\..\docs\reference - - - - - - - - - - - - - - - - - Transforms\Metadata.generated.xml - - - - - - - - - - - - {CA4194B2-8B2D-4C37-8790-C79C5803357A} - Compat - - - - - instantvideo.aar - - - - diff --git a/instantvideo/source/Properties/AssemblyInfo.cs b/instantvideo/source/Properties/AssemblyInfo.cs deleted file mode 100644 index 79e05eb1..00000000 --- a/instantvideo/source/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using Android.App; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("Xamarin.Android.Support.InstantVideo")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany ("Microsoft Corporation")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/instantvideo/source/Transforms/Metadata.xml b/instantvideo/source/Transforms/Metadata.xml deleted file mode 100644 index 381c31dc..00000000 --- a/instantvideo/source/Transforms/Metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - Android.Support.Media.InstantVideo - Android.Support.Media.InstantVideo.Preload - Android.Support.Media.InstantVideo.Widget - - - source - size - dest - flags - - \ No newline at end of file diff --git a/leanback-v17/nuget/template.nuspec b/leanback-v17/nuget/template.nuspec index f10294fb..a54a899d 100644 --- a/leanback-v17/nuget/template.nuspec +++ b/leanback-v17/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v17-leanback_128x128.png - + @@ -25,9 +25,9 @@ - + - + diff --git a/leanback-v17/samples/AndroidSupportSample/AndroidSupportSample.csproj b/leanback-v17/samples/AndroidSupportSample/AndroidSupportSample.csproj index f9e78743..fb78dd0b 100644 --- a/leanback-v17/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/leanback-v17/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -18,7 +18,7 @@ Resources Assets true - v7.1 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/leanback-v17/source/V17-Leanback.csproj b/leanback-v17/source/V17-Leanback.csproj index 096795c2..77e0d68c 100644 --- a/leanback-v17/source/V17-Leanback.csproj +++ b/leanback-v17/source/V17-Leanback.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.v17.Leanback - v7.0 + v8.0 @@ -63,6 +63,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/mediarouter-v7/nuget/template.nuspec b/mediarouter-v7/nuget/template.nuspec index 3d16e8b8..44d97c1c 100644 --- a/mediarouter-v7/nuget/template.nuspec +++ b/mediarouter-v7/nuget/template.nuspec @@ -13,16 +13,16 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v7-mediarouter_128x128.png - + - + - + diff --git a/mediarouter-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/mediarouter-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj index be4be5ad..ddfaaaa5 100644 --- a/mediarouter-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/mediarouter-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -18,7 +18,7 @@ False AndroidSupportSample Properties\AndroidManifest.xml - v7.0 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/mediarouter-v7/source/V7-MediaRouter.csproj b/mediarouter-v7/source/V7-MediaRouter.csproj index 3a40d7bf..fef5a6b8 100644 --- a/mediarouter-v7/source/V7-MediaRouter.csproj +++ b/mediarouter-v7/source/V7-MediaRouter.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.v7.MediaRouter - v7.0 + v8.0 @@ -61,6 +61,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/palette-v7/nuget/template.nuspec b/palette-v7/nuget/template.nuspec index 33853889..23aec7d8 100644 --- a/palette-v7/nuget/template.nuspec +++ b/palette-v7/nuget/template.nuspec @@ -13,16 +13,16 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v7-palette_128x128.png - + - + - + diff --git a/palette-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/palette-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj index 9d8e1f9b..65f20b28 100644 --- a/palette-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/palette-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -18,7 +18,7 @@ true AndroidSupportSample Properties\AndroidManifest.xml - v7.1 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/palette-v7/source/V7-Palette.csproj b/palette-v7/source/V7-Palette.csproj index 6b831153..d5b3f06b 100644 --- a/palette-v7/source/V7-Palette.csproj +++ b/palette-v7/source/V7-Palette.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.v7.Palette - v7.0 + v8.0 @@ -62,6 +62,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/percent/nuget/template.nuspec b/percent/nuget/template.nuspec index e68794ce..db52b2dd 100644 --- a/percent/nuget/template.nuspec +++ b/percent/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/percent_128x128.png - + - + - + diff --git a/percent/samples/AndroidSupportSample/AndroidSupportSample.csproj b/percent/samples/AndroidSupportSample/AndroidSupportSample.csproj index 82948421..be99eeb7 100644 --- a/percent/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/percent/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -17,7 +17,7 @@ Assets AndroidSupportSample Properties\AndroidManifest.xml - v7.0 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/percent/source/Percent.csproj b/percent/source/Percent.csproj index 8d6fe956..bd3b5800 100644 --- a/percent/source/Percent.csproj +++ b/percent/source/Percent.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.Percent - v7.0 + v8.0 @@ -57,6 +57,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/preference-leanback-v17/nuget/template.nuspec b/preference-leanback-v17/nuget/template.nuspec index e6bf7bf9..c4ff3bc5 100644 --- a/preference-leanback-v17/nuget/template.nuspec +++ b/preference-leanback-v17/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v17-preference-leanback_128x128.png - + @@ -29,9 +29,9 @@ - - - + + + diff --git a/preference-leanback-v17/source/V17-Preference-Leanback.csproj b/preference-leanback-v17/source/V17-Preference-Leanback.csproj index 60731ae3..00b72856 100644 --- a/preference-leanback-v17/source/V17-Preference-Leanback.csproj +++ b/preference-leanback-v17/source/V17-Preference-Leanback.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.v17.Preference.Leanback - v7.0 + v8.0 @@ -59,6 +59,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/preference-v14/nuget/template.nuspec b/preference-v14/nuget/template.nuspec index ee6c3d8e..ca494f0d 100644 --- a/preference-v14/nuget/template.nuspec +++ b/preference-v14/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v14-preference_128x128.png - + @@ -27,9 +27,9 @@ - + - + diff --git a/preference-v14/source/V14-Preference.csproj b/preference-v14/source/V14-Preference.csproj index e6150b45..381c5141 100644 --- a/preference-v14/source/V14-Preference.csproj +++ b/preference-v14/source/V14-Preference.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.v14.Preference - v7.0 + v8.0 @@ -59,6 +59,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/preference-v7/nuget/template.nuspec b/preference-v7/nuget/template.nuspec index 4ad960e1..c8ca6ea3 100644 --- a/preference-v7/nuget/template.nuspec +++ b/preference-v7/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v7-preference_128x128.png - + @@ -26,9 +26,9 @@ - + - + diff --git a/preference-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/preference-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj index 261eb59e..e7366822 100644 --- a/preference-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/preference-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -17,7 +17,7 @@ Assets AndroidSupportSample Properties\AndroidManifest.xml - v7.0 + v8.0 true diff --git a/preference-v7/source/V7-Preference.csproj b/preference-v7/source/V7-Preference.csproj index 4cc50210..1ecfc85d 100644 --- a/preference-v7/source/V7-Preference.csproj +++ b/preference-v7/source/V7-Preference.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.v7.Preference - v7.0 + v8.0 @@ -59,6 +59,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/recommendation/nuget/template.nuspec b/recommendation/nuget/template.nuspec index c96a5b47..a4ccec7c 100644 --- a/recommendation/nuget/template.nuspec +++ b/recommendation/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/recommendation_128x128.png - + @@ -24,9 +24,9 @@ - + - + diff --git a/recommendation/samples/AndroidSupportSample/AndroidSupportSample.csproj b/recommendation/samples/AndroidSupportSample/AndroidSupportSample.csproj index f20a98c4..7e496590 100644 --- a/recommendation/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/recommendation/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -17,7 +17,7 @@ Assets AndroidSupportSample Properties\AndroidManifest.xml - v7.0 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/recommendation/source/Recommendation.csproj b/recommendation/source/Recommendation.csproj index 3bcd7579..e046409e 100644 --- a/recommendation/source/Recommendation.csproj +++ b/recommendation/source/Recommendation.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.Recommendation - v7.0 + v8.0 @@ -57,6 +57,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/recyclerview-v7/nuget/template.nuspec b/recyclerview-v7/nuget/template.nuspec index 21c2784e..28ac93bf 100644 --- a/recyclerview-v7/nuget/template.nuspec +++ b/recyclerview-v7/nuget/template.nuspec @@ -13,16 +13,16 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v7-recyclerview_128x128.png - + - + - + diff --git a/recyclerview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/recyclerview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj index 15617859..1147765f 100644 --- a/recyclerview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/recyclerview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -18,7 +18,7 @@ False AndroidSupportSample Properties\AndroidManifest.xml - v7.0 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/recyclerview-v7/source/Additions/Additions.cs b/recyclerview-v7/source/Additions/Additions.cs new file mode 100644 index 00000000..3e64d68d --- /dev/null +++ b/recyclerview-v7/source/Additions/Additions.cs @@ -0,0 +1,30 @@ +using System; +namespace Android.Support.V7.Widget + //.RecyclerView.RequestDisallowInterceptTouchEventEventArgs +{ + public partial class RecyclerView + { + public partial class InterceptTouchEventEventArgs + { + public RecyclerView RecyclerView { + get { return this.Rv; } + } + } + + public partial class RequestDisallowInterceptTouchEventEventArgs + { + public bool Disallow + { + get { return this.DisallowIntercept; } + } + } + + public partial class TouchEventEventArgs + { + public RecyclerView RecyclerView + { + get { return this.Rv; } + } + } + } +} diff --git a/recyclerview-v7/source/V7-RecyclerView.csproj b/recyclerview-v7/source/V7-RecyclerView.csproj index c093a05a..f2593c0a 100644 --- a/recyclerview-v7/source/V7-RecyclerView.csproj +++ b/recyclerview-v7/source/V7-RecyclerView.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.v7.RecyclerView - v7.0 + v8.0 @@ -52,6 +52,7 @@ + @@ -62,6 +63,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/renderscript-v8/nuget/template.nuspec b/renderscript-v8/nuget/template.nuspec index a68b5ba0..7e680c86 100644 --- a/renderscript-v8/nuget/template.nuspec +++ b/renderscript-v8/nuget/template.nuspec @@ -14,7 +14,9 @@ https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v8-renderscript_128x128.png - + + + diff --git a/renderscript-v8/samples/RenderScriptSample/RenderScriptSample.csproj b/renderscript-v8/samples/RenderScriptSample/RenderScriptSample.csproj index f16b85ec..36018797 100644 --- a/renderscript-v8/samples/RenderScriptSample/RenderScriptSample.csproj +++ b/renderscript-v8/samples/RenderScriptSample/RenderScriptSample.csproj @@ -15,7 +15,7 @@ False RenderScriptSample Properties\AndroidManifest.xml - v7.0 + v8.0 1G 8.0.30703 2.0 diff --git a/renderscript-v8/source/V8-RenderScript.csproj b/renderscript-v8/source/V8-RenderScript.csproj index 9879147d..a8dd06c4 100644 --- a/renderscript-v8/source/V8-RenderScript.csproj +++ b/renderscript-v8/source/V8-RenderScript.csproj @@ -11,7 +11,7 @@ Assets False Xamarin.Android.Support.v8.RenderScript - v4.0.3 + v8.0 @@ -59,6 +59,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/support-annotations/nuget/template.nuspec b/support-annotations/nuget/template.nuspec index 3e9f3f40..1c70c9a3 100644 --- a/support-annotations/nuget/template.nuspec +++ b/support-annotations/nuget/template.nuspec @@ -14,7 +14,9 @@ https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-annotations_128x128.png - + + + diff --git a/support-annotations/source/Annotations.csproj b/support-annotations/source/Annotations.csproj index d790b9f3..ee104f9e 100644 --- a/support-annotations/source/Annotations.csproj +++ b/support-annotations/source/Annotations.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Annotations - v7.0 + v8.0 diff --git a/support-compat/nuget/template.nuspec b/support-compat/nuget/template.nuspec index 1b284a0f..7170481e 100644 --- a/support-compat/nuget/template.nuspec +++ b/support-compat/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-compat_128x128.png - + - + - + diff --git a/support-compat/samples/AndroidSupportAll/AndroidSupportAll.csproj b/support-compat/samples/AndroidSupportAll/AndroidSupportAll.csproj index 0249ec03..4f0d907d 100644 --- a/support-compat/samples/AndroidSupportAll/AndroidSupportAll.csproj +++ b/support-compat/samples/AndroidSupportAll/AndroidSupportAll.csproj @@ -8,7 +8,7 @@ Library AndroidSupportAll AndroidSupportAll - v7.0 + v8.0 True Resources\Resource.designer.cs Resource diff --git a/support-compat/source/Additions/Additions.cs b/support-compat/source/Additions/Additions.cs index 2589a4c3..9f8f6763 100644 --- a/support-compat/source/Additions/Additions.cs +++ b/support-compat/source/Additions/Additions.cs @@ -52,10 +52,10 @@ public partial class Action return _GetRemoteInputs (); } - //public override global::Android.Support.V4.App.RemoteInputCompatBase.RemoteInput[] GetDataOnlyRemoteInputs() - //{ - // return _GetDataOnlyRemoteInputs(); - //} + public override global::Android.Support.V4.App.RemoteInputCompatBase.RemoteInput[] GetDataOnlyRemoteInputs() + { + return _GetDataOnlyRemoteInputs(); + } } } diff --git a/support-compat/source/Compat.csproj b/support-compat/source/Compat.csproj index dc03b9ec..ba1a6612 100644 --- a/support-compat/source/Compat.csproj +++ b/support-compat/source/Compat.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Compat - v7.0 + v8.0 @@ -61,6 +61,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/support-compat/source/Transforms/EnumMethods.xml b/support-compat/source/Transforms/EnumMethods.xml index b3b95d0d..c6dc95de 100644 --- a/support-compat/source/Transforms/EnumMethods.xml +++ b/support-compat/source/Transforms/EnumMethods.xml @@ -38,4 +38,9 @@ + + + + + diff --git a/support-compat/source/Transforms/Metadata.xml b/support-compat/source/Transforms/Metadata.xml index c57b289b..553da4c7 100644 --- a/support-compat/source/Transforms/Metadata.xml +++ b/support-compat/source/Transforms/Metadata.xml @@ -15,7 +15,7 @@ public protected - protected + protected protected protected protected @@ -54,5 +54,8 @@ + + + \ No newline at end of file diff --git a/support-core-ui/nuget/template.nuspec b/support-core-ui/nuget/template.nuspec index c5fab7e0..0b39ef26 100644 --- a/support-core-ui/nuget/template.nuspec +++ b/support-core-ui/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-core-ui_128x128.png - + - + - + diff --git a/support-core-ui/source/Core-UI.csproj b/support-core-ui/source/Core-UI.csproj index ae65f396..3d9f6c61 100644 --- a/support-core-ui/source/Core-UI.csproj +++ b/support-core-ui/source/Core-UI.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Core.UI - v7.0 + v8.0 @@ -61,6 +61,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/support-core-utils/nuget/template.nuspec b/support-core-utils/nuget/template.nuspec index c31f0c11..bb16cd1f 100644 --- a/support-core-utils/nuget/template.nuspec +++ b/support-core-utils/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-core-utils_128x128.png - + - + - + diff --git a/support-core-utils/source/Core-Utils.csproj b/support-core-utils/source/Core-Utils.csproj index 167af9ff..0a557fab 100644 --- a/support-core-utils/source/Core-Utils.csproj +++ b/support-core-utils/source/Core-Utils.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Core.Utils - v7.0 + v8.0 @@ -60,6 +60,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/support-dynamic-animation/nuget/template.nuspec b/support-dynamic-animation/nuget/template.nuspec index a366903a..92ca5b6c 100644 --- a/support-dynamic-animation/nuget/template.nuspec +++ b/support-dynamic-animation/nuget/template.nuspec @@ -13,15 +13,16 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/dynamic-animation_128x128.png - + + - + - + diff --git a/support-dynamic-animation/source/Additions/Additions.cs b/support-dynamic-animation/source/Additions/Additions.cs new file mode 100644 index 00000000..37bf8546 --- /dev/null +++ b/support-dynamic-animation/source/Additions/Additions.cs @@ -0,0 +1,86 @@ +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; + + 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 + { + } + } + } + + 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); + + __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; + + [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); + } + } + + 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); + + __JniCtorUtil.CtorImpl(this, typeof(FlingAnimation), class_ref, id_ctor_1, JNI_CTOR_1, __args, SetHandle); + } + } +} diff --git a/support-dynamic-animation/source/DynamicAnimation.csproj b/support-dynamic-animation/source/DynamicAnimation.csproj index 3e9ed119..23e751a1 100644 --- a/support-dynamic-animation/source/DynamicAnimation.csproj +++ b/support-dynamic-animation/source/DynamicAnimation.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Dynamic.Animation - v7.0 + v8.0 @@ -51,6 +51,7 @@ + @@ -59,6 +60,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + @@ -72,6 +76,12 @@ support-dynamic-animation.aar + + + {BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98} + Core-Utils + + diff --git a/support-emoji-appcompat/nuget/template.nuspec b/support-emoji-appcompat/nuget/template.nuspec index dd61e360..7f86cffc 100644 --- a/support-emoji-appcompat/nuget/template.nuspec +++ b/support-emoji-appcompat/nuget/template.nuspec @@ -13,16 +13,16 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-emoji-appcompat_128x128.png - + - + - + diff --git a/support-emoji-appcompat/source/Emoji-AppCompat.csproj b/support-emoji-appcompat/source/Emoji-AppCompat.csproj index e3d8b967..13b9925d 100644 --- a/support-emoji-appcompat/source/Emoji-AppCompat.csproj +++ b/support-emoji-appcompat/source/Emoji-AppCompat.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Emoji.AppCompat - v7.0 + v8.0 diff --git a/support-emoji-bundled/nuget/template.nuspec b/support-emoji-bundled/nuget/template.nuspec index eef35e69..eebc202c 100644 --- a/support-emoji-bundled/nuget/template.nuspec +++ b/support-emoji-bundled/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-emoji-bundled_128x128.png - + - + - + diff --git a/support-emoji-bundled/source/Emoji-Bundled.csproj b/support-emoji-bundled/source/Emoji-Bundled.csproj index aa7d35ca..f89da47e 100644 --- a/support-emoji-bundled/source/Emoji-Bundled.csproj +++ b/support-emoji-bundled/source/Emoji-Bundled.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Emoji.Bundled - v7.0 + v8.0 diff --git a/support-emoji/nuget/template.nuspec b/support-emoji/nuget/template.nuspec index e86de442..0fbb6680 100644 --- a/support-emoji/nuget/template.nuspec +++ b/support-emoji/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-emoji_128x128.png - + - + - + diff --git a/support-emoji/source/Emoji.csproj b/support-emoji/source/Emoji.csproj index 1ff7a252..3f8817ee 100644 --- a/support-emoji/source/Emoji.csproj +++ b/support-emoji/source/Emoji.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Emoji - v7.0 + v8.0 diff --git a/support-fragment/nuget/template.nuspec b/support-fragment/nuget/template.nuspec index 3615a15f..888a4e77 100644 --- a/support-fragment/nuget/template.nuspec +++ b/support-fragment/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-fragment_128x128.png - + @@ -22,9 +22,9 @@ - + - + diff --git a/support-fragment/source/Fragment.csproj b/support-fragment/source/Fragment.csproj index d7229b20..c9729cee 100644 --- a/support-fragment/source/Fragment.csproj +++ b/support-fragment/source/Fragment.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Fragment - v7.0 + v8.0 @@ -61,6 +61,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/support-media-compat/nuget/template.nuspec b/support-media-compat/nuget/template.nuspec index 020ee3d3..23ed7e2c 100644 --- a/support-media-compat/nuget/template.nuspec +++ b/support-media-compat/nuget/template.nuspec @@ -13,15 +13,15 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-media-compat_128x128.png - + - + - + diff --git a/support-media-compat/source/Media-Compat.csproj b/support-media-compat/source/Media-Compat.csproj index 6350be49..240ab842 100644 --- a/support-media-compat/source/Media-Compat.csproj +++ b/support-media-compat/source/Media-Compat.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Media.Compat - v7.0 + v8.0 @@ -60,6 +60,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/support-tv-provider/nuget/template.nuspec b/support-tv-provider/nuget/template.nuspec index ecd1d7a7..b00beec0 100644 --- a/support-tv-provider/nuget/template.nuspec +++ b/support-tv-provider/nuget/template.nuspec @@ -13,16 +13,16 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-tv-provider_128x128.png - + - + - + diff --git a/support-tv-provider/source/TV-Provider.csproj b/support-tv-provider/source/TV-Provider.csproj index d6deee22..da9245ce 100644 --- a/support-tv-provider/source/TV-Provider.csproj +++ b/support-tv-provider/source/TV-Provider.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.TV.Provider - v7.0 + v8.0 diff --git a/support-v13/nuget/template.nuspec b/support-v13/nuget/template.nuspec index 3f3cc44d..62a41821 100644 --- a/support-v13/nuget/template.nuspec +++ b/support-v13/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v13_128x128.png - + @@ -24,9 +24,9 @@ - + - + diff --git a/support-v13/samples/AndroidSupportSample/AndroidSupportSample.csproj b/support-v13/samples/AndroidSupportSample/AndroidSupportSample.csproj index e5c674d1..8c834d8e 100644 --- a/support-v13/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/support-v13/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -17,7 +17,7 @@ Assets AndroidSupportSample Properties\AndroidManifest.xml - v7.0 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/support-v13/source/V13.csproj b/support-v13/source/V13.csproj index 82d3fb10..ef90a81d 100644 --- a/support-v13/source/V13.csproj +++ b/support-v13/source/V13.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.v13 - v7.0 + v8.0 @@ -63,6 +63,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/support-v4/nuget/template.nuspec b/support-v4/nuget/template.nuspec index 983f8dce..f9111e52 100644 --- a/support-v4/nuget/template.nuspec +++ b/support-v4/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v4_128x128.png - + @@ -23,9 +23,9 @@ - + - + diff --git a/support-v4/samples/AndroidSupportSample/AndroidSupportSample.csproj b/support-v4/samples/AndroidSupportSample/AndroidSupportSample.csproj index 283e554d..3b39ab4f 100644 --- a/support-v4/samples/AndroidSupportSample/AndroidSupportSample.csproj +++ b/support-v4/samples/AndroidSupportSample/AndroidSupportSample.csproj @@ -17,7 +17,7 @@ Assets AndroidSupportSample Properties\AndroidManifest.xml - v7.0 + v8.0 armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 diff --git a/support-v4/source/V4.csproj b/support-v4/source/V4.csproj index f1383ad7..35788714 100644 --- a/support-v4/source/V4.csproj +++ b/support-v4/source/V4.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.v4 - v7.0 + v8.0 diff --git a/support-vector-drawable/nuget/template.nuspec b/support-vector-drawable/nuget/template.nuspec index 5e057d2b..9cd29d2e 100644 --- a/support-vector-drawable/nuget/template.nuspec +++ b/support-vector-drawable/nuget/template.nuspec @@ -13,16 +13,16 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/vector-drawable_128x128.png - + - - + + - + diff --git a/support-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj b/support-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj index 7d22bbb6..fcff9218 100644 --- a/support-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj +++ b/support-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj @@ -9,7 +9,7 @@ Library VectorDrawableSample VectorDrawableSample - v7.1 + v8.0 True Resources\Resource.designer.cs Resource diff --git a/support-vector-drawable/source/Vector-Drawable.csproj b/support-vector-drawable/source/Vector-Drawable.csproj index d90cd612..1fc9dda1 100644 --- a/support-vector-drawable/source/Vector-Drawable.csproj +++ b/support-vector-drawable/source/Vector-Drawable.csproj @@ -12,7 +12,7 @@ Assets False Xamarin.Android.Support.Vector.Drawable - v7.0 + v8.0 @@ -62,6 +62,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/tests/AndroidSupport.Tests/AndroidSupport.Tests.csproj b/tests/AndroidSupport.Tests/AndroidSupport.Tests.csproj index c0eb31ce..6b256853 100644 --- a/tests/AndroidSupport.Tests/AndroidSupport.Tests.csproj +++ b/tests/AndroidSupport.Tests/AndroidSupport.Tests.csproj @@ -9,7 +9,7 @@ Library AndroidSupport.Tests AndroidSupport.Tests - v7.0 + v8.0 True Resources\Resource.designer.cs Resource @@ -149,8 +149,8 @@ ..\..\output\Xamarin.Android.Support.Vector.Drawable.dll - - ..\..\output\Xamarin.Android.Support.InstantVideo.dll + + ..\..\output\Xamarin.Android.Support.Wear.dll diff --git a/transition/nuget/template.nuspec b/transition/nuget/template.nuspec index 0355a4f8..bcdbd32c 100644 --- a/transition/nuget/template.nuspec +++ b/transition/nuget/template.nuspec @@ -13,7 +13,7 @@ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/transition_128x128.png - + @@ -24,9 +24,9 @@ - - - + + + diff --git a/transition/source/Transition.csproj b/transition/source/Transition.csproj index df8bf905..9e98f624 100644 --- a/transition/source/Transition.csproj +++ b/transition/source/Transition.csproj @@ -11,7 +11,7 @@ Resources Assets Xamarin.Android.Support.Transition - v7.0 + v8.0 @@ -58,6 +58,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + diff --git a/wearable/nuget/template.nuspec b/wear/nuget/template.nuspec similarity index 63% rename from wearable/nuget/template.nuspec rename to wear/nuget/template.nuspec index 7a4abbcf..0afe5d54 100644 --- a/wearable/nuget/template.nuspec +++ b/wear/nuget/template.nuspec @@ -1,28 +1,28 @@ - Xamarin.Android.Support.Wearable - Xamarin Android Support Library - Wearable + Xamarin.Android.Support.Wear + Xamarin Android Support Library - Wear $version$ Xamarin Inc. Xamarin Inc. true - Wearable Android Support Library C# bindings for Xamarin + Wear Android Support Library C# bindings for Xamarin Copyright © Microsoft Corporation https://github.com/xamarin/AndroidSupportComponents/ https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md - https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/wearable_128x128.png + https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/wear_128x128.png - + - + - + diff --git a/wearable/source/Properties/AssemblyInfo.cs b/wear/source/Properties/AssemblyInfo.cs similarity index 94% rename from wearable/source/Properties/AssemblyInfo.cs rename to wear/source/Properties/AssemblyInfo.cs index bedfac9c..51075e8b 100644 --- a/wearable/source/Properties/AssemblyInfo.cs +++ b/wear/source/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle("Xamarin.Android.Support.Wearable")] +[assembly: AssemblyTitle("Xamarin.Android.Support.Wear")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany ("Microsoft Corporation")] diff --git a/instantvideo/source/Transforms/EnumFields.xml b/wear/source/Transforms/EnumFields.xml similarity index 100% rename from instantvideo/source/Transforms/EnumFields.xml rename to wear/source/Transforms/EnumFields.xml diff --git a/instantvideo/source/Transforms/EnumMethods.xml b/wear/source/Transforms/EnumMethods.xml similarity index 100% rename from instantvideo/source/Transforms/EnumMethods.xml rename to wear/source/Transforms/EnumMethods.xml diff --git a/wearable/source/Transforms/Metadata.xml b/wear/source/Transforms/Metadata.xml similarity index 82% rename from wearable/source/Transforms/Metadata.xml rename to wear/source/Transforms/Metadata.xml index 077cc157..fd0dda57 100644 --- a/wearable/source/Transforms/Metadata.xml +++ b/wear/source/Transforms/Metadata.xml @@ -7,4 +7,6 @@ dest flags + public + \ No newline at end of file diff --git a/wearable/source/Wearable.csproj b/wear/source/Wear.csproj similarity index 88% rename from wearable/source/Wearable.csproj rename to wear/source/Wear.csproj index f7f15913..5dd05afa 100644 --- a/wearable/source/Wearable.csproj +++ b/wear/source/Wear.csproj @@ -7,11 +7,11 @@ {F5E0D83F-81A8-40A9-9EFF-7605213AC743} {10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library - Android.Support.Wearable + Android.Support.Wear Resources Assets - Xamarin.Android.Support.Wearable - v7.0 + Xamarin.Android.Support.Wear + v8.0 @@ -58,6 +58,9 @@ Transforms\Metadata.generated.xml + + Transforms\Metadata.common.xml + @@ -67,8 +70,8 @@ - - wearable.aar + + wear.aar diff --git a/instantvideo/source/packages.config b/wear/source/packages.config similarity index 100% rename from instantvideo/source/packages.config rename to wear/source/packages.config diff --git a/wearable/source/Transforms/EnumFields.xml b/wearable/source/Transforms/EnumFields.xml deleted file mode 100644 index 75838fe7..00000000 --- a/wearable/source/Transforms/EnumFields.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/wearable/source/Transforms/EnumMethods.xml b/wearable/source/Transforms/EnumMethods.xml deleted file mode 100644 index 818878c9..00000000 --- a/wearable/source/Transforms/EnumMethods.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/wearable/source/packages.config b/wearable/source/packages.config deleted file mode 100644 index 6b8deb9c..00000000 --- a/wearable/source/packages.config +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file