Skip to content

Commit

Permalink
Merge branch 'pr/39'
Browse files Browse the repository at this point in the history
  • Loading branch information
Yortw committed Jun 23, 2016
2 parents df397c5 + e12fffa commit dda918d
Show file tree
Hide file tree
Showing 7 changed files with 346 additions and 7 deletions.
13 changes: 8 additions & 5 deletions TweetMoaSharp.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>TweetMoaSharp</id>
<version>3.0.0.18</version>
<version>3.0.0.19</version>
<dependencies>
<group>
<dependency id="Newtonsoft.Json" version="6.0.8" />
Expand All @@ -25,6 +25,9 @@
<group targetFramework="sl4-wp71">
<dependency id="Newtonsoft.Json" version="5.0.8" />
</group>
<group targetFramework=".NETStandard1.0">
<dependency id="Newtonsoft.Json" version="8.0.1" />
</group>
</dependencies>
<authors>Daniel Crenna, Jason Diller and Troy Willmot</authors>
<owners>Troy Willmot</owners>
Expand All @@ -34,12 +37,12 @@
<projectUrl>https://github.com/Yortw/tweetmoasharp</projectUrl>
<licenseUrl>https://github.com/Yortw/tweetmoasharp/blob/master/LICENSE.md</licenseUrl>
<iconUrl>https://raw.githubusercontent.com/Yortw/tweetmoasharp/master/logo_tweetmoasharp.png</iconUrl>
<tags>twitter tweetmoasharp tweetsharp web api http rest wrapper json wp7 mango silverlight winrt uwp</tags>
<tags>twitter tweetmoasharp tweetsharp web api http rest wrapper json wp7 mango silverlight winrt uwp netcore netstandard10</tags>
<releaseNotes>
New in 3.0.0.18
New in 3.0.0.19
----------
- Fix for int vs long id's in friendships.
</releaseNotes>
- Now with .NetCore support! (netstandard1.0)
</releaseNotes>
</metadata>
<files>
<file src="**\*.*" exclude="**\Newtonsoft.*" />
Expand Down
36 changes: 36 additions & 0 deletions src/TweetSharp.NetCore/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TweetSharp")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Apitize")]
[assembly: AssemblyProduct("TweetSharp")]
[assembly: AssemblyCopyright("Copyright © 2011 Apitize")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b6239e8d-2833-4aae-a59b-77aa3b5c8335")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
260 changes: 260 additions & 0 deletions src/TweetSharp.NetCore/TweetSharp.NetCore.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TweetSharp</RootNamespace>
<AssemblyName>TweetSharp</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;PLATFORM_SUPPORTS_ASYNC_AWAIT;NET40;NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\bin\lib\netstandard1.0\</OutputPath>
<DefineConstants>TRACE;PLATFORM_SUPPORTS_ASYNC_AWAIT;NET40;NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\TweetSharp\key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>assembly.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
<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="..\TweetSharp\Globals.cs">
<Link>Globals.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\Helpers.cs">
<Link>Helpers.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\ICursored.cs">
<Link>ICursored.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\ITweetable.cs">
<Link>ITweetable.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\ITwitterModel.cs">
<Link>ITwitterModel.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\ITwitterService.cs">
<Link>ITwitterService.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\JsonConventionResolver.cs">
<Link>JsonConventionResolver.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\JsonSerializer.cs">
<Link>JsonSerializer.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\OAuthAccessToken.cs">
<Link>OAuthAccessToken.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\OAuthRequestToken.cs">
<Link>OAuthRequestToken.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\ObjectExtensions.cs">
<Link>ObjectExtensions.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\SerializerBase.cs">
<Link>SerializerBase.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\StringExtensions.cs">
<Link>StringExtensions.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TimeExtensions.cs">
<Link>TimeExtensions.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterAccount.cs">
<Link>TwitterAccount.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterAsyncResult.cs">
<Link>TwitterAsyncResult.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterClientInfo.cs">
<Link>TwitterClientInfo.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterConfiguration.cs">
<Link>TwitterConfiguration.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterConverterBase.cs">
<Link>TwitterConverterBase.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterCursorList.cs">
<Link>TwitterCursorList.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterDateFormat.cs">
<Link>TwitterDateFormat.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterDateTime.cs">
<Link>TwitterDateTime.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterDateTimeConverter.cs">
<Link>TwitterDateTimeConverter.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterDeliveryDevice.cs">
<Link>TwitterDeliveryDevice.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterDirectMessage.cs">
<Link>TwitterDirectMessage.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterEntities.cs">
<Link>TwitterEntities.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterEnums.cs">
<Link>TwitterEnums.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterError.cs">
<Link>TwitterError.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterErrors.cs">
<Link>TwitterErrors.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterFriend.cs">
<Link>TwitterFriend.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterFriendship.cs">
<Link>TwitterFriendship.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterGeoConverter.cs">
<Link>TwitterGeoConverter.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterGeoLocation.cs">
<Link>TwitterGeoLocation.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterGeoLocationSearch.cs">
<Link>TwitterGeoLocationSearch.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterList.cs">
<Link>TwitterList.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterLocalTrends.cs">
<Link>TwitterLocalTrends.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterPlace.cs">
<Link>TwitterPlace.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterRateLimitStatus.cs">
<Link>TwitterRateLimitStatus.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterRelationship.cs">
<Link>TwitterRelationship.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterResponse.cs">
<Link>TwitterResponse.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterSavedSearch.cs">
<Link>TwitterSavedSearch.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterSearchResult.cs">
<Link>TwitterSearchResult.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterService.cs">
<Link>TwitterService.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterService.generated.cs">
<Link>TwitterService.generated.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterService.OAuth.cs">
<Link>TwitterService.OAuth.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterService.Streaming.cs">
<Link>TwitterService.Streaming.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterSleepTime.cs">
<Link>TwitterSleepTime.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterStatus.cs">
<Link>TwitterStatus.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterTimeZone.cs">
<Link>TwitterTimeZone.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterTrend.cs">
<Link>TwitterTrend.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterTrends.cs">
<Link>TwitterTrends.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterUploadedMedia.cs">
<Link>TwitterUploadedMedia.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterUser.cs">
<Link>TwitterUser.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterUserStreams.cs">
<Link>TwitterUserStreams.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterUserSuggestions.cs">
<Link>TwitterUserSuggestions.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\TwitterWonkyBooleanConverter.cs">
<Link>TwitterWonkyBooleanConverter.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\WhereOnEarthLocation.cs">
<Link>WhereOnEarthLocation.cs</Link>
</Compile>
<Compile Include="..\TweetSharp\WhereOnEarthPlaceType.cs">
<Link>WhereOnEarthPlaceType.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="assembly.ico" />
</ItemGroup>
<ItemGroup>
<None Include="..\TweetSharp\key.snk">
<Link>key.snk</Link>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\hammock\src\net40\Hammock.ClientProfile\Hammock.ClientProfile.csproj">
<Project>{487b7e3c-9689-47bc-8785-73ccd92a3749}</Project>
<Name>Hammock.ClientProfile</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Binary file added src/TweetSharp.NetCore/assembly.ico
Binary file not shown.
5 changes: 5 additions & 0 deletions src/TweetSharp.NetCore/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="8.0.1" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
</packages>
37 changes: 36 additions & 1 deletion src/TweetSharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{DCC1FF
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetSharp.NetCore", "TweetSharp.NetCore\TweetSharp.NetCore.csproj", "{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
ClientProfiles|Any CPU = ClientProfiles|Any CPU
Expand Down Expand Up @@ -480,7 +482,8 @@ Global
{46B07B5B-DEDD-4609-AD5E-CCAF8D8B607E}.Mono|Mixed Platforms.Build.0 = Release|x86
{46B07B5B-DEDD-4609-AD5E-CCAF8D8B607E}.Mono|x86.ActiveCfg = Release|x86
{46B07B5B-DEDD-4609-AD5E-CCAF8D8B607E}.Mono|x86.Build.0 = Release|x86
{46B07B5B-DEDD-4609-AD5E-CCAF8D8B607E}.Release|Any CPU.ActiveCfg = Release|x86
{46B07B5B-DEDD-4609-AD5E-CCAF8D8B607E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46B07B5B-DEDD-4609-AD5E-CCAF8D8B607E}.Release|Any CPU.Build.0 = Release|Any CPU
{46B07B5B-DEDD-4609-AD5E-CCAF8D8B607E}.Release|ARM.ActiveCfg = Release|x86
{46B07B5B-DEDD-4609-AD5E-CCAF8D8B607E}.Release|Mixed Platforms.ActiveCfg = Release|x86
{46B07B5B-DEDD-4609-AD5E-CCAF8D8B607E}.Release|Mixed Platforms.Build.0 = Release|x86
Expand Down Expand Up @@ -582,6 +585,38 @@ Global
{6957E510-E0DE-4B11-8F0F-9B09F40B69CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6957E510-E0DE-4B11-8F0F-9B09F40B69CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6957E510-E0DE-4B11-8F0F-9B09F40B69CF}.Release|x86.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.ClientProfiles|Any CPU.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.ClientProfiles|Any CPU.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.ClientProfiles|ARM.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.ClientProfiles|ARM.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.ClientProfiles|Mixed Platforms.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.ClientProfiles|Mixed Platforms.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.ClientProfiles|x86.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.ClientProfiles|x86.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Debug|ARM.ActiveCfg = Debug|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Debug|ARM.Build.0 = Debug|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Debug|x86.ActiveCfg = Debug|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Debug|x86.Build.0 = Debug|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Mono|Any CPU.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Mono|Any CPU.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Mono|ARM.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Mono|ARM.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Mono|Mixed Platforms.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Mono|Mixed Platforms.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Mono|x86.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Mono|x86.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Release|Any CPU.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Release|ARM.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Release|ARM.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Release|x86.ActiveCfg = Release|Any CPU
{B6239E8D-2833-4AAE-A59B-77AA3B5C8335}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading

0 comments on commit dda918d

Please sign in to comment.