ready for 0.6.4

neuecc · May 26, 2013 · 1e2a4ae · 1e2a4ae
1 parent a11a555
commit 1e2a4ae
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/AsyncOAuth.ConsoleApp/App.config b/AsyncOAuth.ConsoleApp/App.config
@@ -1,6 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.11.0" newVersion="1.5.11.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/AsyncOAuth.ConsoleApp/AsyncOAuth.ConsoleApp.csproj b/AsyncOAuth.ConsoleApp/AsyncOAuth.ConsoleApp.csproj
@@ -11,6 +11,8 @@
     <AssemblyName>AsyncOAuth.ConsoleApp</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,9 +34,24 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net45\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net45\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.1.6-rc\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.1.6-rc\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Security" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -50,6 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AsyncOAuth\AsyncOAuth.csproj">
@@ -58,6 +76,8 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.5\tools\Microsoft.Bcl.Build.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">

diff --git a/AsyncOAuth.ConsoleApp/packages.config b/AsyncOAuth.ConsoleApp/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl" version="1.0.19" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.5" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.1.6-rc" targetFramework="net45" />
+</packages>
diff --git a/AsyncOAuth.WindowsStoreApp/AsyncOAuth.WindowsStoreApp.csproj b/AsyncOAuth.WindowsStoreApp/AsyncOAuth.WindowsStoreApp.csproj
@@ -13,6 +13,8 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>AsyncOAuth.WindowsStoreApp_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -121,6 +123,7 @@
       <SubType>Designer</SubType>
     </AppxManifest>
     <None Include="AsyncOAuth.WindowsStoreApp_TemporaryKey.pfx" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\Logo.png" />
@@ -142,10 +145,27 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\win8\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\win8\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.1.6-rc\lib\win8\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.1.6-rc\lib\win8\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
     <VisualStudioVersion>11.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.5\tools\Microsoft.Bcl.Build.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">

diff --git a/AsyncOAuth.WindowsStoreApp/packages.config b/AsyncOAuth.WindowsStoreApp/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl" version="1.0.19" targetFramework="win" />
+  <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="win" />
+  <package id="Microsoft.Bcl.Build" version="1.0.5" targetFramework="win" />
+  <package id="Microsoft.Net.Http" version="2.1.6-rc" targetFramework="win" />
+</packages>
diff --git a/AsyncOAuth/Properties/AssemblyInfo.cs b/AsyncOAuth/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("ja")]
 
-[assembly: AssemblyVersion("0.6.3.0")]
-[assembly: AssemblyFileVersion("0.6.3.0")]
+[assembly: AssemblyVersion("0.6.4.0")]
+[assembly: AssemblyFileVersion("0.6.4.0")]
diff --git a/AsyncOAuth/Token.cs b/AsyncOAuth/Token.cs
@@ -3,6 +3,8 @@
 using System.Diagnostics;
 using System.Runtime.Serialization;
 
+#pragma warning disable 612, 618
+
 namespace AsyncOAuth
 {
     /// <summary>represents OAuth Token</summary>
@@ -16,7 +18,7 @@ public abstract class Token
         public string Secret { get; private set; }
 
         /// <summary>for serialize.</summary>
-        [Obsolete]
+        [Obsolete("this is used for serialize")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public Token()
         {
@@ -38,7 +40,7 @@ public Token(string key, string secret)
     public class AccessToken : Token
     {
         /// <summary>for serialize.</summary>
-        [Obsolete]
+        [Obsolete("this is used for serialize")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public AccessToken()
         {
@@ -57,7 +59,7 @@ public class RequestToken : Token
         /// <summary>
         /// for serialize.
         /// </summary>
-        [Obsolete]
+        [Obsolete("this is used for serialize")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public RequestToken()
         {
@@ -68,4 +70,6 @@ public RequestToken(string key, string secret)
             : base(key, secret)
         { }
     }
-}
+}
+
+#pragma warning restore 612, 618
diff --git a/Docs/AsyncOAuth.nuspec b/Docs/AsyncOAuth.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>AsyncOAuth</id>
-        <version>0.6.3-beta</version>
+        <version>0.6.4-beta</version>
         <title>AsyncOAuth</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>

diff --git a/Docs/push.bat b/Docs/push.bat
@@ -1 +1 @@
-nuget push AsyncOAuth.0.6.3-beta.nupkg
+nuget push AsyncOAuth.0.6.4-beta.nupkg
diff --git a/README.md b/README.md
@@ -99,6 +99,12 @@ public async static Task<AccessToken> AuthorizeSample(string consumerKey, string
 }
 ```
 
+History
+---
+ver.0.6.4 - 2013-05-27
+    update external library version.
+    improved:Token is serializable.
+
 License
 ---
-under [MIT License](http://opensource.org/licenses/MIT)
+under [MIT License](http://opensource.org/licenses/MIT)