Merge pull request #16 from PartnerCenterSamples/dev

PayPal express checkout support with PayPal accounts.
PartnerCenterSamples · Dec 9, 2016 · cb475a5 · cb475a5
2 parents c03b186 + 953ecda
commit cb475a5
Show file tree

Hide file tree

Showing 75 changed files with 2,417 additions and 2,390 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln merge=binary
+#*.csproj merge=binary
+#*.vbproj merge=binary
+#*.vcxproj merge=binary
+#*.vcproj merge=binary
+#*.dbproj merge=binary
+#*.fsproj merge=binary
+#*.lsproj merge=binary
+#*.wixproj merge=binary
+#*.modelproj merge=binary
+#*.sqlproj merge=binary
+#*.wwaproj merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg binary
+#*.png binary
+#*.gif binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc diff=astextplain
+#*.DOC diff=astextplain
+#*.docx diff=astextplain
+#*.DOCX diff=astextplain
+#*.dot diff=astextplain
+#*.DOT diff=astextplain
+#*.pdf diff=astextplain
+#*.PDF diff=astextplain
+#*.rtf diff=astextplain
+#*.RTF diff=astextplain
diff --git a/CustomerPortal.sln b/CustomerPortal.sln
@@ -1,12 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PartnerCenter.CustomerPortal", "Source\PartnerCenter.CustomerPortal\PartnerCenter.CustomerPortal.csproj", "{07C22DE5-B22A-474D-B593-9F5DA84C6DD8}"
 EndProject
 Project("{151D2E53-A2C4-4D7D-83FE-D05416EBD58E}") = "CustomerPortal.Deployment", "Source\CustomerPortal.Deployment\CustomerPortal.Deployment.deployproj", "{D0359F86-1AA6-4646-87A0-4BA66A5D35FD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Azure Click To Deploy", "Azure Click To Deploy", "{EA762CF6-7773-4566-9B93-6DF622B028B8}"
+ ProjectSection(SolutionItems) = preProject
+ azuredeploy.json = azuredeploy.json
+ azuredeploy.param.json = azuredeploy.param.json
+ EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Docs", "GitHub Docs", "{967550ED-94D1-40B1-8CA5-831075025128}"
+ ProjectSection(SolutionItems) = preProject
+ LICENSE = LICENSE
+ README.md = README.md
+ EndProjectSection
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU

diff --git a/Source/CustomerPortal.Deployment/CustomerPortal.Deployment.deployproj b/Source/CustomerPortal.Deployment/CustomerPortal.Deployment.deployproj
@@ -14,6 +14,7 @@
  <ProjectGuid>d0359f86-1aa6-4646-87a0-4ba66a5d35fd</ProjectGuid>
  </PropertyGroup>
  <PropertyGroup>
+ <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  <TargetFrameworkIdentifier>Deployment</TargetFrameworkIdentifier>
  <TargetFrameworkVersion>1.0</TargetFrameworkVersion>
  <PrepareForBuildDependsOn>

diff --git a/Source/CustomerPortal.Deployment/Templates/WebSite.json b/Source/CustomerPortal.Deployment/Templates/WebSite.json
@@ -1,116 +1,116 @@
 {
  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
  "contentVersion": "1.0.0.0",
- "parameters": {
- "webSiteName": {
- "type": "string",
- "minLength": 1
- },
- "webPortalClientId": {
- "type": "string",
- "minLength": 1
- },
- "webPortalClientSecret": {
- "type": "string",
- "minLength": 1
- },
- "webPortalAadTenantId": {
- "type": "string",
- "minLength": 1
- },
- "partnerCenterApplicationId": {
- "type": "string",
- "minLength": 1
- },
- "partnerCenterApplicationSecret": {
- "type": "string",
- "minLength": 1
- },
- "partnerCenterAadTenantId": {
- "type": "string",
- "minLength": 1
- },
- "aadAuthorityEndpoint": {
- "type": "string",
- "defaultValue": "https://login.microsoftonline.com/"
- },
- "graphEndpoint": {
- "type": "string",
- "defaultValue": "https://graph.windows.net"
- },
- "azureStorageConnectionEndpointSuffix": {
- "type": "string",
- "defaultValue": "core.windows.net"
- },
- "partnercenterApiEndpoint": {
- "type": "string",
- "defaultValue": "https://api.partnercenter.microsoft.com"
- },
- "hostingPlanName": {
- "type": "string",
- "minLength": 1
- },
- "skuName": {
- "type": "string",
- "defaultValue": "F1",
- "allowedValues": [
- "F1",
- "D1",
- "B1",
- "B2",
- "B3",
- "S1",
- "S2",
- "S3",
- "P1",
- "P2",
- "P3",
- "P4"
- ],
- "metadata": {
- "description": "Describes plan's pricing tier and instance size. Check details at https://azure.microsoft.com/en-us/pricing/details/app-service/"
- }
- },
- "skuCapacity": {
- "type": "int",
- "defaultValue": 1,
- "minValue": 1,
- "metadata": {
- "description": "Describes plan's instance count"
- }
- },
- "_artifactsLocation": {
- "type": "string"
- },
- "_artifactsLocationSasToken": {
- "type": "securestring"
- },
- "CustomerPortalPackageFolder": {
- "type": "string",
- "minLength": 1,
- "metadata": {
- "description": "WebDeploy package location. This path is relative to the _artifactsLocation parameter"
- }
- },
- "CustomerPortalPackageFileName": {
- "type": "string",
- "minLength": 1,
- "metadata": {
- "description": "Name of the webdeploy package"
- }
- },
- "CustomerPortalStorageAccountType": {
- "type": "string",
- "defaultValue": "Standard_LRS",
- "allowedValues": [
- "Standard_LRS",
- "Standard_ZRS",
- "Standard_GRS",
- "Standard_RAGRS",
- "Premium_LRS"
- ]
- }
+ "parameters": {
+ "webSiteName": {
+ "type": "string",
+ "minLength": 1
+ },
+ "webPortalClientId": {
+ "type": "string",
+ "minLength": 1
+ },
+ "webPortalClientSecret": {
+ "type": "string",
+ "minLength": 1
+ },
+ "webPortalAadTenantId": {
+ "type": "string",
+ "minLength": 1
+ },
+ "partnerCenterApplicationId": {
+ "type": "string",
+ "minLength": 1
+ },
+ "partnerCenterApplicationSecret": {
+ "type": "string",
+ "minLength": 1
  },
+ "partnerCenterAadTenantId": {
+ "type": "string",
+ "minLength": 1
+ },
+ "aadAuthorityEndpoint": {
+ "type": "string",
+ "defaultValue": "https://login.microsoftonline.com/"
+ },
+ "graphEndpoint": {
+ "type": "string",
+ "defaultValue": "https://graph.windows.net"
+ },
+ "azureStorageConnectionEndpointSuffix": {
+ "type": "string",
+ "defaultValue": "core.windows.net"
+ },
+ "partnercenterApiEndpoint": {
+ "type": "string",
+ "defaultValue": "https://api.partnercenter.microsoft.com"
+ },
+ "hostingPlanName": {
+ "type": "string",
+ "minLength": 1
+ },
+ "skuName": {
+ "type": "string",
+ "defaultValue": "F1",
+ "allowedValues": [
+ "F1",
+ "D1",
+ "B1",
+ "B2",
+ "B3",
+ "S1",
+ "S2",
+ "S3",
+ "P1",
+ "P2",
+ "P3",
+ "P4"
+ ],
+ "metadata": {
+ "description": "Describes plan's pricing tier and instance size. Check details at https://azure.microsoft.com/en-us/pricing/details/app-service/"
+ }
+ },
+ "skuCapacity": {
+ "type": "int",
+ "defaultValue": 1,
+ "minValue": 1,
+ "metadata": {
+ "description": "Describes plan's instance count"
+ }
+ },
+ "_artifactsLocation": {
+ "type": "string"
+ },
+ "_artifactsLocationSasToken": {
+ "type": "securestring"
+ },
+ "CustomerPortalPackageFolder": {
+ "type": "string",
+ "minLength": 1,
+ "metadata": {
+ "description": "WebDeploy package location. This path is relative to the _artifactsLocation parameter"
+ }
+ },
+ "CustomerPortalPackageFileName": {
+ "type": "string",
+ "minLength": 1,
+ "metadata": {
+ "description": "Name of the webdeploy package"
+ }
+ },
+ "CustomerPortalStorageAccountType": {
+ "type": "string",
+ "defaultValue": "Standard_LRS",
+ "allowedValues": [
+ "Standard_LRS",
+ "Standard_ZRS",
+ "Standard_GRS",
+ "Standard_RAGRS",
+ "Premium_LRS"
+ ]
+ }
+ },
  "variables": {
  "CustomerPortalStorageAccountName": "[concat('storage', uniqueString(resourceGroup().id))]"
  },
@@ -178,20 +178,20 @@
  "tags": {
  "displayName": "ApplicationSettings"
  },
-  "properties": {
-  "webPortal.clientId": "[parameters('webPortalClientId')]",
-  "webPortal.clientSecret": "[parameters('webPortalClientSecret')]",
-  "webPortal.AadTenantId": "[parameters('webPortalAadTenantId')]",
-  "aadEndpoint": "[parameters('aadAuthorityEndpoint')]",
-  "aadGraphEndpoint": "[parameters('graphEndpoint')]",
-  "partnerCenter.apiEndPoint": "[parameters('partnercenterApiEndpoint')]",
-  "partnerCenter.applicationId": "[parameters('partnerCenterApplicationId')]",
-  "partnerCenter.applicationSecret": "[parameters('partnerCenterApplicationSecret')]",
-  "partnerCenter.AadTenantId": "[parameters('partnerCenterAadTenantId')]",
-  "webPortal.azureStorageConnectionString": "[Concat('DefaultEndpointsProtocol=https;AccountName=',variables('CustomerPortalStorageAccountName'),';AccountKey=',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('CustomerPortalStorageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value)]",
-  "webPortal.azureStorageConnectionEndpointSuffix": "[parameters('azureStorageConnectionEndpointSuffix')]",
-  "webPortal.cacheConnectionString": ""
-  }
+ "properties": {
+ "webPortal.clientId": "[parameters('webPortalClientId')]",
+ "webPortal.clientSecret": "[parameters('webPortalClientSecret')]",
+ "webPortal.AadTenantId": "[parameters('webPortalAadTenantId')]",
+ "aadEndpoint": "[parameters('aadAuthorityEndpoint')]",
+ "aadGraphEndpoint": "[parameters('graphEndpoint')]",
+ "partnerCenter.apiEndPoint": "[parameters('partnercenterApiEndpoint')]",
+ "partnerCenter.applicationId": "[parameters('partnerCenterApplicationId')]",
+ "partnerCenter.applicationSecret": "[parameters('partnerCenterApplicationSecret')]",
+ "partnerCenter.AadTenantId": "[parameters('partnerCenterAadTenantId')]",
+ "webPortal.azureStorageConnectionString": "[Concat('DefaultEndpointsProtocol=https;AccountName=',variables('CustomerPortalStorageAccountName'),';AccountKey=',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('CustomerPortalStorageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value)]",
+ "webPortal.azureStorageConnectionEndpointSuffix": "[parameters('azureStorageConnectionEndpointSuffix')]",
+ "webPortal.cacheConnectionString": ""
+ }
  }
  ]
  },
@@ -215,4 +215,4 @@
  "value": "[concat('https://',reference(resourceId('Microsoft.Web/sites', parameters('webSiteName'))).hostNames[0])]"
  }
  }
-}
+}