Skip to content

Commit 3dda4b1

Browse files
committed
Merge conflict
2 parents 21cd008 + e3dfe03 commit 3dda4b1

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ InstagramApiSharp's private version - Under developing. Check [#243](https://git
1212
| Github | master | v2.8.6 | [v2.8.6](https://github.com/ramtinak/InstagramApiSharp/issues/244#issuecomment-913897699) |
1313

1414
-----
15-
InstagramApiSharp's public version - Update date: May 03, 2021 - End Of Support(from April 5, 2019)!!!
15+
InstagramApiSharp's public version - Update date: September 19, 2021 - End Of Support(from April 5, 2019)!!!
1616

1717
| Target | Branch | Version | Download link | Total downloads |
1818
| ------ | ------ | ------ | ------ | ------ |
19-
| 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) |
20-
| Release | master | v1.6.0 | [![Release](http://s9.picofile.com/file/8353468992/releases.PNG)](https://github.com/ramtinak/InstagramApiSharp/releases/latest) | |
19+
| 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) |
20+
| Release | master | v1.7.0 | [![Release](http://s9.picofile.com/file/8353468992/releases.PNG)](https://github.com/ramtinak/InstagramApiSharp/releases/latest) | |
2121

2222
## Note
2323
This library is based on [InstaSharper](https://github.com/a-legotin/InstaSharper) with more features and new cool things.

src/InstagramApiSharp/InstagramApiSharp.csproj

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;uap10.0;net461</TargetFrameworks>
5-
<VersionPrefix>1.6.0</VersionPrefix>
5+
<VersionPrefix>1.7.0</VersionPrefix>
66
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
77
<AssemblyName>InstagramApiSharp</AssemblyName>
88
<PackageId>InstagramApiSharp</PackageId>
@@ -11,9 +11,9 @@
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1313
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
14-
<Version>1.6.0.0</Version>
15-
<AssemblyVersion>1.6.0.0</AssemblyVersion>
16-
<FileVersion>1.6.0.0</FileVersion>
14+
<Version>1.7.0.0</Version>
15+
<AssemblyVersion>1.7.0.0</AssemblyVersion>
16+
<FileVersion>1.7.0.0</FileVersion>
1717
<Description>A complete Private Instagram API for .NET.
1818

1919

@@ -38,7 +38,18 @@ See example projects and wiki pages to find out how this library works.</Descrip
3838
<RepositoryType></RepositoryType>
3939
<RepositoryUrl>https://github.com/ramtinak/InstagramApiSharp/</RepositoryUrl>
4040
<PackageProjectUrl>https://github.com/ramtinak/InstagramApiSharp/</PackageProjectUrl>
41-
<PackageReleaseNotes>v1.6.0
41+
<PackageReleaseNotes>v1.7.0
42+
- [Drop support] for .NETFramework 4.5.2 and .NETStandard 1.3
43+
- [Update] api version to v180.0.0.31.119
44+
- [Update] library to recent changes in Instagram
45+
- [Update] LoginAsync
46+
- [Update] TwoFactorLoginAsync
47+
- [Update] LoginWithFacebookAsync
48+
- [Update] VerifyCodeForChallengeRequireAsync
49+
- [Update] ChangePasswordAsync
50+
- [Update] GetCurrentUserAsync [ thx to @u8989332 ]
51+
52+
v1.6.0
4253
- [Add] support for NETFramework4.6.1
4354
- [Add] GetEncryptedPassword to ExtensionHelper for .NETFramework 4.6.1 or newer and NETStandard 2.0 or newer
4455
- [Add] IRegistrationService and RegistrationService

0 commit comments

Comments
 (0)