Merge branch 'reports' into v3.3

Conflicts:
	projecttemplates/WebFormsRelyingParty/Web.config
	src/DotNetOpenAuth/OpenId/RelyingParty/PositiveAnonymousResponse.cs

4 files changed, 117 insertions, 0 deletions

diff --git a/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlcmdvars b/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlcmdvars
new file mode 100644
index 0000000..705af45
--- /dev/null
+++ b/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlcmdvars
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SqlCommandVariables xmlns="urn:Microsoft.VisualStudio.Data.Schema.Project.SqlCmdVars">
+  <Version>1</Version>
+  <Properties>
+    <Property>
+      <PropertyName>Path1</PropertyName>
+      <PropertyValue>WEBROOT\App_Data\</PropertyValue>
+    </Property>
+  </Properties>
+</SqlCommandVariables>
\ No newline at end of file
diff --git a/projecttemplates/RelyingPartyDatabase/Properties/Database.sqldeployment b/projecttemplates/RelyingPartyDatabase/Properties/Database.sqldeployment
new file mode 100644
index 0000000..c3f58f1
--- /dev/null
+++ b/projecttemplates/RelyingPartyDatabase/Properties/Database.sqldeployment
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DeploymentConfigurationSettings xmlns="urn:Microsoft.VisualStudio.Data.Schema.Project.DeploymentConfigurationSettings">
+  <Version>1</Version>
+  <Properties>
+    <AbortOnFirstError>False</AbortOnFirstError>
+    <AlwaysCreateNewDatabase>False</AlwaysCreateNewDatabase>
+    <BlockIncrementalDeploymentIfDataLoss>True</BlockIncrementalDeploymentIfDataLoss>
+    <CommentOutSetVarDeclarations>True</CommentOutSetVarDeclarations>
+    <DeployDatabaseProperties>True</DeployDatabaseProperties>
+    <DeploymentCollationPreference>UseSourceModelCollation</DeploymentCollationPreference>
+    <DoNotUseAlterAssemblyStatementsToUpdateCLRTypes>False</DoNotUseAlterAssemblyStatementsToUpdateCLRTypes>
+    <GenerateDropsIfNotInProject>False</GenerateDropsIfNotInProject>
+    <IgnoreFileAndLogFilePath>True</IgnoreFileAndLogFilePath>
+    <PerformDatabaseBackup>False</PerformDatabaseBackup>
+    <SingleUserMode>False</SingleUserMode>
+  </Properties>
+</DeploymentConfigurationSettings>
\ No newline at end of file
diff --git a/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlpermissions b/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlpermissions
new file mode 100644
index 0000000..2b973b7
--- /dev/null
+++ b/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlpermissions
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Permissions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:Microsoft.VisualStudio.Data.Schema.Permissions" Version="1.0">
+  <!--  The examples below are provided to illustrate how permissions 
+        are defined in the project system for Databases, Objects, 
+        and Columns.
+        
+        GRANT Database Permissions
+        
+        <PermissionStatement Action ="GRANT">
+          <Permission>CREATE TABLE</Permission>
+          <Grantee>User1</Grantee>
+        </PermissionStatement>
+        
+        GRANT Object Permission
+        
+        <PermissionStatement Action ="GRANT">
+          <Permission>SELECT</Permission>
+          <Grantee>User1</Grantee>
+          <Object Name ="Table1" Schema ="User1" Type ="OBJECT"/>
+        </PermissionStatement>
+
+        DENY Object Permission
+        
+        <PermissionStatement Action ="DENY">
+          <Permission>DELETE</Permission>
+          <Grantee>User1</Grantee>
+          <Object Name ="Table1" Schema ="User1" Type ="OBJECT"/>
+        </PermissionStatement>
+
+        GRANT Object Column Permission
+        
+        <PermissionStatement Action ="GRANT">
+          <Permission>SELECT</Permission>
+          <Grantee>User1</Grantee>
+          <Object Name ="Table1" Schema ="User1" Type ="OBJECT">
+            <Columns Treatment ="INCLUDE">
+              <Column Name=”Col1”/>
+              <Column Name=”Col2”/>
+              <Column Name=”…”/>
+            </Columns>
+          </Object>
+        </PermissionStatement>
+  -->
+</Permissions>
\ No newline at end of file
diff --git a/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlsettings b/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlsettings
new file mode 100644
index 0000000..b7d41ee
--- /dev/null
+++ b/projecttemplates/RelyingPartyDatabase/Properties/Database.sqlsettings
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CatalogProperties xmlns="urn:Microsoft.VisualStudio.Data.Schema.Project.CatalogProperties">
+  <Version>1</Version>
+  <Properties>
+    <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>
+    <TornPageDetection>False</TornPageDetection>
+    <Trustworthy>False</Trustworthy>
+    <UpdateOptions>READ_WRITE</UpdateOptions>
+    <VardecimalStorageFormatOn>False</VardecimalStorageFormatOn>
+  </Properties>
+</CatalogProperties>
\ No newline at end of file