diff options
11 files changed, 23 insertions, 319 deletions
diff --git a/projecttemplates/MvcRelyingParty/Views/Web.config b/projecttemplates/MvcRelyingParty/Views/Web.config index b744fc8..6c19565 100644 --- a/projecttemplates/MvcRelyingParty/Views/Web.config +++ b/projecttemplates/MvcRelyingParty/Views/Web.config @@ -15,11 +15,11 @@ --> <pages validateRequest="false" - pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" - pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" - userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> + pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> <controls> - <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" /> + <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" /> </controls> </pages> </system.web> diff --git a/projecttemplates/MvcRelyingParty/Web.config b/projecttemplates/MvcRelyingParty/Web.config index 1884dd8..b107173 100644 --- a/projecttemplates/MvcRelyingParty/Web.config +++ b/projecttemplates/MvcRelyingParty/Web.config @@ -163,7 +163,7 @@ <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> - <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> <add assembly="System.Data.Entity, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> @@ -215,7 +215,7 @@ <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/> - <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> </httpHandlers> <httpModules> <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> @@ -262,7 +262,7 @@ <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> - <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/> </handlers> </system.webServer> diff --git a/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.dbproj b/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.dbproj deleted file mode 100644 index b47ce94..0000000 --- a/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.dbproj +++ /dev/null @@ -1,290 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Name>"DatabaseProject"</Name> - <SchemaVersion>2.0</SchemaVersion> - <ProjectVersion>4.0</ProjectVersion> - <ProjectGuid>{2b4261ac-25ac-4b8d-b459-1c42b6b1401d}</ProjectGuid> - <DSP>Microsoft.Data.Schema.Sql.Sql90DatabaseSchemaProvider</DSP> - <AppDesignerFolder>Properties</AppDesignerFolder> - <ShowWizard>True</ShowWizard> - <OutputType>Database</OutputType> - <RootPath> - </RootPath> - <IncludeSchemaNameInFileName>False</IncludeSchemaNameInFileName> - <ModelCollation>1033,CI</ModelCollation> - <DefaultFileStructure>BySchema</DefaultFileStructure> - <DeployToDatabaseAddToServerExplorer>False</DeployToDatabaseAddToServerExplorer> - <DeployToScript>True</DeployToScript> - <CatalogPropertiesFile>Properties\Database.sqlsettings</CatalogPropertiesFile> - <ServerPropertiesFile> - </ServerPropertiesFile> - <RootNamespace>RelyingPartyDatabase</RootNamespace> - <DefaultSchema>dbo</DefaultSchema> - <AllowServerObjects>False</AllowServerObjects> - <AllowDatabaseObjects>True</AllowDatabaseObjects> - <DeployScriptFileName>..\..\..\RelyingPartyLogic\CreateDatabase.sql</DeployScriptFileName> - <PreviousProjectVersion>4.0</PreviousProjectVersion> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> - <OutputPath>.\sql\release\</OutputPath> - <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName> - <TargetConnectionString> - </TargetConnectionString> - <TargetDatabase>RelyingPartyDatabase</TargetDatabase> - <TreatWarningsAsErrors>False</TreatWarningsAsErrors> - <SuppressWarnings> - </SuppressWarnings> - <DeploymentConfigFile>Properties\Database.sqldeployment</DeploymentConfigFile> - <SqlCommandVariablesFile>Properties\Database.sqlcmdvars</SqlCommandVariablesFile> - <DeployToDatabase>False</DeployToDatabase> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> - <OutputPath>.\sql\debug\</OutputPath> - <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName> - <TargetConnectionString> - </TargetConnectionString> - <TargetDatabase>RelyingPartyDatabase</TargetDatabase> - <TreatWarningsAsErrors>False</TreatWarningsAsErrors> - <SuppressWarnings> - </SuppressWarnings> - <DeploymentConfigFile>Properties\Database.sqldeployment</DeploymentConfigFile> - <SqlCommandVariablesFile>Properties\Database.sqlcmdvars</SqlCommandVariablesFile> - <DeployToDatabase>False</DeployToDatabase> - </PropertyGroup> - <!--Import the settings--> - <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\TeamData\Microsoft.Data.Schema.SqlTasks.targets" /> - <ItemGroup> - <Folder Include="Properties\" /> - <Folder Include="Schema Objects\" /> - <Folder Include="Schema Objects\Database Level Objects\" /> - <Folder Include="Schema Objects\Database Level Objects\Assemblies\" /> - <Folder Include="Schema Objects\Database Level Objects\Database Triggers\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Asymmetric Keys\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Certificates\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Database Audit Specification\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Database Encryption Keys\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Master Keys\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Roles\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Roles\Application Roles\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Roles\Database Roles\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Schemas\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Signatures\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Symmetric Keys\" /> - <Folder Include="Schema Objects\Database Level Objects\Security\Users\" /> - <Folder Include="Schema Objects\Database Level Objects\Service Broker\" /> - <Folder Include="Schema Objects\Database Level Objects\Service Broker\Broker Priorities\" /> - <Folder Include="Schema Objects\Database Level Objects\Service Broker\Contracts\" /> - <Folder Include="Schema Objects\Database Level Objects\Service Broker\Event Notifications\" /> - <Folder Include="Schema Objects\Database Level Objects\Service Broker\Message Types\" /> - <Folder Include="Schema Objects\Database Level Objects\Service Broker\Queues\" /> - <Folder Include="Schema Objects\Database Level Objects\Service Broker\Remote Service Binding\" /> - <Folder Include="Schema Objects\Database Level Objects\Service Broker\Routes\" /> - <Folder Include="Schema Objects\Database Level Objects\Service Broker\Services\" /> - <Folder Include="Schema Objects\Database Level Objects\Storage\" /> - <Folder Include="Schema Objects\Database Level Objects\Storage\Filegroups\" /> - <Folder Include="Schema Objects\Database Level Objects\Storage\Files\" /> - <Folder Include="Schema Objects\Database Level Objects\Storage\Full Text Catalogs\" /> - <Folder Include="Schema Objects\Database Level Objects\Storage\Full Text Stoplists\" /> - <Folder Include="Schema Objects\Database Level Objects\Storage\Partition Functions\" /> - <Folder Include="Schema Objects\Database Level Objects\Storage\Partition Schemes\" /> - <Folder Include="Schema Objects\Schemas\" /> - <Folder Include="Schema Objects\Schemas\dbo\" /> - <Folder Include="Schema Objects\Schemas\dbo\Programmability\" /> - <Folder Include="Schema Objects\Schemas\dbo\Programmability\Defaults\" /> - <Folder Include="Schema Objects\Schemas\dbo\Programmability\Functions\" /> - <Folder Include="Schema Objects\Schemas\dbo\Programmability\Rules\" /> - <Folder Include="Schema Objects\Schemas\dbo\Programmability\Stored Procedures\" /> - <Folder Include="Schema Objects\Schemas\dbo\Programmability\Types\" /> - <Folder Include="Schema Objects\Schemas\dbo\Programmability\Types\User Defined Data Types\" /> - <Folder Include="Schema Objects\Schemas\dbo\Programmability\Types\User Defined Table Types\" /> - <Folder Include="Schema Objects\Schemas\dbo\Programmability\Types\User Defined Types CLR\" /> - <Folder Include="Schema Objects\Schemas\dbo\Programmability\Types\XML Schema Collections\" /> - <Folder Include="Schema Objects\Schemas\dbo\Synonyms\" /> - <Folder Include="Schema Objects\Schemas\dbo\Tables\" /> - <Folder Include="Schema Objects\Schemas\dbo\Tables\Constraints\" /> - <Folder Include="Schema Objects\Schemas\dbo\Tables\Indexes\" /> - <Folder Include="Schema Objects\Schemas\dbo\Tables\Keys\" /> - <Folder Include="Schema Objects\Schemas\dbo\Tables\Statistics\" /> - <Folder Include="Schema Objects\Schemas\dbo\Tables\Triggers\" /> - <Folder Include="Schema Objects\Schemas\dbo\Views\" /> - <Folder Include="Schema Objects\Schemas\dbo\Views\Indexes\" /> - <Folder Include="Schema Objects\Schemas\dbo\Views\Statistics\" /> - <Folder Include="Schema Objects\Schemas\dbo\Views\Triggers\" /> - <Folder Include="Scripts" /> - <Folder Include="Scripts\Pre-Deployment" /> - <Folder Include="Scripts\Post-Deployment" /> - <Folder Include="Data Generation Plans" /> - <Folder Include="Schema Comparisons" /> - </ItemGroup> - <ItemGroup> - <PropertiesFile Include="Properties\Database.sqlsettings"> - </PropertiesFile> - <PropertiesFile Include="Properties\Database.sqldeployment"> - </PropertiesFile> - <PropertiesFile Include="Properties\Database.sqlcmdvars"> - </PropertiesFile> - <Build Include="Properties\Database.sqlpermissions"> - <ModelBuilderType>Permissions</ModelBuilderType> - </Build> - <Build Include="Schema Objects\Database Level Objects\Service Broker\Routes\AutoCreatedLocal.route.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Database Level Objects\Storage\Files\Database.mdf.sqlfile.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Database Level Objects\Storage\Files\Database_log.sqlfile.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Programmability\Stored Procedures\AddUser.proc.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Programmability\Stored Procedures\ClearExpiredCryptoKeys.proc.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Programmability\Stored Procedures\ClearExpiredNonces.proc.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\AuthenticationToken.table.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Constraints\DF_AuthenticationToken_CreatedOn.defconst.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Constraints\DF_AuthenticationToken_LastUsed.defconst.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Constraints\DF_AuthenticationToken_UsageCount.defconst.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Constraints\DF_Nonce_Issued.defconst.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Constraints\DF_User_CreatedOn.defconst.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Constraints\DF_User_EmailAddressVerified.defconst.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Indexes\IX_Nonce_Code.index.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Indexes\IX_Nonce_Expires.index.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\FK_AuthenticationToken_User.fkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\FK_UserRole_Role.fkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\FK_UserRole_User.fkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\PK_AuthenticationToken.pkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\PK_Nonce.pkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\PK_Role.pkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\PK_User.pkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\PK_UserRole.pkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Log.table.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Nonce.table.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Role.table.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\User.table.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\UserRole.table.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - <PreDeploy Include="Scripts\Pre-Deployment\Script.PreDeployment.sql"> - <SubType>Code</SubType> - </PreDeploy> - <PostDeploy Include="Scripts\Post-Deployment\Script.PostDeployment.sql"> - <SubType>Code</SubType> - </PostDeploy> - </ItemGroup> - <ItemGroup> - <BuildContributorArgument Include="OutDir=$(OutDir)" /> - </ItemGroup> - <ItemGroup> - <NotInBuild Include="Schema Comparisons\SchemaComparison1.scmp"> - <SubType>NotInBuild</SubType> - </NotInBuild> - </ItemGroup> - <ItemGroup> - <Build Include="Schema Objects\Schemas\dbo\Tables\Constraints\DF_IssuedToken_CreatedOn_1.defconst.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\FK_IssuedToken_Consumer_1.fkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\FK_IssuedToken_User_1.fkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Indexes\IX_Consumer_1.index.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\PK_IssuedToken_1.pkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\PK_Consumer_1.pkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\ClientAuthorization.table.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Client.table.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Indexes\IX_CryptoKeys.index.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\Keys\PK_CryptoKeys.pkey.sql"> - <SubType>Code</SubType> - </Build> - <Build Include="Schema Objects\Schemas\dbo\Tables\CryptoKey.table.sql"> - <SubType>Code</SubType> - <AnsiNulls>On</AnsiNulls> - <QuotedIdentifier>On</QuotedIdentifier> - </Build> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " /> -</Project>
\ No newline at end of file diff --git a/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.sqlproj b/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.sqlproj index 50ad95a..18626cd 100644 --- a/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.sqlproj +++ b/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.sqlproj @@ -1,16 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> - <PostConversionRemoveFromScc> - </PostConversionRemoveFromScc> - <PostConversionAddToScc> - </PostConversionAddToScc> - <PostConversionCheckOutFromScc> - </PostConversionCheckOutFromScc> </PropertyGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Name>RelyingPartyDatabase</Name> diff --git a/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj b/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj index 58e684e..bdec45b 100644 --- a/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj +++ b/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj @@ -187,7 +187,7 @@ <Project>{3896A32A-E876-4C23-B9B8-78E17D134CD3}</Project> <Name>DotNetOpenAuth.OpenId</Name> </ProjectReference> - <ProjectReference Include="..\RelyingPartyDatabase\RelyingPartyDatabase.dbproj"> + <ProjectReference Include="..\RelyingPartyDatabase\RelyingPartyDatabase.sqlproj"> <Name>RelyingPartyDatabase</Name> <!-- Deploy the latest SQL script first, so that this project can embed the latest version. --> <Targets>Build;Deploy</Targets> diff --git a/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj b/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj index 7e54c81..1900409 100644 --- a/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj +++ b/samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj @@ -58,7 +58,7 @@ <Reference Include="System.Data.DataSetExtensions"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> - <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> + <Reference Include="System.Web.Mvc" /> <Reference Include="System.Xml.Linq"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> diff --git a/samples/OAuthAuthorizationServer/Views/Web.config b/samples/OAuthAuthorizationServer/Views/Web.config index aa7a38d..c30f2ad 100644 --- a/samples/OAuthAuthorizationServer/Views/Web.config +++ b/samples/OAuthAuthorizationServer/Views/Web.config @@ -15,11 +15,11 @@ --> <pages validateRequest="false" - pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" - pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" - userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> + pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" + userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> <controls> - <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" /> + <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" /> </controls> </pages> </system.web> diff --git a/samples/OAuthAuthorizationServer/Web.config b/samples/OAuthAuthorizationServer/Web.config index 20b2bbd..f0be014 100644 --- a/samples/OAuthAuthorizationServer/Web.config +++ b/samples/OAuthAuthorizationServer/Web.config @@ -74,7 +74,7 @@ <assemblies> <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> - <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> + <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> </assemblies> </compilation> diff --git a/samples/OpenIdProviderMvc/Views/Web.config b/samples/OpenIdProviderMvc/Views/Web.config index df0103b..8bc9c19 100644 --- a/samples/OpenIdProviderMvc/Views/Web.config +++ b/samples/OpenIdProviderMvc/Views/Web.config @@ -12,9 +12,9 @@ To change this behavior apply the ValidateInputAttribute to a controller or action. --> - <pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <controls> - <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" namespace="System.Web.Mvc" tagPrefix="mvc" /> + <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" namespace="System.Web.Mvc" tagPrefix="mvc" /> </controls> </pages> </system.web> diff --git a/samples/OpenIdProviderMvc/Web.config b/samples/OpenIdProviderMvc/Web.config index 6c5b5b6..826a682 100644 --- a/samples/OpenIdProviderMvc/Web.config +++ b/samples/OpenIdProviderMvc/Web.config @@ -83,7 +83,7 @@ <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> - <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> <add assembly="System.Data.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> @@ -149,7 +149,7 @@ <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/> - <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> </httpHandlers> <httpModules> <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> @@ -192,7 +192,7 @@ <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> - <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/> </handlers> </system.webServer> diff --git a/samples/OpenIdRelyingPartyMvc/Web.config b/samples/OpenIdRelyingPartyMvc/Web.config index 5442e0a..bf08db4 100644 --- a/samples/OpenIdRelyingPartyMvc/Web.config +++ b/samples/OpenIdRelyingPartyMvc/Web.config @@ -83,7 +83,7 @@ <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> - <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> <add assembly="System.Data.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/> @@ -130,7 +130,7 @@ <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/> - <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> </httpHandlers> <httpModules> <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> @@ -173,7 +173,7 @@ <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> - <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> </handlers> </system.webServer> |