Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	NewsAPI.Net/NewsAPI.Net.csproj
  • Loading branch information
CircuitRCAY committed Mar 17, 2019
2 parents d462db4 + c3fd2ed commit aac2cdb
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 9 deletions.
7 changes: 7 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright 2019 The-Grape-Vine

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28 changes: 22 additions & 6 deletions NewsAPI.Net.sln
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewsAPI.Net", "NewsAPI.Net\NewsAPI.Net.csproj", "{EAD6AD89-5094-46E2-AA15-5E5644AA0A3B}"
# Visual Studio 15
VisualStudioVersion = 15.0.28307.421
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewsAPI.Net", "NewsAPI.Net\NewsAPI.Net.csproj", "{EAD6AD89-5094-46E2-AA15-5E5644AA0A3B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewsAPI.Net.Tests", "NewsAPI.Net.Tests\NewsAPI.Net.Tests.csproj", "{D973CA85-6E44-498A-955F-E5F64B4B24DC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewsAPI.Net.Tests", "NewsAPI.Net.Tests\NewsAPI.Net.Tests.csproj", "{645DF89E-3AEB-4685-AEC3-3BCF3497E047}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{39DCF869-D144-40D6-AE7C-695B75C05E5C}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
LICENSE = LICENSE
README.md = README.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -14,9 +24,15 @@ Global
{EAD6AD89-5094-46E2-AA15-5E5644AA0A3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EAD6AD89-5094-46E2-AA15-5E5644AA0A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EAD6AD89-5094-46E2-AA15-5E5644AA0A3B}.Release|Any CPU.Build.0 = Release|Any CPU
{D973CA85-6E44-498A-955F-E5F64B4B24DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D973CA85-6E44-498A-955F-E5F64B4B24DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D973CA85-6E44-498A-955F-E5F64B4B24DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D973CA85-6E44-498A-955F-E5F64B4B24DC}.Release|Any CPU.Build.0 = Release|Any CPU
{645DF89E-3AEB-4685-AEC3-3BCF3497E047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{645DF89E-3AEB-4685-AEC3-3BCF3497E047}.Debug|Any CPU.Build.0 = Debug|Any CPU
{645DF89E-3AEB-4685-AEC3-3BCF3497E047}.Release|Any CPU.ActiveCfg = Release|Any CPU
{645DF89E-3AEB-4685-AEC3-3BCF3497E047}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {04F6E8D6-A9C1-4211-8AB7-619D8C001E5D}
EndGlobalSection
EndGlobal
20 changes: 17 additions & 3 deletions NewsAPI.Net/NewsAPI.Net.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<Version>2.1.0</Version>
<TargetFrameworks>netcoreapp2.1;netstandard2.0;net472</TargetFrameworks>
<Company />
<Version>2.0.0</Version>
<PackageLicenseUrl>https://github.com/The-Grape-Vine/NewsAPI.Net/blob/master/LICENSE</PackageLicenseUrl>
<Authors>CircuitRCAY</Authors>
<Copyright>Copyright 2019-present The Grape Vine</Copyright>
<RepositoryUrl>https://github.com/The-Grape-Vine/NewsAPI.Net/</RepositoryUrl>
<PackageProjectUrl>https://circuitrcay.com</PackageProjectUrl>
<PackageTags>news</PackageTags>
<Description>A C# library wrapping https://newsapi.org</Description>
<PackageReleaseNotes>Released 2.0.0, a major refactor in the core implementation.</PackageReleaseNotes>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Flurl.Http" Version="2.4.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
</ItemGroup>

<ItemGroup>
<Reference Include="System.Web.HttpUtility, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
<HintPath>..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.1.0\ref\netcoreapp2.1\System.Web.HttpUtility.dll</HintPath>
</Reference>
</ItemGroup>

</Project>
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# NewsAPI.Net

NewsAPI.Net is an alternative .NET api wrapper for https://newsapi.org.

## How to Use

First get an API key from https://newsapi.org/

```cs
var api = new NewsAPIClient("api-key");

var sources = await api.GetSourcesAsync();

var everything = await api.GetEverythingAsync("bitcoin", "sources", "domains");

var topHeadlines = await api.GetTopHeadlinesAsync("dotnet", "sources", "domains");
```

# Documentation
- under construction

0 comments on commit aac2cdb

Please sign in to comment.