Skip to content

Commit cb475a5

Browse files
tameemansaritameemansari
authored
Merge pull request #16 from PartnerCenterSamples/dev
PayPal express checkout support with PayPal accounts.
2 parents c03b186 + 953ecda commit cb475a5

75 files changed

Lines changed: 2417 additions & 2390 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
#*.jpg binary
44+
#*.png binary
45+
#*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

‎CustomerPortal.sln‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PartnerCenter.CustomerPortal", "Source\PartnerCenter.CustomerPortal\PartnerCenter.CustomerPortal.csproj", "{07C22DE5-B22A-474D-B593-9F5DA84C6DD8}"
77
EndProject
88
Project("{151D2E53-A2C4-4D7D-83FE-D05416EBD58E}") = "CustomerPortal.Deployment", "Source\CustomerPortal.Deployment\CustomerPortal.Deployment.deployproj", "{D0359F86-1AA6-4646-87A0-4BA66A5D35FD}"
99
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Azure Click To Deploy", "Azure Click To Deploy", "{EA762CF6-7773-4566-9B93-6DF622B028B8}"
11+
ProjectSection(SolutionItems) = preProject
12+
azuredeploy.json = azuredeploy.json
13+
azuredeploy.param.json = azuredeploy.param.json
14+
EndProjectSection
15+
EndProject
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Docs", "GitHub Docs", "{967550ED-94D1-40B1-8CA5-831075025128}"
17+
ProjectSection(SolutionItems) = preProject
18+
LICENSE = LICENSE
19+
README.md = README.md
20+
EndProjectSection
21+
EndProject
1022
Global
1123
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1224
Debug|Any CPU = Debug|Any CPU

‎Source/CustomerPortal.Deployment/CustomerPortal.Deployment.deployproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<ProjectGuid>d0359f86-1aa6-4646-87a0-4ba66a5d35fd</ProjectGuid>
1515
</PropertyGroup>
1616
<PropertyGroup>
17+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1718
<TargetFrameworkIdentifier>Deployment</TargetFrameworkIdentifier>
1819
<TargetFrameworkVersion>1.0</TargetFrameworkVersion>
1920
<PrepareForBuildDependsOn>

‎Source/CustomerPortal.Deployment/Templates/WebSite.json‎

Lines changed: 124 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
11
{
22
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
4-
"parameters": {
5-
"webSiteName": {
6-
"type": "string",
7-
"minLength": 1
8-
},
9-
"webPortalClientId": {
10-
"type": "string",
11-
"minLength": 1
12-
},
13-
"webPortalClientSecret": {
14-
"type": "string",
15-
"minLength": 1
16-
},
17-
"webPortalAadTenantId": {
18-
"type": "string",
19-
"minLength": 1
20-
},
21-
"partnerCenterApplicationId": {
22-
"type": "string",
23-
"minLength": 1
24-
},
25-
"partnerCenterApplicationSecret": {
26-
"type": "string",
27-
"minLength": 1
28-
},
29-
"partnerCenterAadTenantId": {
30-
"type": "string",
31-
"minLength": 1
32-
},
33-
"aadAuthorityEndpoint": {
34-
"type": "string",
35-
"defaultValue": "https://login.microsoftonline.com/"
36-
},
37-
"graphEndpoint": {
38-
"type": "string",
39-
"defaultValue": "https://graph.windows.net"
40-
},
41-
"azureStorageConnectionEndpointSuffix": {
42-
"type": "string",
43-
"defaultValue": "core.windows.net"
44-
},
45-
"partnercenterApiEndpoint": {
46-
"type": "string",
47-
"defaultValue": "https://api.partnercenter.microsoft.com"
48-
},
49-
"hostingPlanName": {
50-
"type": "string",
51-
"minLength": 1
52-
},
53-
"skuName": {
54-
"type": "string",
55-
"defaultValue": "F1",
56-
"allowedValues": [
57-
"F1",
58-
"D1",
59-
"B1",
60-
"B2",
61-
"B3",
62-
"S1",
63-
"S2",
64-
"S3",
65-
"P1",
66-
"P2",
67-
"P3",
68-
"P4"
69-
],
70-
"metadata": {
71-
"description": "Describes plan's pricing tier and instance size. Check details at https://azure.microsoft.com/en-us/pricing/details/app-service/"
72-
}
73-
},
74-
"skuCapacity": {
75-
"type": "int",
76-
"defaultValue": 1,
77-
"minValue": 1,
78-
"metadata": {
79-
"description": "Describes plan's instance count"
80-
}
81-
},
82-
"_artifactsLocation": {
83-
"type": "string"
84-
},
85-
"_artifactsLocationSasToken": {
86-
"type": "securestring"
87-
},
88-
"CustomerPortalPackageFolder": {
89-
"type": "string",
90-
"minLength": 1,
91-
"metadata": {
92-
"description": "WebDeploy package location. This path is relative to the _artifactsLocation parameter"
93-
}
94-
},
95-
"CustomerPortalPackageFileName": {
96-
"type": "string",
97-
"minLength": 1,
98-
"metadata": {
99-
"description": "Name of the webdeploy package"
100-
}
101-
},
102-
"CustomerPortalStorageAccountType": {
103-
"type": "string",
104-
"defaultValue": "Standard_LRS",
105-
"allowedValues": [
106-
"Standard_LRS",
107-
"Standard_ZRS",
108-
"Standard_GRS",
109-
"Standard_RAGRS",
110-
"Premium_LRS"
111-
]
112-
}
4+
"parameters": {
5+
"webSiteName": {
6+
"type": "string",
7+
"minLength": 1
8+
},
9+
"webPortalClientId": {
10+
"type": "string",
11+
"minLength": 1
12+
},
13+
"webPortalClientSecret": {
14+
"type": "string",
15+
"minLength": 1
16+
},
17+
"webPortalAadTenantId": {
18+
"type": "string",
19+
"minLength": 1
20+
},
21+
"partnerCenterApplicationId": {
22+
"type": "string",
23+
"minLength": 1
24+
},
25+
"partnerCenterApplicationSecret": {
26+
"type": "string",
27+
"minLength": 1
11328
},
29+
"partnerCenterAadTenantId": {
30+
"type": "string",
31+
"minLength": 1
32+
},
33+
"aadAuthorityEndpoint": {
34+
"type": "string",
35+
"defaultValue": "https://login.microsoftonline.com/"
36+
},
37+
"graphEndpoint": {
38+
"type": "string",
39+
"defaultValue": "https://graph.windows.net"
40+
},
41+
"azureStorageConnectionEndpointSuffix": {
42+
"type": "string",
43+
"defaultValue": "core.windows.net"
44+
},
45+
"partnercenterApiEndpoint": {
46+
"type": "string",
47+
"defaultValue": "https://api.partnercenter.microsoft.com"
48+
},
49+
"hostingPlanName": {
50+
"type": "string",
51+
"minLength": 1
52+
},
53+
"skuName": {
54+
"type": "string",
55+
"defaultValue": "F1",
56+
"allowedValues": [
57+
"F1",
58+
"D1",
59+
"B1",
60+
"B2",
61+
"B3",
62+
"S1",
63+
"S2",
64+
"S3",
65+
"P1",
66+
"P2",
67+
"P3",
68+
"P4"
69+
],
70+
"metadata": {
71+
"description": "Describes plan's pricing tier and instance size. Check details at https://azure.microsoft.com/en-us/pricing/details/app-service/"
72+
}
73+
},
74+
"skuCapacity": {
75+
"type": "int",
76+
"defaultValue": 1,
77+
"minValue": 1,
78+
"metadata": {
79+
"description": "Describes plan's instance count"
80+
}
81+
},
82+
"_artifactsLocation": {
83+
"type": "string"
84+
},
85+
"_artifactsLocationSasToken": {
86+
"type": "securestring"
87+
},
88+
"CustomerPortalPackageFolder": {
89+
"type": "string",
90+
"minLength": 1,
91+
"metadata": {
92+
"description": "WebDeploy package location. This path is relative to the _artifactsLocation parameter"
93+
}
94+
},
95+
"CustomerPortalPackageFileName": {
96+
"type": "string",
97+
"minLength": 1,
98+
"metadata": {
99+
"description": "Name of the webdeploy package"
100+
}
101+
},
102+
"CustomerPortalStorageAccountType": {
103+
"type": "string",
104+
"defaultValue": "Standard_LRS",
105+
"allowedValues": [
106+
"Standard_LRS",
107+
"Standard_ZRS",
108+
"Standard_GRS",
109+
"Standard_RAGRS",
110+
"Premium_LRS"
111+
]
112+
}
113+
},
114114
"variables": {
115115
"CustomerPortalStorageAccountName": "[concat('storage', uniqueString(resourceGroup().id))]"
116116
},
@@ -178,20 +178,20 @@
178178
"tags": {
179179
"displayName": "ApplicationSettings"
180180
},
181-
"properties": {
182-
"webPortal.clientId": "[parameters('webPortalClientId')]",
183-
"webPortal.clientSecret": "[parameters('webPortalClientSecret')]",
184-
"webPortal.AadTenantId": "[parameters('webPortalAadTenantId')]",
185-
"aadEndpoint": "[parameters('aadAuthorityEndpoint')]",
186-
"aadGraphEndpoint": "[parameters('graphEndpoint')]",
187-
"partnerCenter.apiEndPoint": "[parameters('partnercenterApiEndpoint')]",
188-
"partnerCenter.applicationId": "[parameters('partnerCenterApplicationId')]",
189-
"partnerCenter.applicationSecret": "[parameters('partnerCenterApplicationSecret')]",
190-
"partnerCenter.AadTenantId": "[parameters('partnerCenterAadTenantId')]",
191-
"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)]",
192-
"webPortal.azureStorageConnectionEndpointSuffix": "[parameters('azureStorageConnectionEndpointSuffix')]",
193-
"webPortal.cacheConnectionString": ""
194-
}
181+
"properties": {
182+
"webPortal.clientId": "[parameters('webPortalClientId')]",
183+
"webPortal.clientSecret": "[parameters('webPortalClientSecret')]",
184+
"webPortal.AadTenantId": "[parameters('webPortalAadTenantId')]",
185+
"aadEndpoint": "[parameters('aadAuthorityEndpoint')]",
186+
"aadGraphEndpoint": "[parameters('graphEndpoint')]",
187+
"partnerCenter.apiEndPoint": "[parameters('partnercenterApiEndpoint')]",
188+
"partnerCenter.applicationId": "[parameters('partnerCenterApplicationId')]",
189+
"partnerCenter.applicationSecret": "[parameters('partnerCenterApplicationSecret')]",
190+
"partnerCenter.AadTenantId": "[parameters('partnerCenterAadTenantId')]",
191+
"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)]",
192+
"webPortal.azureStorageConnectionEndpointSuffix": "[parameters('azureStorageConnectionEndpointSuffix')]",
193+
"webPortal.cacheConnectionString": ""
194+
}
195195
}
196196
]
197197
},
@@ -215,4 +215,4 @@
215215
"value": "[concat('https://',reference(resourceId('Microsoft.Web/sites', parameters('webSiteName'))).hostNames[0])]"
216216
}
217217
}
218-
}
218+
}

0 commit comments

Comments
 (0)