diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-15 22:17:20 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-15 22:17:20 -0800 |
| commit | e12782c1a6727390b2107ff2e39d4ac6173d86fc (patch) | |
| tree | 3be0ccda0a9425927263f5b6b9616ef8ba11ac08 /src/DotNetOpenId.sln | |
| parent | 078b1f350eb40ceee7423c25b1d833dd1f242da4 (diff) | |
| parent | a545f7be2693596fa14540c359e43150a6a7cf88 (diff) | |
| download | DotNetOpenAuth-origin/mono.zip DotNetOpenAuth-origin/mono.tar.gz DotNetOpenAuth-origin/mono.tar.bz2 | |
Merge branch 'v2.5' into monoorigin/mono
Conflicts:
src/DotNetOpenId/Properties/AssemblyInfo.cs
src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs
Diffstat (limited to 'src/DotNetOpenId.sln')
| -rw-r--r-- | src/DotNetOpenId.sln | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/DotNetOpenId.sln b/src/DotNetOpenId.sln index 8cd73a7..bfd2752 100644 --- a/src/DotNetOpenId.sln +++ b/src/DotNetOpenId.sln @@ -3,6 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{14D00F8C-C7CB-49B3-A668-7D0C5A4A6D9F}"
ProjectSection(SolutionItems) = preProject
+ ..\doc\Configuration.htm = ..\doc\Configuration.htm
..\doc\README.html = ..\doc\README.html
..\doc\WebFarms.htm = ..\doc\WebFarms.htm
EndProjectSection
@@ -37,12 +38,9 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "DotNetOpenId.TestWeb", "Dot Release.AspNetCompiler.Debug = "False"
VWDPort = "22205"
DefaultWebSiteLanguage = "Visual C#"
+ StartServerOnDebug = "false"
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelyingPartyCustomStore", "..\samples\RelyingPartyCustomStore\RelyingPartyCustomStore.csproj", "{DB54DC19-BA56-4C22-A8A0-C49289EA4F53}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProviderCustomStore", "..\samples\ProviderCustomStore\ProviderCustomStore.csproj", "{2D0B2C39-3F90-484E-848B-F3EF956835C3}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelyingPartyMvc", "..\samples\RelyingPartyMvc\RelyingPartyMvc.csproj", "{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}"
EndProject
Global
@@ -105,26 +103,6 @@ Global {C733BE07-37B5-4328-8C1A-81F129670E6E}.Release|Any CPU.ActiveCfg = Debug|.NET
{C733BE07-37B5-4328-8C1A-81F129670E6E}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
{C733BE07-37B5-4328-8C1A-81F129670E6E}.Release|Mixed Platforms.Build.0 = Debug|.NET
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53}.Debug|.NET.ActiveCfg = Debug|Any CPU
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53}.Release|.NET.ActiveCfg = Release|Any CPU
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53}.Release|Any CPU.Build.0 = Release|Any CPU
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {2D0B2C39-3F90-484E-848B-F3EF956835C3}.Debug|.NET.ActiveCfg = Debug|Any CPU
- {2D0B2C39-3F90-484E-848B-F3EF956835C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2D0B2C39-3F90-484E-848B-F3EF956835C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2D0B2C39-3F90-484E-848B-F3EF956835C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {2D0B2C39-3F90-484E-848B-F3EF956835C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {2D0B2C39-3F90-484E-848B-F3EF956835C3}.Release|.NET.ActiveCfg = Release|Any CPU
- {2D0B2C39-3F90-484E-848B-F3EF956835C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2D0B2C39-3F90-484E-848B-F3EF956835C3}.Release|Any CPU.Build.0 = Release|Any CPU
- {2D0B2C39-3F90-484E-848B-F3EF956835C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {2D0B2C39-3F90-484E-848B-F3EF956835C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Debug|.NET.ActiveCfg = Debug|Any CPU
{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -142,8 +120,6 @@ Global GlobalSection(NestedProjects) = preSolution
{2A59DE0A-B76A-4B42-9A33-04D34548353D} = {48A90678-A754-4E6E-98E2-7C519607C85F}
{51BCD5E9-E17A-4FB2-BAC8-C156DD7A1CA4} = {48A90678-A754-4E6E-98E2-7C519607C85F}
- {DB54DC19-BA56-4C22-A8A0-C49289EA4F53} = {48A90678-A754-4E6E-98E2-7C519607C85F}
- {2D0B2C39-3F90-484E-848B-F3EF956835C3} = {48A90678-A754-4E6E-98E2-7C519607C85F}
{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB} = {48A90678-A754-4E6E-98E2-7C519607C85F}
EndGlobalSection
EndGlobal
|