Merge branch 'RickZee-master'

TerribleDev · May 4, 2016 · 02bb482 · 02bb482
2 parents 7f4684d + d92c907
commit 02bb482
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/OwinOAuthProviders.sln b/OwinOAuthProviders.sln
@@ -94,6 +94,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.Security.Providers.Orc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OwinOAuthProvidersDemo", "OwinOAuthProvidersDemo\OwinOAuthProvidersDemo.csproj", "{5A438007-0C90-4DAC-BAA1-54A32164067F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin.Security.Providers.Orcid", "src\Owin.Security.Providers.Orcid\Owin.Security.Providers.Orcid.csproj", "{89CB4342-E23D-4E7C-89E5-C369599A5860}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/OwinOAuthProvidersDemo/App_Start/Startup.Auth.cs b/OwinOAuthProvidersDemo/App_Start/Startup.Auth.cs
@@ -278,4 +278,4 @@ public void ConfigureAuth(IAppBuilder app)
 			//app.UseOrcidAuthentication("APP-QQ4XO1AYU3WR696B", "6bb22d2e-71b3-4d5d-b1af-f5d3a8cd4270");
 		}
 	}
-}
+}
diff --git a/src/Owin.Security.Providers.Orcid/Owin.Security.Providers.Orcid.csproj b/src/Owin.Security.Providers.Orcid/Owin.Security.Providers.Orcid.csproj
@@ -73,6 +73,7 @@
     <Compile Include="Provider\OrcidReturnEndpointContext.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Owin.Security.Providers.Orcid.nuspec" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/Owin.Security.Providers.Orcid/Owin.Security.Providers.Orcid.nuspec b/src/Owin.Security.Providers.Orcid/Owin.Security.Providers.Orcid.nuspec
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>Owin.Security.Providers.Orcid</id>
+    <version>1.0.0</version>
+    <authors>Rick Zakharov</authors>
+    <owners>RickZee</owners>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+    <projectUrl>https://github.com/RickZee/OwinOAuthProviders</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>
+      Adds ORCID OAuth provider for OWIN to use with ASP.NET
+    </description>
+    <summary>
+      Providers have now been split into their own packages from Owin.Security.Providers
+    </summary>
+    <releaseNotes>
+    </releaseNotes>
+    <copyright>Copyright 2016</copyright>
+    <tags>owin katana oauth LinkedIn</tags>
+    <dependencies>
+      <dependency id="Microsoft.Owin.Security" version="2.1.0" />
+      <dependency id="Newtonsoft.Json" version="6.0.1" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="bin\Release\Owin.Security.Providers.Orcid.dll" target="lib\net45" />
+  </files>
+</package>
-Original file line number
+Diff line change
@@ Expand Up / @@ -278,4 +278,4 @@ public void ConfigureAuth(IAppBuilder app) @@
     			//app.UseOrcidAuthentication("APP-QQ4XO1AYU3WR696B", "6bb22d2e-71b3-4d5d-b1af-f5d3a8cd4270");
     		}
     	}
-    }
+    }