Skip to content

Switch from .NET 4.6 -> .NET Standard 2.0 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neipo13 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Switch from .NET 4.6 -> .NET Standard 2.0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b33764
initial conversion test
neipo13 Jun 14, 2018
2bb1eb5
updated gitognore
ScottGimpel Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
/*/v15/*
*/.vs/*
*.nupkg
*/packages/*
5 changes: 2 additions & 3 deletions FantasyData.Api.Client/Clients/BaseClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization.Json;
using System.Web.Script.Serialization;
using Newtonsoft.Json;

namespace FantasyData.Api.Client
{
Expand Down Expand Up @@ -60,8 +60,7 @@ protected T Get<T>(string apiCall, IList<KeyValuePair<string, string>> parameter

// Download json, deserialize it, and return it
var json = client.DownloadString(url);
var serializer = new JavaScriptSerializer() { MaxJsonLength = int.MaxValue };
return serializer.Deserialize<T>(json);
return JsonConvert.DeserializeObject<T>(json);

}

Expand Down
322 changes: 7 additions & 315 deletions FantasyData.Api.Client/FantasyData.Api.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,319 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4917F563-EC8F-4E15-B08A-E18B514A3960}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FantasyData.Api.Client</RootNamespace>
<AssemblyName>FantasyData.Api.Client</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Clients\BaseClient.cs" />
<Compile Include="Clients\CBB\CBBv2.cs" />
<Compile Include="Clients\CBB\CBBv3Scores.cs" />
<Compile Include="Clients\CBB\CBBv3Stats.cs" />
<Compile Include="Clients\CFB\CFBv3Scores.cs" />
<Compile Include="Clients\CFB\CFBv3Stats.cs" />
<Compile Include="Clients\Golf\Golfv2.cs" />
<Compile Include="Clients\MLB\MLBv2.cs" />
<Compile Include="Clients\MLB\MLBv3PlayByPlay.cs" />
<Compile Include="Clients\MLB\MLBv3Projections.cs" />
<Compile Include="Clients\MLB\MLBv3ProjectionsDfsr.cs" />
<Compile Include="Clients\MLB\MLBv3RotoBallerArticles.cs" />
<Compile Include="Clients\MLB\MLBv3RotoBallerPremiumNews.cs" />
<Compile Include="Clients\MLB\MLBv3Scores.cs" />
<Compile Include="Clients\MLB\MLBv3Stats.cs" />
<Compile Include="Clients\Nascar\NASCARv2.cs" />
<Compile Include="Clients\NBA\NBAv2.cs" />
<Compile Include="Clients\NBA\NBAv3PlayByPlay.cs" />
<Compile Include="Clients\NBA\NBAv3Projections.cs" />
<Compile Include="Clients\NBA\NBAv3RotoBallerArticles.cs" />
<Compile Include="Clients\NBA\NBAv3RotoBallerPremiumNews.cs" />
<Compile Include="Clients\NBA\NBAv3Scores.cs" />
<Compile Include="Clients\NBA\NBAv3Stats.cs" />
<Compile Include="Clients\NFLv3\NFLv3PlayByPlay.cs" />
<Compile Include="Clients\NFLv3\NFLv3Projections.cs" />
<Compile Include="Clients\NFLv3\NFLv3ProjectionsDfsr.cs" />
<Compile Include="Clients\NFLv3\NFLv3RotoBallerArticles.cs" />
<Compile Include="Clients\NFLv3\NFLv3RotoBallerPremiumNews.cs" />
<Compile Include="Clients\NFLv3\NFLv3Scores.cs" />
<Compile Include="Clients\NFLv3\NFLv3Stats.cs" />
<Compile Include="Clients\NHL\NHLv2.cs" />
<Compile Include="Clients\NHL\NHLv3PlayByPlay.cs" />
<Compile Include="Clients\NHL\NHLv3Projections.cs" />
<Compile Include="Clients\NHL\NHLv3Scores.cs" />
<Compile Include="Clients\NHL\NHLv3Stats.cs" />
<Compile Include="Clients\Soccer\Soccerv2.cs" />
<Compile Include="Clients\Soccer\Soccerv3Projections.cs" />
<Compile Include="Clients\Soccer\Soccerv3Scores.cs" />
<Compile Include="Clients\Soccer\Soccerv3Stats.cs" />
<Compile Include="Model\ApiException.cs" />
<Compile Include="Model\CBB\BoxScore.cs" />
<Compile Include="Model\CBB\Conference.cs" />
<Compile Include="Model\CBB\Game.cs" />
<Compile Include="Model\CBB\GameStat.cs" />
<Compile Include="Model\CBB\Injury.cs" />
<Compile Include="Model\CBB\News.cs" />
<Compile Include="Model\CBB\Period.cs" />
<Compile Include="Model\CBB\Player.cs" />
<Compile Include="Model\CBB\PlayerGame.cs" />
<Compile Include="Model\CBB\PlayerGameProjection.cs" />
<Compile Include="Model\CBB\PlayerSeason.cs" />
<Compile Include="Model\CBB\PlayerSeasonProjection.cs" />
<Compile Include="Model\CBB\Season.cs" />
<Compile Include="Model\CBB\Stadium.cs" />
<Compile Include="Model\CBB\Standing.cs" />
<Compile Include="Model\CBB\Stat.cs" />
<Compile Include="Model\CBB\Team.cs" />
<Compile Include="Model\CBB\TeamGame.cs" />
<Compile Include="Model\CBB\TeamSeason.cs" />
<Compile Include="Model\CBB\Tournament.cs" />
<Compile Include="Model\CFB\BoxScore.cs" />
<Compile Include="Model\CFB\Conference.cs" />
<Compile Include="Model\CFB\Game.cs" />
<Compile Include="Model\CFB\GameStat.cs" />
<Compile Include="Model\CFB\Injury.cs" />
<Compile Include="Model\CFB\News.cs" />
<Compile Include="Model\CFB\Period.cs" />
<Compile Include="Model\CFB\Player.cs" />
<Compile Include="Model\CFB\PlayerGame.cs" />
<Compile Include="Model\CFB\PlayerGameProjection.cs" />
<Compile Include="Model\CFB\PlayerSeason.cs" />
<Compile Include="Model\CFB\PlayerSeasonProjection.cs" />
<Compile Include="Model\CFB\Season.cs" />
<Compile Include="Model\CFB\Stadium.cs" />
<Compile Include="Model\CFB\Standing.cs" />
<Compile Include="Model\CFB\Stat.cs" />
<Compile Include="Model\CFB\Team.cs" />
<Compile Include="Model\CFB\TeamGame.cs" />
<Compile Include="Model\CFB\TeamSeason.cs" />
<Compile Include="Model\Golf\DfsSlate.cs" />
<Compile Include="Model\Golf\DfsSlatePlayer.cs" />
<Compile Include="Model\Golf\DfsSlateTournament.cs" />
<Compile Include="Model\Golf\Injury.cs" />
<Compile Include="Model\Golf\Leaderboard.cs" />
<Compile Include="Model\Golf\News.cs" />
<Compile Include="Model\Golf\Player.cs" />
<Compile Include="Model\Golf\PlayerHole.cs" />
<Compile Include="Model\Golf\PlayerRound.cs" />
<Compile Include="Model\Golf\PlayerSeason.cs" />
<Compile Include="Model\Golf\PlayerTournament.cs" />
<Compile Include="Model\Golf\PlayerTournamentProjection.cs" />
<Compile Include="Model\Golf\Round.cs" />
<Compile Include="Model\Golf\Tournament.cs" />
<Compile Include="Model\MLB\Article.cs" />
<Compile Include="Model\MLB\BoxScore.cs" />
<Compile Include="Model\MLB\DfsSlate.cs" />
<Compile Include="Model\MLB\DfsSlateGame.cs" />
<Compile Include="Model\MLB\DfsSlatePlayer.cs" />
<Compile Include="Model\MLB\Game.cs" />
<Compile Include="Model\MLB\GameStat.cs" />
<Compile Include="Model\MLB\Inning.cs" />
<Compile Include="Model\MLB\News.cs" />
<Compile Include="Model\MLB\Pitch.cs" />
<Compile Include="Model\MLB\Play.cs" />
<Compile Include="Model\MLB\PlayByPlay.cs" />
<Compile Include="Model\MLB\Player.cs" />
<Compile Include="Model\MLB\PlayerGame.cs" />
<Compile Include="Model\MLB\PlayerGameProjection.cs" />
<Compile Include="Model\MLB\PlayerInfo.cs" />
<Compile Include="Model\MLB\PlayerSeason.cs" />
<Compile Include="Model\MLB\PlayerSeasonProjection.cs" />
<Compile Include="Model\MLB\Season.cs" />
<Compile Include="Model\MLB\Stadium.cs" />
<Compile Include="Model\MLB\Standing.cs" />
<Compile Include="Model\MLB\Stat.cs" />
<Compile Include="Model\MLB\Team.cs" />
<Compile Include="Model\MLB\TeamGame.cs" />
<Compile Include="Model\MLB\TeamSeason.cs" />
<Compile Include="Model\Nascar\Driver.cs" />
<Compile Include="Model\Nascar\DriverRace.cs" />
<Compile Include="Model\Nascar\DriverRaceProjection.cs" />
<Compile Include="Model\Nascar\DriverSeason.cs" />
<Compile Include="Model\Nascar\News.cs" />
<Compile Include="Model\Nascar\Race.cs" />
<Compile Include="Model\Nascar\RaceResult.cs" />
<Compile Include="Model\Nascar\RaceStat.cs" />
<Compile Include="Model\Nascar\Series.cs" />
<Compile Include="Model\Nascar\Stat.cs" />
<Compile Include="Model\NBA\Article.cs" />
<Compile Include="Model\NBA\BoxScore.cs" />
<Compile Include="Model\NBA\DfsSlate.cs" />
<Compile Include="Model\NBA\DfsSlateGame.cs" />
<Compile Include="Model\NBA\DfsSlatePlayer.cs" />
<Compile Include="Model\NBA\Game.cs" />
<Compile Include="Model\NBA\GameStat.cs" />
<Compile Include="Model\NBA\Injury.cs" />
<Compile Include="Model\NBA\News.cs" />
<Compile Include="Model\NBA\OpponentSeason.cs" />
<Compile Include="Model\NBA\Play.cs" />
<Compile Include="Model\NBA\PlayByPlay.cs" />
<Compile Include="Model\NBA\Player.cs" />
<Compile Include="Model\NBA\PlayerGame.cs" />
<Compile Include="Model\NBA\PlayerGameProjection.cs" />
<Compile Include="Model\NBA\PlayerInfo.cs" />
<Compile Include="Model\NBA\PlayerSeason.cs" />
<Compile Include="Model\NBA\PlayerSeasonProjection.cs" />
<Compile Include="Model\NBA\Quarter.cs" />
<Compile Include="Model\NBA\Season.cs" />
<Compile Include="Model\NBA\Stadium.cs" />
<Compile Include="Model\NBA\Standing.cs" />
<Compile Include="Model\NBA\Stat.cs" />
<Compile Include="Model\NBA\Team.cs" />
<Compile Include="Model\NBA\TeamGame.cs" />
<Compile Include="Model\NBA\TeamSeason.cs" />
<Compile Include="Model\NFLv3\Article.cs" />
<Compile Include="Model\NFLv3\BoxScore.cs" />
<Compile Include="Model\NFLv3\BoxScorePlayer.cs" />
<Compile Include="Model\NFLv3\BoxScoreV3.cs" />
<Compile Include="Model\NFLv3\Bye.cs" />
<Compile Include="Model\NFLv3\DailyFantasyPlayer.cs" />
<Compile Include="Model\NFLv3\DailyFantasyScoring.cs" />
<Compile Include="Model\NFLv3\DfsSlate.cs" />
<Compile Include="Model\NFLv3\DfsSlateGame.cs" />
<Compile Include="Model\NFLv3\DfsSlatePlayer.cs" />
<Compile Include="Model\NFLv3\FantasyDefenseGame.cs" />
<Compile Include="Model\NFLv3\FantasyDefenseGameProjection.cs" />
<Compile Include="Model\NFLv3\FantasyDefenseGameProjectionDfsr.cs" />
<Compile Include="Model\NFLv3\FantasyDefenseSeason.cs" />
<Compile Include="Model\NFLv3\FantasyDefenseSeasonProjection.cs" />
<Compile Include="Model\NFLv3\FantasyPlayer.cs" />
<Compile Include="Model\NFLv3\Game.cs" />
<Compile Include="Model\NFLv3\Injury.cs" />
<Compile Include="Model\NFLv3\News.cs" />
<Compile Include="Model\NFLv3\Play.cs" />
<Compile Include="Model\NFLv3\PlayByPlay.cs" />
<Compile Include="Model\NFLv3\Player.cs" />
<Compile Include="Model\NFLv3\PlayerDefense.cs" />
<Compile Include="Model\NFLv3\PlayerDetail.cs" />
<Compile Include="Model\NFLv3\PlayerGame.cs" />
<Compile Include="Model\NFLv3\PlayerGameProjection.cs" />
<Compile Include="Model\NFLv3\PlayerGameProjectionDfsr.cs" />
<Compile Include="Model\NFLv3\PlayerGameRedZone.cs" />
<Compile Include="Model\NFLv3\PlayerInfo.cs" />
<Compile Include="Model\NFLv3\PlayerKicking.cs" />
<Compile Include="Model\NFLv3\PlayerKickPuntReturns.cs" />
<Compile Include="Model\NFLv3\PlayerOwnership.cs" />
<Compile Include="Model\NFLv3\PlayerPassing.cs" />
<Compile Include="Model\NFLv3\PlayerPunting.cs" />
<Compile Include="Model\NFLv3\PlayerReceiving.cs" />
<Compile Include="Model\NFLv3\PlayerRushing.cs" />
<Compile Include="Model\NFLv3\PlayerSeason.cs" />
<Compile Include="Model\NFLv3\PlayerSeasonProjection.cs" />
<Compile Include="Model\NFLv3\PlayerSeasonRedZone.cs" />
<Compile Include="Model\NFLv3\PlayerSeasonThirdDown.cs" />
<Compile Include="Model\NFLv3\PlayStat.cs" />
<Compile Include="Model\NFLv3\Quarter.cs" />
<Compile Include="Model\NFLv3\Schedule.cs" />
<Compile Include="Model\NFLv3\Score.cs" />
<Compile Include="Model\NFLv3\ScoringDetail.cs" />
<Compile Include="Model\NFLv3\ScoringPlay.cs" />
<Compile Include="Model\NFLv3\Stadium.cs" />
<Compile Include="Model\NFLv3\Standing.cs" />
<Compile Include="Model\NFLv3\Team.cs" />
<Compile Include="Model\NFLv3\TeamGame.cs" />
<Compile Include="Model\NFLv3\TeamSeason.cs" />
<Compile Include="Model\NFLv3\Timeframe.cs" />
<Compile Include="Model\NHL\BoxScore.cs" />
<Compile Include="Model\NHL\DfsSlate.cs" />
<Compile Include="Model\NHL\DfsSlateGame.cs" />
<Compile Include="Model\NHL\DfsSlatePlayer.cs" />
<Compile Include="Model\NHL\Game.cs" />
<Compile Include="Model\NHL\GameStat.cs" />
<Compile Include="Model\NHL\News.cs" />
<Compile Include="Model\NHL\OpponentSeason.cs" />
<Compile Include="Model\NHL\Penalty.cs" />
<Compile Include="Model\NHL\Period.cs" />
<Compile Include="Model\NHL\Play.cs" />
<Compile Include="Model\NHL\PlayByPlay.cs" />
<Compile Include="Model\NHL\Player.cs" />
<Compile Include="Model\NHL\PlayerGame.cs" />
<Compile Include="Model\NHL\PlayerGameProjection.cs" />
<Compile Include="Model\NHL\PlayerLine.cs" />
<Compile Include="Model\NHL\PlayerSeason.cs" />
<Compile Include="Model\NHL\PlayerSeasonProjection.cs" />
<Compile Include="Model\NHL\ScoringPlay.cs" />
<Compile Include="Model\NHL\Season.cs" />
<Compile Include="Model\NHL\Stadium.cs" />
<Compile Include="Model\NHL\Standing.cs" />
<Compile Include="Model\NHL\Stat.cs" />
<Compile Include="Model\NHL\Team.cs" />
<Compile Include="Model\NHL\TeamGame.cs" />
<Compile Include="Model\NHL\TeamLine.cs" />
<Compile Include="Model\NHL\TeamSeason.cs" />
<Compile Include="Model\Soccer\Area.cs" />
<Compile Include="Model\Soccer\Booking.cs" />
<Compile Include="Model\Soccer\BoxScore.cs" />
<Compile Include="Model\Soccer\Coach.cs" />
<Compile Include="Model\Soccer\Competition.cs" />
<Compile Include="Model\Soccer\CompetitionDetail.cs" />
<Compile Include="Model\Soccer\Game.cs" />
<Compile Include="Model\Soccer\GameStat.cs" />
<Compile Include="Model\Soccer\Goal.cs" />
<Compile Include="Model\Soccer\Lineup.cs" />
<Compile Include="Model\Soccer\Membership.cs" />
<Compile Include="Model\Soccer\PenaltyShootout.cs" />
<Compile Include="Model\Soccer\Player.cs" />
<Compile Include="Model\Soccer\PlayerGame.cs" />
<Compile Include="Model\Soccer\PlayerGameProjection.cs" />
<Compile Include="Model\Soccer\PlayerSeason.cs" />
<Compile Include="Model\Soccer\PlayerSeasonProjection.cs" />
<Compile Include="Model\Soccer\Referee.cs" />
<Compile Include="Model\Soccer\Round.cs" />
<Compile Include="Model\Soccer\Season.cs" />
<Compile Include="Model\Soccer\SeasonTeam.cs" />
<Compile Include="Model\Soccer\Standing.cs" />
<Compile Include="Model\Soccer\Stat.cs" />
<Compile Include="Model\Soccer\Team.cs" />
<Compile Include="Model\Soccer\TeamDetail.cs" />
<Compile Include="Model\Soccer\TeamGame.cs" />
<Compile Include="Model\Soccer\TeamSeason.cs" />
<Compile Include="Model\Soccer\Venue.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Clients\SampleClient.cs" />
</ItemGroup>

<ItemGroup>
<None Include="FantasyData.Api.Client.csproj.nuspec">
<SubType>Designer</SubType>
</None>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>
21 changes: 0 additions & 21 deletions FantasyData.Api.Client/FantasyData.Api.Client.csproj.nuspec
View file
Open in desktop

This file was deleted.

Loading