diff options
Diffstat (limited to 'projecttemplates')
13 files changed, 90 insertions, 456 deletions
diff --git a/projecttemplates/MvcRelyingParty/MvcRelyingParty.csproj b/projecttemplates/MvcRelyingParty/MvcRelyingParty.csproj index b2112dd..9dda061 100644 --- a/projecttemplates/MvcRelyingParty/MvcRelyingParty.csproj +++ b/projecttemplates/MvcRelyingParty/MvcRelyingParty.csproj @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <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> - <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> - </PropertyGroup> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -18,6 +13,10 @@ <AssemblyName>MvcRelyingParty</AssemblyName> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <MvcBuildViews>false</MvcBuildViews> + <FileUpgradeFlags> + </FileUpgradeFlags> + <OldToolsVersion>4.0</OldToolsVersion> + <UpgradeBackupLocation /> <UseIISExpress>false</UseIISExpress> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -230,8 +229,7 @@ <Content Include="OAuthTokenEndpoint.ashx" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> diff --git a/projecttemplates/MvcRelyingParty/Views/Web.config b/projecttemplates/MvcRelyingParty/Views/Web.config index 6c19565..b744fc8 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=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"> + 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"> <controls> - <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" /> + <add assembly="System.Web.Mvc, Version=2.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 92ba206..b7a1d38 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=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add assembly="System.Web.Mvc, Version=2.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=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> + <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.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=3.0.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="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/Permissions.sql b/projecttemplates/RelyingPartyDatabase/Permissions.sql deleted file mode 100644 index 5f28270..0000000 --- a/projecttemplates/RelyingPartyDatabase/Permissions.sql +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlcmdvars b/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlcmdvars index dbdd8c5..f2c472d 100644 --- a/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlcmdvars +++ b/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlcmdvars @@ -2,5 +2,9 @@ <SqlCommandVariables xmlns="urn:Microsoft.VisualStudio.Data.Schema.Package.SqlCmdVars"> <Version>1.0</Version> <Properties> + <Property> + <PropertyName>Path1</PropertyName> + <PropertyValue>WEBROOT</PropertyValue> + </Property> </Properties> </SqlCommandVariables>
\ No newline at end of file diff --git a/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.sqlproj b/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.dbproj index 0799235..b47ce94 100644 --- a/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.sqlproj +++ b/projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.dbproj @@ -1,16 +1,13 @@ <?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> - </PropertyGroup> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Name>RelyingPartyDatabase</Name> + <Name>"DatabaseProject"</Name> <SchemaVersion>2.0</SchemaVersion> <ProjectVersion>4.0</ProjectVersion> - <DSP>Microsoft.Data.Tools.Schema.Sql.Sql90DatabaseSchemaProvider</DSP> + <ProjectGuid>{2b4261ac-25ac-4b8d-b459-1c42b6b1401d}</ProjectGuid> + <DSP>Microsoft.Data.Schema.Sql.Sql90DatabaseSchemaProvider</DSP> <AppDesignerFolder>Properties</AppDesignerFolder> <ShowWizard>True</ShowWizard> <OutputType>Database</OutputType> @@ -18,76 +15,47 @@ </RootPath> <IncludeSchemaNameInFileName>False</IncludeSchemaNameInFileName> <ModelCollation>1033,CI</ModelCollation> - <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure> + <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> - <ValidateCasingOnIdentifiers>False</ValidateCasingOnIdentifiers> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{08a938b6-ebbd-4036-880e-ce7ba2d14510}</ProjectGuid> - <GenerateDatabaseFile>False</GenerateDatabaseFile> - <GenerateCreateScript>True</GenerateCreateScript> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <SqlServerVerification>False</SqlServerVerification> - <TargetLanguage>CS</TargetLanguage> - <AllowSnapshotIsolation>False</AllowSnapshotIsolation> - <AnsiNullDefault>False</AnsiNullDefault> - <AnsiNulls>False</AnsiNulls> - <AnsiPadding>False</AnsiPadding> - <AnsiWarnings>False</AnsiWarnings> - <ArithAbort>False</ArithAbort> - <AutoClose>True</AutoClose> - <AutoCreateStatistics>True</AutoCreateStatistics> - <AutoShrink>False</AutoShrink> - <AutoUpdateStatistics>True</AutoUpdateStatistics> - <AutoUpdateStatisticsAsynchronously>False</AutoUpdateStatisticsAsynchronously> - <ChangeTrackingRetentionPeriod>2</ChangeTrackingRetentionPeriod> - <ChangeTrackingRetentionUnit>Days</ChangeTrackingRetentionUnit> - <CloseCursorOnCommitEnabled>False</CloseCursorOnCommitEnabled> - <CompatibilityMode>90</CompatibilityMode> - <ConcatNullYieldsNull>False</ConcatNullYieldsNull> - <DatabaseAccess>MULTI_USER</DatabaseAccess> - <DatabaseChaining>False</DatabaseChaining> - <DatabaseState>ONLINE</DatabaseState> - <DateCorrelationOptimizationOn>False</DateCorrelationOptimizationOn> - <DefaultCollation>SQL_Latin1_General_CP1_CI_AS</DefaultCollation> - <DefaultCursor>GLOBAL</DefaultCursor> - <DefaultFilegroup>PRIMARY</DefaultFilegroup> - <EnableFullTextSearch>True</EnableFullTextSearch> - <IsBrokerPriorityHonored>False</IsBrokerPriorityHonored> - <IsChangeTrackingAutoCleanupOn>True</IsChangeTrackingAutoCleanupOn> - <IsChangeTrackingOn>False</IsChangeTrackingOn> - <IsEncryptionOn>False</IsEncryptionOn> - <NumericRoundAbort>False</NumericRoundAbort> - <PageVerify>CHECKSUM</PageVerify> - <Parameterization>SIMPLE</Parameterization> - <QuotedIdentifier>False</QuotedIdentifier> - <ReadCommittedSnapshot>False</ReadCommittedSnapshot> - <Recovery>SIMPLE</Recovery> - <RecursiveTriggersEnabled>False</RecursiveTriggersEnabled> - <ServiceBrokerOption>DisableBroker</ServiceBrokerOption> - <SupplementalLoggingOn>False</SupplementalLoggingOn> - <TornPageDetection>False</TornPageDetection> - <Trustworthy>False</Trustworthy> - <UpdateOptions>READ_WRITE</UpdateOptions> - <VardecimalStorageFormatOn>True</VardecimalStorageFormatOn> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <OutputPath>.\sql\release\</OutputPath> <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName> + <TargetConnectionString> + </TargetConnectionString> <TargetDatabase>RelyingPartyDatabase</TargetDatabase> - <TreatTSqlWarningsAsErrors>False</TreatTSqlWarningsAsErrors> - <SuppressTSqlWarnings /> + <TreatWarningsAsErrors>False</TreatWarningsAsErrors> + <SuppressWarnings> + </SuppressWarnings> + <DeploymentConfigFile>Properties\Database.sqldeployment</DeploymentConfigFile> + <SqlCommandVariablesFile>Properties\Database.sqlcmdvars</SqlCommandVariablesFile> + <DeployToDatabase>False</DeployToDatabase> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <OutputPath>.\sql\debug\</OutputPath> <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName> + <TargetConnectionString> + </TargetConnectionString> <TargetDatabase>RelyingPartyDatabase</TargetDatabase> - <TreatTSqlWarningsAsErrors>False</TreatTSqlWarningsAsErrors> - <SuppressTSqlWarnings /> + <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\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" /> + <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\TeamData\Microsoft.Data.Schema.SqlTasks.targets" /> <ItemGroup> <Folder Include="Properties\" /> <Folder Include="Schema Objects\" /> @@ -153,10 +121,24 @@ <Folder Include="Schema Comparisons" /> </ItemGroup> <ItemGroup> - <Build Include="Permissions.sql" /> + <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> @@ -248,14 +230,20 @@ <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> - <None Include="Schema Comparisons\SchemaComparison1.scmp"> + <NotInBuild Include="Schema Comparisons\SchemaComparison1.scmp"> <SubType>NotInBuild</SubType> - </None> + </NotInBuild> </ItemGroup> <ItemGroup> <Build Include="Schema Objects\Schemas\dbo\Tables\Constraints\DF_IssuedToken_CreatedOn_1.defconst.sql"> @@ -298,20 +286,5 @@ <QuotedIdentifier>On</QuotedIdentifier> </Build> </ItemGroup> - <ItemGroup> - </ItemGroup> - <ItemGroup> - <None Include="Debug.publish.xml" /> - <None Include="Release.publish.xml" /> - </ItemGroup> - <ItemGroup> - <PreDeploy Include="Scripts\Pre-Deployment\Script.PreDeployment.sql" /> - </ItemGroup> - <ItemGroup> - <PostDeploy Include="Scripts\Post-Deployment\Script.PostDeployment.sql" /> - </ItemGroup> - <Target Name="GetDeployScriptPath" - DependsOnTargets="Build" - Outputs="$(MSBuildProjectDirectory)$(OutDir)$(MSBuildProjectName)_Create.sql" /> <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/Schema Comparisons/SchemaComparison1.scmp b/projecttemplates/RelyingPartyDatabase/Schema Comparisons/SchemaComparison1.scmp index b80761f..b3160a4 100644 --- a/projecttemplates/RelyingPartyDatabase/Schema Comparisons/SchemaComparison1.scmp +++ b/projecttemplates/RelyingPartyDatabase/Schema Comparisons/SchemaComparison1.scmp @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <SchemaComparison> - <Version>10</Version> + <Version>1</Version> <SourceModelProvider> <ConnectionBasedModelProvider> <ConnectionString>Data Source=.\sqlexpress;Initial Catalog=RelyingPartyDatabase;Integrated Security=True;Password=</ConnectionString> @@ -25,7 +25,7 @@ <ConfigurationOptionsElement> <PropertyElementName> <Name>PlanGenerationType</Name> - <Value>SqlDeploymentOptions</Value> + <Value>Sql90SchemaDeploymentOptions</Value> </PropertyElementName> <PropertyElementName> <Name>DoNotUseAlterAssemblyStatementsToUpdateCLRTypes</Name> @@ -308,22 +308,21 @@ <Value>True</Value> </PropertyElementName> <PropertyElementName> - <Name>Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlPermissionStatement</Name> + <Name>Microsoft.Data.Schema.Sql.SchemaModel.ISqlPermissionStatement</Name> <Value>ExcludedType</Value> </PropertyElementName> <PropertyElementName> - <Name>Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlFilegroup</Name> + <Name>Microsoft.Data.Schema.Sql.SchemaModel.ISqlFilegroup</Name> <Value>ExcludedType</Value> </PropertyElementName> <PropertyElementName> - <Name>Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlFile</Name> + <Name>Microsoft.Data.Schema.Sql.SchemaModel.ISqlFile</Name> <Value>ExcludedType</Value> </PropertyElementName> <PropertyElementName> - <Name>Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlExtendedProperty</Name> + <Name>Microsoft.Data.Schema.Sql.SchemaModel.ISqlExtendedProperty</Name> <Value>ExcludedType</Value> </PropertyElementName> </ConfigurationOptionsElement> </SchemaCompareSettingsService> - <SchemaCompareViewSettings /> </SchemaComparison>
\ No newline at end of file diff --git a/projecttemplates/RelyingPartyDatabase/Schema Comparisons/SchemaComparison1_20120225042555.scmp b/projecttemplates/RelyingPartyDatabase/Schema Comparisons/SchemaComparison1_20120225042555.scmp deleted file mode 100644 index b3160a4..0000000 --- a/projecttemplates/RelyingPartyDatabase/Schema Comparisons/SchemaComparison1_20120225042555.scmp +++ /dev/null @@ -1,328 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<SchemaComparison> - <Version>1</Version> - <SourceModelProvider> - <ConnectionBasedModelProvider> - <ConnectionString>Data Source=.\sqlexpress;Initial Catalog=RelyingPartyDatabase;Integrated Security=True;Password=</ConnectionString> - <DatabaseName>RelyingPartyDatabase</DatabaseName> - <DspFamilyName>sql</DspFamilyName> - <Name>[THINKAGAIN\sqlexpress.RelyingPartyDatabase]</Name> - </ConnectionBasedModelProvider> - </SourceModelProvider> - <TargetModelProvider> - <ProjectBasedModelProvider> - <ProjectGuid>{2b4261ac-25ac-4b8d-b459-1c42b6b1401d}</ProjectGuid> - <Name>RelyingPartyDatabase</Name> - </ProjectBasedModelProvider> - </TargetModelProvider> - <SchemaCompareSettingsService> - <SchemaCompareSettingsService> - <PropertyElementName> - <Name>Version</Name> - <Value>1</Value> - </PropertyElementName> - </SchemaCompareSettingsService> - <ConfigurationOptionsElement> - <PropertyElementName> - <Name>PlanGenerationType</Name> - <Value>Sql90SchemaDeploymentOptions</Value> - </PropertyElementName> - <PropertyElementName> - <Name>DoNotUseAlterAssemblyStatementsToUpdateCLRTypes</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>DisableAndReenableDdlTriggers</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreDdlTriggerOrder</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreDdlTriggerState</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreObjectPlacementOnPartitionScheme</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreAuthorizer</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreDefaultSchema</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreRouteLifetime</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>OnlyCompareElementsInSource</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreStatisticsSample</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>CommentOutSetVarDeclarations</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>GenerateDeployStateChecks</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>DeployDatabaseProperties</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreComments</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreWhitespace</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreKeywordCasing</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreSemicolonBetweenStatements</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>BlockIncrementalDeploymentIfDataLoss</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>PerformDatabaseBackup</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>SingleUserMode</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IncludeTransactionalScripts</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>EnforceMinimalDependencies</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>DeploymentCollationPreference</Name> - <Value>UseSourceModelCollation</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnorePartitionSchemes</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreWithNocheckOnCheckConstraints</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreWithNocheckOnForeignKeys</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreIdentitySeed</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreIncrement</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreFillFactor</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreIndexPadding</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreColumnCollation</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreLockHintsOnIndexes</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreTableOptions</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreIndexOptions</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreDmlTriggerOrder</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>ScriptDatabaseCollation</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreDmlTriggerState</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreAnsiNulls</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreQuotedIdentifiers</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreUserSettingsObjects</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>AbortOnFirstError</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreFilegroupPlacement</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreFullTextCatalogFilePath</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreFileAndLogFilePath</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreLoginSids</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreNotForReplication</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreFileSize</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>OverrideSevenSetOptions</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>SetAnsiNulls</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>SetAnsiPadding</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>SetAnsiWarnings</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>SetArithAbort</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>SetConcatNullYieldsNull</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>SetQuotedIdentifier</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>SetNumericRoundAbort</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>UnmodifiableObjectWarnings</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>DropIndexesNotInSource</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>DropConstraintsNotInSource</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>CheckNewConstraints</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreColumnOrder</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnorePasswords</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>IgnoreBodyDependencies</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>SourceSqlCmdVariablesFile</Name> - <Value>C:\Users\andarno\git\dotnetopenid\projecttemplates\RelyingPartyDatabase\Properties\Database.sqlcmdvars</Value> - </PropertyElementName> - <PropertyElementName> - <Name>AlwaysCreateNewDatabase</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>GenerateDropsIfNotInProject</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>TargetDatabaseName</Name> - <Value>RelyingPartyDatabase</Value> - </PropertyElementName> - <PropertyElementName> - <Name>TargetConnectionString</Name> - <Value>Data Source=.\sqlexpress;Initial Catalog=RelyingPartyDatabase;Integrated Security=True;Pooling=False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>VerifyDeployment</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>TreatVerificationErrorsAsWarnings</Name> - <Value>False</Value> - </PropertyElementName> - <PropertyElementName> - <Name>BuildtimeContributorsMustExist</Name> - <Value>True</Value> - </PropertyElementName> - <PropertyElementName> - <Name>Microsoft.Data.Schema.Sql.SchemaModel.ISqlPermissionStatement</Name> - <Value>ExcludedType</Value> - </PropertyElementName> - <PropertyElementName> - <Name>Microsoft.Data.Schema.Sql.SchemaModel.ISqlFilegroup</Name> - <Value>ExcludedType</Value> - </PropertyElementName> - <PropertyElementName> - <Name>Microsoft.Data.Schema.Sql.SchemaModel.ISqlFile</Name> - <Value>ExcludedType</Value> - </PropertyElementName> - <PropertyElementName> - <Name>Microsoft.Data.Schema.Sql.SchemaModel.ISqlExtendedProperty</Name> - <Value>ExcludedType</Value> - </PropertyElementName> - </ConfigurationOptionsElement> - </SchemaCompareSettingsService> -</SchemaComparison>
\ No newline at end of file diff --git a/projecttemplates/RelyingPartyDatabase/Schema Objects/Database Level Objects/Storage/Files/Database.mdf.sqlfile.sql b/projecttemplates/RelyingPartyDatabase/Schema Objects/Database Level Objects/Storage/Files/Database.mdf.sqlfile.sql new file mode 100644 index 0000000..0c2e5c8 --- /dev/null +++ b/projecttemplates/RelyingPartyDatabase/Schema Objects/Database Level Objects/Storage/Files/Database.mdf.sqlfile.sql @@ -0,0 +1,3 @@ +ALTER DATABASE [$(DatabaseName)] + ADD FILE (NAME = [$(Path1)$(DatabaseName).mdf], FILENAME = '$(Path1)$(DatabaseName).mdf', MAXSIZE = UNLIMITED, FILEGROWTH = 1024 KB) TO FILEGROUP [PRIMARY]; + diff --git a/projecttemplates/RelyingPartyDatabase/Schema Objects/Database Level Objects/Storage/Files/Database_log.sqlfile.sql b/projecttemplates/RelyingPartyDatabase/Schema Objects/Database Level Objects/Storage/Files/Database_log.sqlfile.sql new file mode 100644 index 0000000..bcd70cd --- /dev/null +++ b/projecttemplates/RelyingPartyDatabase/Schema Objects/Database Level Objects/Storage/Files/Database_log.sqlfile.sql @@ -0,0 +1,3 @@ +ALTER DATABASE [$(DatabaseName)] + ADD LOG FILE (NAME = [$(DatabaseName)_log], FILENAME = '$(Path1)$(DatabaseName)_log.LDF', MAXSIZE = 2097152 MB, FILEGROWTH = 10 %); + diff --git a/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj b/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj index 21b866e..58e684e 100644 --- a/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj +++ b/projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj @@ -187,10 +187,10 @@ <Project>{3896A32A-E876-4C23-B9B8-78E17D134CD3}</Project> <Name>DotNetOpenAuth.OpenId</Name> </ProjectReference> - <ProjectReference Include="..\RelyingPartyDatabase\RelyingPartyDatabase.sqlproj"> + <ProjectReference Include="..\RelyingPartyDatabase\RelyingPartyDatabase.dbproj"> <Name>RelyingPartyDatabase</Name> <!-- Deploy the latest SQL script first, so that this project can embed the latest version. --> - <Targets>GetDeployScriptPath</Targets> + <Targets>Build;Deploy</Targets> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> </ItemGroup> @@ -214,12 +214,6 @@ <Install>true</Install> </BootstrapperPackage> </ItemGroup> - <Target Name="CopySqlDeployScript"> - <MSBuild Projects="..\RelyingPartyDatabase\RelyingPartyDatabase.sqlproj" Targets="GetDeployScriptPath"> - <Output TaskParameter="TargetOutputs" PropertyName="SqlDeployScriptPath"/> - </MSBuild> - <Copy SourceFiles="$(SqlDeployScriptPath)" DestinationFiles="CreateDatabase.sql" /> - </Target> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. @@ -228,11 +222,5 @@ <Target Name="AfterBuild"> </Target> --> - <PropertyGroup> - <PrepareResourceNamesDependsOn> - CopySqlDeployScript; - $(PrepareResourceNamesDependsOn) - </PrepareResourceNamesDependsOn> - </PropertyGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " /> + <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/RelyingPartyLogic/Utilities.cs b/projecttemplates/RelyingPartyLogic/Utilities.cs index 440dbe7..d273881 100644 --- a/projecttemplates/RelyingPartyLogic/Utilities.cs +++ b/projecttemplates/RelyingPartyLogic/Utilities.cs @@ -73,7 +73,7 @@ GO" }; foreach (string remove in removeSnippets) { schemaSqlBuilder.Replace(remove, string.Empty); } - schemaSqlBuilder.Replace("Path1_Placeholder", HttpContext.Current.Server.MapPath("~/App_Data/")); + schemaSqlBuilder.Replace("$(Path1)", HttpContext.Current.Server.MapPath("~/App_Data/")); schemaSqlBuilder.Replace("WEBROOT", databasePath); schemaSqlBuilder.Replace("$(DatabaseName)", databaseName); diff --git a/projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj b/projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj index d207ba0..1f17837 100644 --- a/projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj +++ b/projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <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> - <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> - </PropertyGroup> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -20,7 +15,8 @@ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>4.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> + <UpgradeBackupLocation /> <TargetFrameworkProfile /> <UseIISExpress>false</UseIISExpress> </PropertyGroup> @@ -304,8 +300,7 @@ <Folder Include="bin\" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> @@ -333,4 +328,4 @@ </VisualStudio> </ProjectExtensions> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " /> -</Project> +</Project>
\ No newline at end of file |