From c966814484a1a1b418620acaa6c37dfa02dffdeb Mon Sep 17 00:00:00 2001
From: Martijn van Dijk <mhvdijk@gmail.com>
Date: Tue, 21 Apr 2020 23:35:49 +0200
Subject: [PATCH] Update release

---
 .gitignore                           |  4 +-
 Directory.build.props                | 70 ++++++++++++++--------------
 Directory.build.targets              |  4 +-
 Lottie.Android/Lottie.Android.csproj |  2 +-
 Lottie.Forms/Lottie.Forms.csproj     | 21 +++------
 Lottie.iOS/Lottie.iOS.csproj         |  2 +-
 Samples/Directory.build.targets      |  4 +-
 7 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6a9724..51a688b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -259,4 +259,6 @@ artifacts/
 .sonarqube/
 
 # dotnet tools
-.store/
\ No newline at end of file
+.store/
+
+.AssemblyAttributes
\ No newline at end of file
diff --git a/Directory.build.props b/Directory.build.props
index 339a4be..8470a56 100644
--- a/Directory.build.props
+++ b/Directory.build.props
@@ -2,25 +2,28 @@
   <PropertyGroup>
     <Copyright>Copyright (c) Martijn van Dijk</Copyright>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/martijn00/LottieXamarin</PackageProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/martijn00/LottieXamarin/develop/icon.png</PackageIconUrl>
-    <!--<PackageIcon>icon.png</PackageIcon>-->
+    <PackageProjectUrl>https://github.com/Baseflow/LottieXamarin</PackageProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/Baseflow/LottieXamarin/develop/icon.png</PackageIconUrl>
+    <!--<PackageIcon>icon.png</PackageIcon>
+    <PackageIconFullPath>$(MSBuildThisFileDirectory)icon.png</PackageIconFullPath>-->
     <Authors>Martijn van Dijk</Authors>
-    <Owners>martijn00</Owners>
+    <Owners>martijn00, Baseflow</Owners>
     <PackageTags>xamarin, monodroid, C#, xamarin.android, Forms, android, Lottie, animation, airbnb</PackageTags>
-    <PackageReleaseNotes>https://github.com/martijn00/LottieXamarin/releases</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/Baseflow/LottieXamarin/releases</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-
-    <RepositoryUrl>https://github.com/martijn00/LottieXamarin</RepositoryUrl>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <MinClientVersion>2.12</MinClientVersion>
+	
+	<PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <RepositoryUrl>https://github.com/Baseflow/LottieXamarin</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <NeutralLanguage>en</NeutralLanguage>
     <Version>3.0.0</Version>
-    <Platform>AnyCPU</Platform>
-
+	
     <!--<Nullable>enable</Nullable>-->
     <LangVersion>8.0</LangVersion>
-    <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;NU1603</NoWarn>
+    <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114;NU1603</NoWarn>
+    <Platform>AnyCPU</Platform>
 
     <IsTestProject>$(MSBuildProjectName.Contains('UnitTest'))</IsTestProject>
     <IsLibraryProject>$(MSBuildProjectName.Contains('Lottie'))</IsLibraryProject>
@@ -29,11 +32,22 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <!--<SymbolPackageFormat>snupkg</SymbolPackageFormat>-->
+    <IncludeSymbols>true</IncludeSymbols>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
     <DesignTimeBuild>false</DesignTimeBuild>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <GeneratePackageOnBuild Condition=" '$(IsTestProject)' != 'true'">true</GeneratePackageOnBuild>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
+
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <GeneratePackageOnBuild Condition=" '$(IsTestProject)' != 'true'">true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(IsTestProject)' != 'true' and'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <Deterministic>true</Deterministic>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -41,16 +55,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' And '$(OS)' == 'Windows_NT' ">
-    <!--<IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>-->
-
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(IsTestProject)' != 'true'">
+  <ItemGroup Condition="'$(IsLibraryProject)' == 'true'">
     <None Include="$(MSBuildThisFileDirectory)\LICENSE" Pack="true" PackagePath="\" />
     <None Include="$(MSBuildThisFileDirectory)\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
@@ -59,17 +64,14 @@
     <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
-  
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TargetsToBuild>All</TargetsToBuild> 
-    <!--<TargetsToBuild>Android</TargetsToBuild>-->
-    <!--<TargetsToBuild>Uap</TargetsToBuild>--> 
-    <!--<TargetsToBuild>iOS</TargetsToBuild>--> 
+
+  <PropertyGroup>
+    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
-    <TargetsToBuild>All</TargetsToBuild>
-  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Roslynator.Analyzers" Version="2.3.0">
@@ -80,10 +82,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="IDisposableAnalyzers" Version="3.3.1">
+    <!--<PackageReference Include="IDisposableAnalyzers" Version="3.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    </PackageReference>-->
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Directory.build.targets b/Directory.build.targets
index 886b4b2..d6fc7bd 100644
--- a/Directory.build.targets
+++ b/Directory.build.targets
@@ -10,8 +10,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
     <DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
     <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>
diff --git a/Lottie.Android/Lottie.Android.csproj b/Lottie.Android/Lottie.Android.csproj
index 63a68e0..f495eeb 100644
--- a/Lottie.Android/Lottie.Android.csproj
+++ b/Lottie.Android/Lottie.Android.csproj
@@ -7,7 +7,7 @@
     <PackageId>Com.Airbnb.Android.Lottie</PackageId>
     <IsBindingProject>true</IsBindingProject>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <Version>3.4.0</Version>
+    <Version>3.4.1</Version>
     
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <_EnableInterfaceMembers>true</_EnableInterfaceMembers>
diff --git a/Lottie.Forms/Lottie.Forms.csproj b/Lottie.Forms/Lottie.Forms.csproj
index bc04de4..41eed3a 100644
--- a/Lottie.Forms/Lottie.Forms.csproj
+++ b/Lottie.Forms/Lottie.Forms.csproj
@@ -1,14 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
-  <PropertyGroup Condition=" '$(TargetsToBuild)' == 'All' ">
+  <PropertyGroup>
     <TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;monoandroid10.0;tizen40</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.18362;$(TargetFrameworks)</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetsToBuild)' != 'All' ">
-    <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Android' ">netstandard2.0;monoandroid10.0;</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Uap' ">netstandard2.0;uap10.0.18362</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'iOS' ">netstandard2.0;xamarin.ios10</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Tizen' ">netstandard2.0;tizen40</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.17763;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -16,7 +9,7 @@
     <RootNamespace>Lottie.Forms</RootNamespace>
     <Description>Render After Effects animations natively on Android, iOS, MacOS, TVOs and UWP</Description>
     <PackageId>Com.Airbnb.Xamarin.Forms.Lottie</PackageId>
-    <Version>3.1.0</Version>
+    <Version>3.1.1</Version>
   </PropertyGroup>
   
   <ItemGroup>
@@ -50,7 +43,7 @@
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Ios\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
-    <PackageReference Condition=" '$(OS)' == 'Windows_NT' " Include="Com.Airbnb.iOS.Lottie" Version="2.5.10" />
+    <PackageReference Condition=" '$(OS)' == 'Windows_NT' " Include="Com.Airbnb.iOS.Lottie" Version="2.5.11" />
 	  <ProjectReference Condition=" '$(Configuration)' == 'Debug' And '$(OS)' != 'Windows_NT' " Include="..\Lottie.iOS\Lottie.iOS.csproj" />
   </ItemGroup>
 
@@ -58,7 +51,7 @@
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Mac\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
-    <PackageReference Condition=" '$(OS)' == 'Windows_NT' " Include="Com.Airbnb.iOS.Lottie" Version="2.5.10" />
+    <PackageReference Condition=" '$(OS)' == 'Windows_NT' " Include="Com.Airbnb.iOS.Lottie" Version="2.5.11" />
     <ProjectReference Condition=" '$(Configuration)' == 'Debug' And '$(OS)' != 'Windows_NT' " Include="..\Lottie.iOS\Lottie.iOS.csproj" />
   </ItemGroup>
 
@@ -66,7 +59,7 @@
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Tvos\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
-    <PackageReference Condition=" '$(OS)' == 'Windows_NT' " Include="Com.Airbnb.iOS.Lottie" Version="2.5.10" />
+    <PackageReference Condition=" '$(OS)' == 'Windows_NT' " Include="Com.Airbnb.iOS.Lottie" Version="2.5.11" />
     <ProjectReference Condition=" '$(Configuration)' == 'Debug' And '$(OS)' != 'Windows_NT' " Include="..\Lottie.iOS\Lottie.iOS.csproj" />
   </ItemGroup>
 
@@ -80,7 +73,7 @@
     <Compile Include="Platforms\Android\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
     <ProjectReference Include="..\Lottie.Android\Lottie.Android.csproj" />
-    <PackageReference Include="Xamarin.Build.Download" Version="0.9.0" PrivateAssets="All" />
+    <PackageReference Include="Xamarin.Build.Download" Version="0.10.0" PrivateAssets="All" />
     <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.1.0" />
   </ItemGroup>
 
diff --git a/Lottie.iOS/Lottie.iOS.csproj b/Lottie.iOS/Lottie.iOS.csproj
index 8815886..48bef49 100644
--- a/Lottie.iOS/Lottie.iOS.csproj
+++ b/Lottie.iOS/Lottie.iOS.csproj
@@ -9,7 +9,7 @@
     <IsBindingProject Condition=" '$(OS)' != 'Windows_NT' ">true</IsBindingProject>
     <EnableDefaultItems>false</EnableDefaultItems>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>2.5.10</Version>
+    <Version>2.5.11</Version>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/Samples/Directory.build.targets b/Samples/Directory.build.targets
index 886b4b2..d6fc7bd 100644
--- a/Samples/Directory.build.targets
+++ b/Samples/Directory.build.targets
@@ -10,8 +10,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
     <DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
     <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>