Update to v25.1.0

.gitignore

@@ -15,7 +15,10 @@ output/
 *.xcuserstate
 *.xcuserstate
 *.csproj.user
+*/nuget/*.targets
+
 
 Resource.designer.cs
 component.yaml
 Details.md
+/generated.targets

AndroidSupport.sln

@@ -51,6 +51,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "support-med
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Transition", "transition\source\Transition.csproj", "{BF8F6617-A16E-43B8-9985-3D1066D1A081}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exif", "exifinterface\source\Exif.csproj", "{EBD7CBA0-E16C-460D-908C-89D453DDC556}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -157,5 +159,9 @@ Global
 		{BF8F6617-A16E-43B8-9985-3D1066D1A081}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF8F6617-A16E-43B8-9985-3D1066D1A081}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF8F6617-A16E-43B8-9985-3D1066D1A081}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

animated-vector-drawable/component/component.template.yaml

@@ -37,6 +37,8 @@ samples:
           - Xamarin.Android.Support.v7.AppCompat
           - Xamarin.Android.Support.Vector.Drawable
     removeNodes:
+      - "//xNS:Import[contains (@Project, 'Xamarin.Android.Support.Tasks.VectorDrawable.targets')]"
       - "//xNS:Import[contains (@Project, 'Xamarin.Android.Support.Vector.Drawable.targets')]"
+      - "//xNS:Import[contains (@Project, 'generated.targets')]"
 local-nuget-repo: ../../output
 no_build: true

animated-vector-drawable/nuget/Xamarin.Android.Support.Animated.Vector.Drawable.nuspec

@@ -13,10 +13,15 @@
     <licenseUrl>https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md</licenseUrl>
     <iconUrl>https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/animated-vector-drawable_128x128.png</iconUrl>
     <dependencies>
-      <dependency id="Xamarin.Android.Support.Vector.Drawable" version="[$version$]"/>
+      <group targetFramework="MonoAndroid70">
+        <dependency id="Xamarin.Build.Download" version="0.4.2" />
+        <dependency id="Xamarin.Android.Support.Vector.Drawable" version="[$version$]"/>
+      </group>
     </dependencies>
   </metadata>
   <files>
+    <file src="animated-vector-drawable/nuget/Xamarin.Android.Support.Animated.Vector.Drawable.targets" target="build/MonoAndroid70" />
+
     <file src="output/Xamarin.Android.Support.Animated.Vector.Drawable.dll" target="lib/MonoAndroid70" />
   </files>
 </package>

animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -51,6 +52,7 @@
     <None Include="Resources\AboutResources.txt" />
     <None Include="Properties\AndroidManifest.xml" />
     <None Include="Assets\AboutAssets.txt" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\Main.axml" />
@@ -101,5 +103,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\..\..\vector-drawable\buildtask\bin\Release\Xamarin.Android.Support.Vector.Drawable.targets" />
-</Project>
+  <Import Project="..\..\..\vector-drawable\buildtask\bin\Release\Xamarin.Android.Support.Tasks.VectorDrawable.targets" />
+  <Import Project="..\..\..\generated.targets" />
+  <Import Project="..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets')" />
+</Project>

animated-vector-drawable/samples/VectorDrawableSample/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Xamarin.Build.Download" version="0.4.2" targetFramework="monoandroid70" />
+</packages>

animated-vector-drawable/source/Animated-Vector-Drawable.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -51,12 +52,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\SupportConsts.cs">
-      <Link>Properties\SupportConsts.cs</Link>
-    </Compile>
     <Compile Include="Additions\Additions.cs" />
   </ItemGroup>
   <ItemGroup>
+    <TransformFile Include="..\..\Metadata.generated.xml" />
     <TransformFile Include="Transforms\EnumFields.xml" />
     <TransformFile Include="Transforms\EnumMethods.xml" />
     <TransformFile Include="Transforms\Metadata.xml" />
@@ -77,7 +76,12 @@
     </InputJar>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
+  <Import Project="..\..\generated.targets" />
   <ItemGroup>
     <Folder Include="Additions\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets')" />
 </Project>

animated-vector-drawable/source/Properties/AssemblyInfo.cs

@@ -20,22 +20,3 @@
 // if desired. See the Mono documentation for more information about signing.
 //[assembly: AssemblyDelaySign(false)]
 //[assembly: AssemblyKeyFile("")]
-
-// GridLayout-v7
-[assembly: Java.Interop.JavaLibraryReference ("classes.jar",
-	PackageName = __SupportConsts.PackageName,
-    SourceUrl = __SupportConsts.Url,
-	EmbeddedArchive = __Consts.AarPath,
-    Version = __SupportConsts.Version,
-    Sha1sum = __SupportConsts.Sha1sum)]
-// GridLayout-v7 resources
-[assembly: Android.IncludeAndroidResourcesFromAttribute ("./",
-	PackageName = __SupportConsts.PackageName,
-    SourceUrl   = __SupportConsts.Url,
-	EmbeddedArchive = __Consts.AarPath,
-    Version     = __SupportConsts.Version,
-    Sha1sum = __SupportConsts.Sha1sum)]
-
-static class __Consts {
-    public const string AarPath = "m2repository/com/android/support/animated-vector-drawable/" + __SupportConsts.AarVersion + "/animated-vector-drawable-" + __SupportConsts.AarVersion + ".aar";
-}

animated-vector-drawable/source/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Xamarin.Build.Download" version="0.4.2" targetFramework="monoandroid70" />
+</packages>