diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-21 21:06:24 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-21 21:06:24 -0700 |
| commit | 220e361186e362cc70c5e021c2fbd1f02c781c0b (patch) | |
| tree | 445ab8ef591a2ddfd24e6e7a0bf200f1a7127721 /src | |
| parent | b4b0f27237096606f30c3eeab58455466aec7010 (diff) | |
| parent | e1455ee979b150d1ea4afdf1bc82a9e5cbc5b2ba (diff) | |
| download | DotNetOpenAuth-220e361186e362cc70c5e021c2fbd1f02c781c0b.zip DotNetOpenAuth-220e361186e362cc70c5e021c2fbd1f02c781c0b.tar.gz DotNetOpenAuth-220e361186e362cc70c5e021c2fbd1f02c781c0b.tar.bz2 | |
Merge branch 'v4.0'
Conflicts:
src/version.txt
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln | 17 | ||||
| -rw-r--r-- | src/version.txt | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln index 3ccdfae..76f9103 100644 --- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln +++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln @@ -31,10 +31,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{D49E2011 ProjectSection(SolutionItems) = preProject ..\..\nuget\DotNetOpenAuth.AspNet.nuspec = ..\..\nuget\DotNetOpenAuth.AspNet.nuspec ..\..\nuget\DotNetOpenAuth.Core.nuspec = ..\..\nuget\DotNetOpenAuth.Core.nuspec + ..\..\nuget\DotNetOpenAuth.Core.UI.nuspec = ..\..\nuget\DotNetOpenAuth.Core.UI.nuspec + ..\..\nuget\DotNetOpenAuth.InfoCard.nuspec = ..\..\nuget\DotNetOpenAuth.InfoCard.nuspec + ..\..\nuget\DotNetOpenAuth.InfoCard.UI.nuspec = ..\..\nuget\DotNetOpenAuth.InfoCard.UI.nuspec + ..\..\nuget\DotNetOpenAuth.nuspec = ..\..\nuget\DotNetOpenAuth.nuspec + ..\..\nuget\DotNetOpenAuth.OAuth.Common.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.Common.nuspec ..\..\nuget\DotNetOpenAuth.OAuth.Consumer.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.Consumer.nuspec ..\..\nuget\DotNetOpenAuth.OAuth.Core.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.Core.nuspec + ..\..\nuget\DotNetOpenAuth.OAuth.ServiceProvider.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.ServiceProvider.nuspec + ..\..\nuget\DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec + ..\..\nuget\DotNetOpenAuth.OAuth2.Client.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth2.Client.nuspec + ..\..\nuget\DotNetOpenAuth.OAuth2.Client.UI.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth2.Client.UI.nuspec + ..\..\nuget\DotNetOpenAuth.OAuth2.Core.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth2.Core.nuspec + ..\..\nuget\DotNetOpenAuth.OAuth2.ResourceServer.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth2.ResourceServer.nuspec ..\..\nuget\DotNetOpenAuth.OpenId.Core.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.Core.nuspec + ..\..\nuget\DotNetOpenAuth.OpenId.Core.UI.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.Core.UI.nuspec + ..\..\nuget\DotNetOpenAuth.OpenId.Provider.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.Provider.nuspec + ..\..\nuget\DotNetOpenAuth.OpenId.Provider.UI.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.Provider.UI.nuspec ..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.nuspec + ..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec + ..\..\nuget\DotNetOpenAuth.OpenIdInfoCard.UI.nuspec = ..\..\nuget\DotNetOpenAuth.OpenIdInfoCard.UI.nuspec + ..\..\nuget\DotNetOpenAuth.OpenIdOAuth.nuspec = ..\..\nuget\DotNetOpenAuth.OpenIdOAuth.nuspec ..\..\nuget\DotNetOpenAuth.Ultimate.nuspec = ..\..\nuget\DotNetOpenAuth.Ultimate.nuspec ..\..\nuget\nuget.proj = ..\..\nuget\nuget.proj EndProjectSection diff --git a/src/version.txt b/src/version.txt index 2ca24ea..d72efa9 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1,3 +1,3 @@ 4.1.0 -Beta1 + 0.23.0-draft |