Merge conflict

ramtinak · Sep 19, 2021 · 3dda4b1 · 3dda4b1
2 parents 21cd008 + e3dfe03
commit 3dda4b1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -12,12 +12,12 @@ InstagramApiSharp's private version - Under developing. Check [#243](https://git
 | Github | master | v2.8.6 | [v2.8.6](https://github.com/ramtinak/InstagramApiSharp/issues/244#issuecomment-913897699) |
 
 -----
-InstagramApiSharp's public version - Update date: May 03, 2021 - End Of Support(from April 5, 2019)!!!
+InstagramApiSharp's public version - Update date: September 19, 2021 - End Of Support(from April 5, 2019)!!!
 
 | Target | Branch | Version | Download link | Total downloads |
 | ------ | ------ | ------ | ------ | ------ |
-| Nuget | master | v1.6.0 | [![NuGet](https://img.shields.io/nuget/v/InstagramApiSharp.svg)](https://www.nuget.org/packages/InstagramApiSharp) | [![NuGet downloads](https://img.shields.io/nuget/dt/InstagramApiSharp.svg)](https://www.nuget.org/packages/InstagramApiSharp) |
-| Release | master | v1.6.0 | [![Release](http://s9.picofile.com/file/8353468992/releases.PNG)](https://github.com/ramtinak/InstagramApiSharp/releases/latest) | |
+| Nuget | master | v1.7.0 | [![NuGet](https://img.shields.io/nuget/v/InstagramApiSharp.svg)](https://www.nuget.org/packages/InstagramApiSharp) | [![NuGet downloads](https://img.shields.io/nuget/dt/InstagramApiSharp.svg)](https://www.nuget.org/packages/InstagramApiSharp) |
+| Release | master | v1.7.0 | [![Release](http://s9.picofile.com/file/8353468992/releases.PNG)](https://github.com/ramtinak/InstagramApiSharp/releases/latest) | |
 
 ## Note
 This library is based on [InstaSharper](https://github.com/a-legotin/InstaSharper) with more features and new cool things.

diff --git a/src/InstagramApiSharp/InstagramApiSharp.csproj b/src/InstagramApiSharp/InstagramApiSharp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;uap10.0;net461</TargetFrameworks>
-    <VersionPrefix>1.6.0</VersionPrefix>
+    <VersionPrefix>1.7.0</VersionPrefix>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <AssemblyName>InstagramApiSharp</AssemblyName>
     <PackageId>InstagramApiSharp</PackageId>
@@ -11,9 +11,9 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.6.0.0</Version>
-    <AssemblyVersion>1.6.0.0</AssemblyVersion>
-    <FileVersion>1.6.0.0</FileVersion>
+    <Version>1.7.0.0</Version>
+    <AssemblyVersion>1.7.0.0</AssemblyVersion>
+    <FileVersion>1.7.0.0</FileVersion>
     <Description>A complete Private Instagram API for .NET.
 
 
@@ -38,7 +38,18 @@ See example projects and wiki pages to find out how this library works.</Descrip
     <RepositoryType></RepositoryType>
     <RepositoryUrl>https://github.com/ramtinak/InstagramApiSharp/</RepositoryUrl>
     <PackageProjectUrl>https://github.com/ramtinak/InstagramApiSharp/</PackageProjectUrl>
-    <PackageReleaseNotes>v1.6.0
+    <PackageReleaseNotes>v1.7.0
+- [Drop support] for .NETFramework 4.5.2 and .NETStandard 1.3
+- [Update] api version to v180.0.0.31.119
+- [Update] library to recent changes in Instagram
+- [Update] LoginAsync
+- [Update] TwoFactorLoginAsync
+- [Update] LoginWithFacebookAsync
+- [Update] VerifyCodeForChallengeRequireAsync
+- [Update] ChangePasswordAsync
+- [Update] GetCurrentUserAsync [ thx to @u8989332 ]
+
+v1.6.0
 - [Add] support for NETFramework4.6.1
 - [Add] GetEncryptedPassword to ExtensionHelper for .NETFramework 4.6.1 or newer and NETStandard 2.0 or newer
 - [Add] IRegistrationService and RegistrationService