From 7493689e61ff83bc4652e74429b9d7dfdf99daa9 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 2 Apr 2012 08:12:10 -0700 Subject: [PATCH] Migrate all samples to target .NET 4.0 and use IIS Express (where available). InfoCardRelyingParty sample left out because it seems to cause input validation trouble. Fixes #108 --- .../MvcRelyingParty/MvcRelyingParty.csproj | 21 +- projecttemplates/MvcRelyingParty/Web.config | 63 +- .../RelyingPartyLogic/Model.Designer.cs | 1874 +++++++++-------- projecttemplates/RelyingPartyLogic/Model.edmx | 34 +- .../RelyingPartyLogic.csproj | 2 +- .../WebFormsRelyingParty/Web.config | 76 +- .../WebFormsRelyingParty.csproj | 18 +- .../OAuthAuthorizationServer.csproj | 17 +- samples/OAuthAuthorizationServer/Web.config | 1 - samples/OAuthClient/OAuthClient.csproj | 12 +- .../SampleResourceServer/Reference.cs | 2 +- samples/OAuthClient/Web.config | 132 +- samples/OAuthConsumer/OAuthConsumer.csproj | 9 +- .../SampleServiceProvider/Reference.cs | 2 +- samples/OAuthConsumer/Web.config | 132 +- samples/OAuthConsumerWpf/App.config | 5 +- .../OAuthConsumerWpf/OAuthConsumerWpf.csproj | 6 +- .../OAuthResourceServer.csproj | 16 +- samples/OAuthResourceServer/Web.config | 82 +- .../Code/DataClasses.designer.cs | 12 +- .../OAuthServiceProvider.csproj | 15 +- samples/OAuthServiceProvider/Web.config | 82 +- .../OpenIdProviderMvc.csproj | 14 +- samples/OpenIdProviderMvc/Web.config | 76 +- .../Code/CustomStoreDataSet.Designer.cs | 2 +- .../OpenIdProviderWebForms.csproj | 24 +- samples/OpenIdProviderWebForms/Web.config | 82 +- .../OpenIdRelyingPartyClassicAsp/Web.config | 48 + .../OpenIdRelyingPartyMvc.csproj | 14 +- samples/OpenIdRelyingPartyMvc/Web.config | 64 +- .../Code/CustomStoreDataSet1.Designer.cs | 2 +- .../OpenIdRelyingPartyWebForms.csproj | 20 +- samples/OpenIdRelyingPartyWebForms/Web.config | 10 +- .../My Project/Application.Designer.vb | 2 +- .../My Project/Resources.Designer.vb | 2 +- .../My Project/Settings.Designer.vb | 2 +- .../OpenIdRelyingPartyWebFormsVB.vbproj | 38 +- .../OpenIdRelyingPartyWebFormsVB/Web.config | 10 +- .../OpenIdWebRingSsoProvider.csproj | 19 +- samples/OpenIdWebRingSsoProvider/Web.config | 83 +- .../OpenIdWebRingSsoRelyingParty.csproj | 16 +- .../OpenIdWebRingSsoRelyingParty/Web.config | 85 +- src/DotNetOpenAuth.sln | 2 +- 43 files changed, 1304 insertions(+), 1924 deletions(-) create mode 100644 samples/OpenIdRelyingPartyClassicAsp/Web.config diff --git a/projecttemplates/MvcRelyingParty/MvcRelyingParty.csproj b/projecttemplates/MvcRelyingParty/MvcRelyingParty.csproj index 53d590a829..4db4969b19 100644 --- a/projecttemplates/MvcRelyingParty/MvcRelyingParty.csproj +++ b/projecttemplates/MvcRelyingParty/MvcRelyingParty.csproj @@ -9,6 +9,7 @@ + Debug @@ -20,7 +21,7 @@ Properties MvcRelyingParty MvcRelyingParty - v3.5 + v4.0 false false @@ -50,22 +51,17 @@ - - 3.5 - - - 3.5 - + 3.5 + + + + - - 3.5 - - @@ -73,6 +69,7 @@ + @@ -84,6 +81,7 @@ Default.aspx + ASPXCodeBehind Global.asax @@ -96,6 +94,7 @@ Setup.aspx + ASPXCodeBehind Setup.aspx diff --git a/projecttemplates/MvcRelyingParty/Web.config b/projecttemplates/MvcRelyingParty/Web.config index 92ba2060cb..d59d8fb267 100644 --- a/projecttemplates/MvcRelyingParty/Web.config +++ b/projecttemplates/MvcRelyingParty/Web.config @@ -9,7 +9,6 @@ --> -
@@ -17,17 +16,6 @@
- - -
- -
-
-
-
- - - - + - - - - - - - - + + + + - - - - - + @@ -211,32 +191,13 @@ - - - - - - - - - - - - - - - - - - - - + - - - - - - - - + + + + + + + + @@ -190,7 +190,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -417,12 +417,12 @@ - + - + @@ -430,7 +430,7 @@ - + @@ -446,11 +446,11 @@ - + - + diff --git a/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj b/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj index c041dafb66..c8c9ab2524 100644 --- a/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj +++ b/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj @@ -11,7 +11,7 @@ Properties RelyingPartyLogic RelyingPartyLogic - v3.5 + v4.0 512 diff --git a/projecttemplates/WebFormsRelyingParty/Web.config b/projecttemplates/WebFormsRelyingParty/Web.config index d60edc3d9f..55179ae700 100644 --- a/projecttemplates/WebFormsRelyingParty/Web.config +++ b/projecttemplates/WebFormsRelyingParty/Web.config @@ -9,7 +9,6 @@ --> -
@@ -17,17 +16,6 @@
- - -
- -
-
-
-
- - - - + - - - - - - + + - - - - - - - - - - - - - + --> + - @@ -210,49 +181,18 @@ + - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - diff --git a/projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj b/projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj index 9f844f2367..46236ab0ed 100644 --- a/projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj +++ b/projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj @@ -21,7 +21,7 @@ Properties WebFormsRelyingParty WebFormsRelyingParty - v3.5 + v4.0 4.0 @@ -72,15 +72,14 @@ 3.0 + 3.5 - - 3.5 - + @@ -100,36 +99,42 @@ OAuthAuthorize.aspx + ASPXCodeBehind OAuthAuthorize.aspx LoginFrame.aspx + ASPXCodeBehind LoginFrame.aspx AccountInfo.aspx + ASPXCodeBehind AccountInfo.aspx Admin.Master + ASPXCodeBehind Admin.Master Default.aspx + ASPXCodeBehind Default.aspx Default.aspx + ASPXCodeBehind Default.aspx @@ -139,18 +144,21 @@ Login.aspx + ASPXCodeBehind Login.aspx Logout.aspx + ASPXCodeBehind Logout.aspx Default.aspx + ASPXCodeBehind Default.aspx @@ -161,12 +169,14 @@ Setup.aspx + ASPXCodeBehind Setup.aspx Site.Master + ASPXCodeBehind Site.Master diff --git a/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj b/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj index fcb5d96f75..5b0302bedb 100644 --- a/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj +++ b/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj @@ -5,6 +5,10 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + disabled + disabled + false Debug @@ -18,7 +22,7 @@ OAuthAuthorizationServer v4.0 false - false + true true @@ -98,7 +102,9 @@ - + + Designer + Web.config @@ -184,12 +190,11 @@ - False + True True - 50172 + 17947 / - - + http://localhost:17947/ False False diff --git a/samples/OAuthAuthorizationServer/Web.config b/samples/OAuthAuthorizationServer/Web.config index c9f661485f..b68bb88d45 100644 --- a/samples/OAuthAuthorizationServer/Web.config +++ b/samples/OAuthAuthorizationServer/Web.config @@ -7,7 +7,6 @@ -
diff --git a/samples/OAuthClient/OAuthClient.csproj b/samples/OAuthClient/OAuthClient.csproj index 5443dc9114..57dc479c5a 100644 --- a/samples/OAuthClient/OAuthClient.csproj +++ b/samples/OAuthClient/OAuthClient.csproj @@ -23,9 +23,9 @@ Properties OAuthClient OAuthClient - v3.5 + v4.0 - false + true true @@ -57,9 +57,10 @@ - + + @@ -229,12 +230,11 @@ - False + True False 59722 / - - + http://localhost:59722/ False False diff --git a/samples/OAuthClient/Service References/SampleResourceServer/Reference.cs b/samples/OAuthClient/Service References/SampleResourceServer/Reference.cs index 10f42654c0..5e6deaff9d 100644 --- a/samples/OAuthClient/Service References/SampleResourceServer/Reference.cs +++ b/samples/OAuthClient/Service References/SampleResourceServer/Reference.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.17614 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/samples/OAuthClient/Web.config b/samples/OAuthClient/Web.config index a5b9f0665e..b17ae43655 100644 --- a/samples/OAuthClient/Web.config +++ b/samples/OAuthClient/Web.config @@ -1,7 +1,6 @@  -
@@ -9,17 +8,6 @@
- - -
- -
-
-
-
- - - - + - - - - @@ -104,67 +88,12 @@ --> - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -182,35 +111,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/OAuthConsumer/OAuthConsumer.csproj b/samples/OAuthConsumer/OAuthConsumer.csproj index c3b815ec9e..585a731841 100644 --- a/samples/OAuthConsumer/OAuthConsumer.csproj +++ b/samples/OAuthConsumer/OAuthConsumer.csproj @@ -23,7 +23,7 @@ Properties OAuthConsumer OAuthConsumer - v3.5 + v4.0 false @@ -56,9 +56,10 @@ - + + @@ -86,7 +87,9 @@ - + + Designer + Designer diff --git a/samples/OAuthConsumer/Service References/SampleServiceProvider/Reference.cs b/samples/OAuthConsumer/Service References/SampleServiceProvider/Reference.cs index a1d1eae0b4..b7fe387e9b 100644 --- a/samples/OAuthConsumer/Service References/SampleServiceProvider/Reference.cs +++ b/samples/OAuthConsumer/Service References/SampleServiceProvider/Reference.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.17614 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/samples/OAuthConsumer/Web.config b/samples/OAuthConsumer/Web.config index cdff87ad8d..3330335b02 100644 --- a/samples/OAuthConsumer/Web.config +++ b/samples/OAuthConsumer/Web.config @@ -1,24 +1,12 @@  -
- - -
- -
-
-
-
- - - - + - - - - @@ -94,67 +78,12 @@ --> - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -172,35 +101,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/OAuthConsumerWpf/App.config b/samples/OAuthConsumerWpf/App.config index 64d2032796..9348e8297c 100644 --- a/samples/OAuthConsumerWpf/App.config +++ b/samples/OAuthConsumerWpf/App.config @@ -106,4 +106,7 @@ - \ No newline at end of file + + + + diff --git a/samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj b/samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj index f1c03db1fb..264a8143ff 100644 --- a/samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj +++ b/samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj @@ -11,7 +11,7 @@ Properties DotNetOpenAuth.Samples.OAuthConsumerWpf OAuthConsumerWpf - v3.5 + v4.0 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -175,7 +175,9 @@ ResXFileCodeGenerator Resources.Designer.cs - + + Designer + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/samples/OAuthResourceServer/OAuthResourceServer.csproj b/samples/OAuthResourceServer/OAuthResourceServer.csproj index f4723406fb..f0fb075ba2 100644 --- a/samples/OAuthResourceServer/OAuthResourceServer.csproj +++ b/samples/OAuthResourceServer/OAuthResourceServer.csproj @@ -10,6 +10,7 @@ + Debug @@ -23,8 +24,8 @@ Properties OAuthResourceServer OAuthResourceServer - v3.5 - false + v4.0 + true true @@ -49,15 +50,16 @@ - + + + - @@ -65,6 +67,7 @@ + @@ -132,12 +135,11 @@ - False + True False 65170 / - - + http://localhost:65170/ False False diff --git a/samples/OAuthResourceServer/Web.config b/samples/OAuthResourceServer/Web.config index 827fb07fc1..978c20bf7b 100644 --- a/samples/OAuthResourceServer/Web.config +++ b/samples/OAuthResourceServer/Web.config @@ -1,7 +1,6 @@ -
@@ -9,17 +8,6 @@
- - -
- -
-
-
-
- - - - + - - - - - + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -181,4 +110,7 @@ - + + + + \ No newline at end of file diff --git a/samples/OAuthServiceProvider/Code/DataClasses.designer.cs b/samples/OAuthServiceProvider/Code/DataClasses.designer.cs index 4077063da4..a2113f587d 100644 --- a/samples/OAuthServiceProvider/Code/DataClasses.designer.cs +++ b/samples/OAuthServiceProvider/Code/DataClasses.designer.cs @@ -2,7 +2,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17608 +// Runtime Version:4.0.30319.17614 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -122,7 +122,7 @@ public System.Data.Linq.Table Nonces public partial class User : INotifyPropertyChanging, INotifyPropertyChanged { - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(string.Empty); + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); private int _UserId; @@ -336,7 +336,7 @@ private void detach_OAuthTokens(OAuthToken entity) public partial class FavoriteSite : INotifyPropertyChanging, INotifyPropertyChanged { - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(string.Empty); + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); private int _FavoriteSiteId; @@ -487,7 +487,7 @@ protected virtual void SendPropertyChanged(String propertyName) public partial class OAuthConsumer : INotifyPropertyChanging, INotifyPropertyChanged { - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(string.Empty); + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); private int _ConsumerId; @@ -697,7 +697,7 @@ private void detach_OAuthTokens(OAuthToken entity) public partial class OAuthToken : INotifyPropertyChanging, INotifyPropertyChanged { - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(string.Empty); + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); private int _TokenId; @@ -1081,7 +1081,7 @@ protected virtual void SendPropertyChanged(String propertyName) public partial class Nonce : INotifyPropertyChanging, INotifyPropertyChanged { - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(string.Empty); + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); private string _Context; diff --git a/samples/OAuthServiceProvider/OAuthServiceProvider.csproj b/samples/OAuthServiceProvider/OAuthServiceProvider.csproj index 5dfbf31a04..c96721e594 100644 --- a/samples/OAuthServiceProvider/OAuthServiceProvider.csproj +++ b/samples/OAuthServiceProvider/OAuthServiceProvider.csproj @@ -6,6 +6,11 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) 4.0 + + + + + Debug @@ -19,7 +24,7 @@ Properties OAuthServiceProvider OAuthServiceProvider - v3.5 + v4.0 false @@ -45,13 +50,14 @@ - + + + - @@ -59,6 +65,7 @@ + @@ -210,4 +217,4 @@ --> - + \ No newline at end of file diff --git a/samples/OAuthServiceProvider/Web.config b/samples/OAuthServiceProvider/Web.config index 60a4d86f1e..21fe38874a 100644 --- a/samples/OAuthServiceProvider/Web.config +++ b/samples/OAuthServiceProvider/Web.config @@ -1,24 +1,12 @@ -
- - -
- -
-
-
-
- - - - + - - - - - + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -177,4 +106,7 @@ - + + + + \ No newline at end of file diff --git a/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj b/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj index 7ccac1bb19..d463b4dd08 100644 --- a/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj +++ b/samples/OpenIdProviderMvc/OpenIdProviderMvc.csproj @@ -20,10 +20,10 @@ Properties OpenIdProviderMvc OpenIdProviderMvc - v3.5 + v4.0 false - false + true true @@ -46,7 +46,6 @@ - @@ -55,11 +54,9 @@ 3.5 + - - 3.5 - v4.0 @@ -159,12 +156,11 @@ - False + True True 4864 / - - + http://localhost:4864/ False False diff --git a/samples/OpenIdProviderMvc/Web.config b/samples/OpenIdProviderMvc/Web.config index c93a16dd38..fd8f45d700 100644 --- a/samples/OpenIdProviderMvc/Web.config +++ b/samples/OpenIdProviderMvc/Web.config @@ -1,7 +1,6 @@ -
@@ -9,17 +8,6 @@
- - -
- -
-
-
-
- - - - + - - - - - - - + + + - - - - - + @@ -145,30 +125,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + + to MVC 3 so libraries such as DotNetOpenAuth that compile against MVC 1 will work with it. --> - - + + diff --git a/samples/OpenIdProviderWebForms/Code/CustomStoreDataSet.Designer.cs b/samples/OpenIdProviderWebForms/Code/CustomStoreDataSet.Designer.cs index 19ac88fe08..0561fc9094 100644 --- a/samples/OpenIdProviderWebForms/Code/CustomStoreDataSet.Designer.cs +++ b/samples/OpenIdProviderWebForms/Code/CustomStoreDataSet.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.225 +// Runtime Version:4.0.30319.17614 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj b/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj index 89813fc111..a4c9de9196 100644 --- a/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj +++ b/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj @@ -6,9 +6,9 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - + disabled + disabled + false Debug @@ -21,13 +21,13 @@ Properties OpenIdProviderWebForms OpenIdProviderWebForms - v3.5 + v4.0 4.0 - false + true true @@ -65,11 +65,12 @@ ..\..\lib\log4net.dll - + + @@ -77,10 +78,10 @@ - v4.0 + @@ -92,7 +93,9 @@ - + + Designer + @@ -237,12 +240,11 @@ - False + True False 4860 / - - + http://localhost:4860/ False False diff --git a/samples/OpenIdProviderWebForms/Web.config b/samples/OpenIdProviderWebForms/Web.config index 0c56bfe513..efed107be0 100644 --- a/samples/OpenIdProviderWebForms/Web.config +++ b/samples/OpenIdProviderWebForms/Web.config @@ -1,7 +1,6 @@ -
@@ -9,17 +8,6 @@
- - -
- -
-
-
-
- - - - + - - - - @@ -107,21 +91,7 @@ Low: doesn't work because WebPermission.Connect is denied. --> - - - - - - - - - - - - - - - + @@ -156,49 +126,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + \ No newline at end of file diff --git a/samples/OpenIdRelyingPartyClassicAsp/Web.config b/samples/OpenIdRelyingPartyClassicAsp/Web.config new file mode 100644 index 0000000000..4af6ab2cda --- /dev/null +++ b/samples/OpenIdRelyingPartyClassicAsp/Web.config @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj b/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj index 59bd537ce1..8fe8e36c41 100644 --- a/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj +++ b/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj @@ -20,10 +20,10 @@ Properties OpenIdRelyingPartyMvc OpenIdRelyingPartyMvc - v3.5 + v4.0 false - false + true true @@ -49,16 +49,15 @@ + 3.5 + - - 3.5 - @@ -170,12 +169,11 @@ - False + True True 54347 / - - + http://localhost:54347/ False False diff --git a/samples/OpenIdRelyingPartyMvc/Web.config b/samples/OpenIdRelyingPartyMvc/Web.config index 0eb2bc0afd..67c1dd40ba 100644 --- a/samples/OpenIdRelyingPartyMvc/Web.config +++ b/samples/OpenIdRelyingPartyMvc/Web.config @@ -1,24 +1,12 @@ -
- - -
- -
-
-
-
- - - - + - - - - - - - + + + - - - - - - + - - - - - - - - - + + - diff --git a/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs index fa28b9cdd8..3875aa5464 100644 --- a/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs +++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.225 +// Runtime Version:4.0.30319.17614 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj index c09838ce57..e8fc0304d0 100644 --- a/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj +++ b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj @@ -21,13 +21,13 @@ Properties OpenIdRelyingPartyWebForms OpenIdRelyingPartyWebForms - v3.5 + v4.0 4.0 - false + true true @@ -70,11 +70,12 @@ - - 3.5 - + + + + @@ -93,7 +94,9 @@ - + + Designer + @@ -272,12 +275,11 @@ - False + True True 4856 / - - + http://localhost:4856/ False False diff --git a/samples/OpenIdRelyingPartyWebForms/Web.config b/samples/OpenIdRelyingPartyWebForms/Web.config index 3a667c2644..479b28552e 100644 --- a/samples/OpenIdRelyingPartyWebForms/Web.config +++ b/samples/OpenIdRelyingPartyWebForms/Web.config @@ -1,7 +1,6 @@ -
@@ -68,10 +67,9 @@ - - + @@ -88,6 +86,7 @@ Low: doesn't work because WebPermission.Connect is denied. --> + @@ -123,4 +122,7 @@ - + + + + \ No newline at end of file diff --git a/samples/OpenIdRelyingPartyWebFormsVB/My Project/Application.Designer.vb b/samples/OpenIdRelyingPartyWebFormsVB/My Project/Application.Designer.vb index cf5896148e..cbb8d1edc7 100644 --- a/samples/OpenIdRelyingPartyWebFormsVB/My Project/Application.Designer.vb +++ b/samples/OpenIdRelyingPartyWebFormsVB/My Project/Application.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30104.0 +' Runtime Version:4.0.30319.17614 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. diff --git a/samples/OpenIdRelyingPartyWebFormsVB/My Project/Resources.Designer.vb b/samples/OpenIdRelyingPartyWebFormsVB/My Project/Resources.Designer.vb index 276f5203dc..e2a555b5d7 100644 --- a/samples/OpenIdRelyingPartyWebFormsVB/My Project/Resources.Designer.vb +++ b/samples/OpenIdRelyingPartyWebFormsVB/My Project/Resources.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30104.0 +' Runtime Version:4.0.30319.17614 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. diff --git a/samples/OpenIdRelyingPartyWebFormsVB/My Project/Settings.Designer.vb b/samples/OpenIdRelyingPartyWebFormsVB/My Project/Settings.Designer.vb index a32eb02909..1493ab090b 100644 --- a/samples/OpenIdRelyingPartyWebFormsVB/My Project/Settings.Designer.vb +++ b/samples/OpenIdRelyingPartyWebFormsVB/My Project/Settings.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.17608 +' Runtime Version:4.0.30319.17614 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. diff --git a/samples/OpenIdRelyingPartyWebFormsVB/OpenIdRelyingPartyWebFormsVB.vbproj b/samples/OpenIdRelyingPartyWebFormsVB/OpenIdRelyingPartyWebFormsVB.vbproj index 9bd5982bda..5760c31900 100644 --- a/samples/OpenIdRelyingPartyWebFormsVB/OpenIdRelyingPartyWebFormsVB.vbproj +++ b/samples/OpenIdRelyingPartyWebFormsVB/OpenIdRelyingPartyWebFormsVB.vbproj @@ -5,6 +5,11 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + disabled + disabled + false Debug @@ -16,7 +21,7 @@ Library OpenIdRelyingPartyWebFormsVB OpenIdRelyingPartyWebFormsVB - v3.5 + v4.0 Custom On Binary @@ -26,7 +31,7 @@ 4.0 - false + true true @@ -57,25 +62,19 @@ + - - 3.5 - - - 3.5 - - - 3.5 - - - 3.5 - + + + + + @@ -104,7 +103,9 @@ - + + Designer + @@ -232,12 +233,11 @@ - False + True True 27433 / - - + http://localhost:27433/ False False @@ -248,4 +248,4 @@ - + \ No newline at end of file diff --git a/samples/OpenIdRelyingPartyWebFormsVB/Web.config b/samples/OpenIdRelyingPartyWebFormsVB/Web.config index 9c65b28dd6..b849324fd4 100644 --- a/samples/OpenIdRelyingPartyWebFormsVB/Web.config +++ b/samples/OpenIdRelyingPartyWebFormsVB/Web.config @@ -1,7 +1,6 @@  -
@@ -71,7 +70,7 @@ - + @@ -88,6 +87,7 @@ Low: doesn't work because WebPermission.Connect is denied. --> + @@ -119,8 +119,10 @@ - - + + + + \ No newline at end of file diff --git a/samples/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj b/samples/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj index 6f14a45fa0..c8836d00e5 100644 --- a/samples/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj +++ b/samples/OpenIdWebRingSsoProvider/OpenIdWebRingSsoProvider.csproj @@ -6,9 +6,9 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - + disabled + disabled + false Debug @@ -21,13 +21,13 @@ Properties OpenIdWebRingSsoProvider OpenIdWebRingSsoProvider - v3.5 + v4.0 4.0 - false + true true @@ -54,20 +54,18 @@ - - 3.5 - + - v4.0 + @@ -152,8 +150,7 @@ False 39167 / - - + http://localhost:39167/ False False diff --git a/samples/OpenIdWebRingSsoProvider/Web.config b/samples/OpenIdWebRingSsoProvider/Web.config index 656ea44c2b..3304e97d9d 100644 --- a/samples/OpenIdWebRingSsoProvider/Web.config +++ b/samples/OpenIdWebRingSsoProvider/Web.config @@ -1,7 +1,6 @@  -
@@ -9,17 +8,6 @@
- - -
- -
-
-
-
- - - - - + - - - - - @@ -119,70 +101,13 @@ --> - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/samples/OpenIdWebRingSsoRelyingParty/OpenIdWebRingSsoRelyingParty.csproj b/samples/OpenIdWebRingSsoRelyingParty/OpenIdWebRingSsoRelyingParty.csproj index 64b5ec59ff..e478d99f01 100644 --- a/samples/OpenIdWebRingSsoRelyingParty/OpenIdWebRingSsoRelyingParty.csproj +++ b/samples/OpenIdWebRingSsoRelyingParty/OpenIdWebRingSsoRelyingParty.csproj @@ -21,13 +21,13 @@ Properties OpenIdWebRingSsoRelyingParty OpenIdWebRingSsoRelyingParty - v3.5 + v4.0 4.0 - false + true true @@ -52,11 +52,12 @@ - - 3.5 - + + + + @@ -131,12 +132,11 @@ - False + True False 39165 / - - + http://localhost:39165/ False False diff --git a/samples/OpenIdWebRingSsoRelyingParty/Web.config b/samples/OpenIdWebRingSsoRelyingParty/Web.config index 5c5965daba..b64f037387 100644 --- a/samples/OpenIdWebRingSsoRelyingParty/Web.config +++ b/samples/OpenIdWebRingSsoRelyingParty/Web.config @@ -2,7 +2,6 @@ -
@@ -10,17 +9,6 @@
- - -
- -
-
-
-
- - - - - + - - - - @@ -120,73 +103,15 @@ --> - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -194,7 +119,6 @@ - @@ -202,4 +126,7 @@ - + + + + \ No newline at end of file diff --git a/src/DotNetOpenAuth.sln b/src/DotNetOpenAuth.sln index ad9448b68f..3ce0b5c485 100644 --- a/src/DotNetOpenAuth.sln +++ b/src/DotNetOpenAuth.sln @@ -129,7 +129,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "OpenIdRelyingPartyClassicAs Release.AspNetCompiler.Updateable = "true" Release.AspNetCompiler.VirtualPath = "/OpenIdRelyingPartyClassicAsp" StartServerOnDebug = "false" - TargetFrameworkMoniker = ".NETFramework,Version%3Dv3.5" + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" VWDPort = "10318" EndProjectSection EndProject