Skip to content

Commit 1643f0b

Browse files
pheckephecke
authored
Merge pull request #147 from microsoft/pehecke-webapi-sample-update
Web API sample update
2 parents 9b2e535 + 706a238 commit 1643f0b

Some content is hidden

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

57 files changed

+481
-2126
lines changed

‎cds/webapi/C#/CDSWebApiService/App.config renamed to ‎cds/webapi/C#/App.config

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,32 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration>
3+
34
<startup>
4-
<supportedRuntime version="v4.0"
5-
sku=".NETFramework,Version=v4.7.2" />
5+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
66
</startup>
7+
78
<connectionStrings>
8-
99
<!--
10-
1110
** !IMPORTANT! **
12-
1311
Be mindful that the connection information you enter here will be available to anyone with access to this file.
14-
1512
Do not push changes to this file to a cloned GitHub repository.
16-
13+
14+
This file is used by several Web API samples including: AsyncParallelOperations, BasicOperations,
15+
ConditionalOperations, ParallelOperations, and QueryData.
1716
-->
1817

19-
20-
2118
<add name="Connect"
22-
connectionString="Url=https://yourorg.api.crm.dynamics.com;
19+
connectionString="Url=https://{myorg}.api.crm.dynamics.com;
2320
Authority=null;
2421
ClientId=51f81489-12ee-4a9e-aaae-a2591f45987d;
2522
RedirectUrl=app://58145B91-0C36-4500-8554-080854F2AC97;
26-
UserPrincipalName=you@yourorg.onmicrosoft.com;
27-
Password=y0urp455w0rd;
23+
UserPrincipalName={user}@{myorg}.onmicrosoft.com;
24+
Password={password};
2825
CallerObjectId=null;
2926
Version=9.1;
3027
MaxRetries=3;
3128
TimeoutInSeconds=180;
3229
"/>
33-
3430
</connectionStrings>
31+
3532
</configuration>

‎cds/webapi/C#/CDSWebApiService/AsyncParallelOperations/AsyncParallelOperations.csproj renamed to ‎cds/webapi/C#/AsyncParallelOperations/AsyncParallelOperations.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<ItemGroup>
5757
<None Include="..\App.config">
5858
<Link>App.config</Link>
59+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5960
</None>
6061
<None Include="packages.config" />
6162
<None Include="README.md" />

‎cds/webapi/C#/AsyncParallelOperations/AsyncParallelOperations.sln

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30225.117
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncParallelOperations", "AsyncParallelOperations.csproj", "{CB194775-BAB4-49F1-8CF5-EEAEBB3C2FA9}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CDSWebApiService", "..\CDSWebApiService\CDSWebApiService.csproj", "{E8C225D3-F15A-417C-AA4A-9114C0F2BDF4}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{CB194775-BAB4-49F1-8CF5-EEAEBB3C2FA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{CB194775-BAB4-49F1-8CF5-EEAEBB3C2FA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{CB194775-BAB4-49F1-8CF5-EEAEBB3C2FA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{CB194775-BAB4-49F1-8CF5-EEAEBB3C2FA9}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{E8C225D3-F15A-417C-AA4A-9114C0F2BDF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{E8C225D3-F15A-417C-AA4A-9114C0F2BDF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{E8C225D3-F15A-417C-AA4A-9114C0F2BDF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{E8C225D3-F15A-417C-AA4A-9114C0F2BDF4}.Release|Any CPU.Build.0 = Release|Any CPU
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {D6CFEF98-E971-4C15-B4C7-088385D9E7A1}
30+
EndGlobalSection
31+
EndGlobal

‎cds/webapi/C#/CDSWebApiService/AsyncParallelOperations/Program.cs renamed to ‎cds/webapi/C#/AsyncParallelOperations/Program.cs

File renamed without changes.

‎cds/webapi/C#/CDSWebApiService/AsyncParallelOperations/Properties/AssemblyInfo.cs renamed to ‎cds/webapi/C#/AsyncParallelOperations/Properties/AssemblyInfo.cs

File renamed without changes.

‎cds/webapi/C#/CDSWebApiService/AsyncParallelOperations/README.md renamed to ‎cds/webapi/C#/AsyncParallelOperations/README.md

File renamed without changes.

‎cds/webapi/C#/CDSWebApiService/AsyncParallelOperations/packages.config renamed to ‎cds/webapi/C#/AsyncParallelOperations/packages.config

File renamed without changes.

‎cds/webapi/C#/CDSWebApiService/BasicOperations/BasicOperations.csproj renamed to ‎cds/webapi/C#/BasicOperations/BasicOperations.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<ItemGroup>
5454
<None Include="..\App.config">
5555
<Link>App.config</Link>
56+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5657
</None>
5758
<None Include="packages.config" />
5859
<None Include="README.md" />

‎cds/webapi/C#/BasicOperations/BasicOperations.sln

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,31 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27428.2043
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30225.117
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicOperations", "BasicOperations\BasicOperations.csproj", "{12084EC7-3654-42EA-B545-000D4962F159}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicOperations", "BasicOperations.csproj", "{DEF5DD26-C911-40A7-A249-7728D360FB1A}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CDSWebApiService", "..\CDSWebApiService\CDSWebApiService.csproj", "{E8C225D3-F15A-417C-AA4A-9114C0F2BDF4}"
79
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|Any CPU = Debug|Any CPU
1113
Release|Any CPU = Release|Any CPU
1214
EndGlobalSection
1315
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{12084EC7-3654-42EA-B545-000D4962F159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{12084EC7-3654-42EA-B545-000D4962F159}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{12084EC7-3654-42EA-B545-000D4962F159}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{12084EC7-3654-42EA-B545-000D4962F159}.Release|Any CPU.Build.0 = Release|Any CPU
16+
{DEF5DD26-C911-40A7-A249-7728D360FB1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{DEF5DD26-C911-40A7-A249-7728D360FB1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{DEF5DD26-C911-40A7-A249-7728D360FB1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{DEF5DD26-C911-40A7-A249-7728D360FB1A}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{E8C225D3-F15A-417C-AA4A-9114C0F2BDF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{E8C225D3-F15A-417C-AA4A-9114C0F2BDF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{E8C225D3-F15A-417C-AA4A-9114C0F2BDF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{E8C225D3-F15A-417C-AA4A-9114C0F2BDF4}.Release|Any CPU.Build.0 = Release|Any CPU
1824
EndGlobalSection
1925
GlobalSection(SolutionProperties) = preSolution
2026
HideSolutionNode = FALSE
2127
EndGlobalSection
2228
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {FC5866C4-3C4A-49BE-A21F-127A75886A40}
29+
SolutionGuid = {C9F35D5A-9543-476B-85F1-AAF0D1ED3864}
2430
EndGlobalSection
2531
EndGlobal

‎cds/webapi/C#/BasicOperations/BasicOperations/BasicOperations.csproj

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)