Merge pull request #102 from microsoft/Nava_samplecode

Updating Authentication type to OAuth as default
microsoft · Mar 11, 2020 · 133c409 · 133c409
2 parents 4ad4b52 + 50bc823
commit 133c409
Show file tree

Hide file tree

Showing 63 changed files with 1,186 additions and 6,999 deletions.
diff --git a/cds/App.config b/cds/App.config
@@ -1,37 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
   <connectionStrings>
-
     <!--
-
     To run all samples without being prompted for login credentials, un-comment and edit one of the example connection strings below using appropriate values for your environment.
-
     Otherwise, you will be prompted for login information when you run a sample project.   
-
     
-
     Use the system.diagnostics/switches keys below to control levels of logging.
-
     -->
-
-
-
     <!-- 
-
       ** !IMPORTANT! **
-
-
-
       Be mindful that the connection information you enter in these will be available to anyone with access to this file.
-
       Do not push changes to this file to a cloned GitHub repository.
- 
-
     -->
-
-    <!--Online using Office 365-->
-
-    <!--<add name="Connect" connectionString="Url=https://yourorgname.crm.dynamics.com; [email protected]; Password=password; authtype=Office365; RequireNewInstance=True"/>-->
+    <!--Online using OAuth-->
+    <!--<!--<add name="Connect"
+ connectionString="
+  AuthType=OAuth;
+  [email protected];
+  Url=https://contosotest.crm.dynamics.com;
+  AppId=51f81489-12ee-4a9e-aaae-a2591f45987d;
+  RedirectUri=app://58145B91-0C36-4500-8554-080854F2AC97;
+  TokenCacheStorePath=d:\MyTokenCache;
+  LoginPrompt=Auto"/>-->
   </connectionStrings>
   <system.diagnostics>
     <trace autoflush="true" />
@@ -48,60 +38,36 @@
           <add name="fileListener" />
         </listeners>
       </source>
-
       <!--ADALListener conflicts with using ADAL libraries directly without the Xrm.Tooling.Connector assemblies.
-
       Uncomment this if you are using the Xrm.Tooling.Connector-->
-
       <!--<source name="Microsoft.IdentityModel.Clients.ActiveDirectory" switchName="Microsoft.IdentityModel.Clients.ActiveDirectory" switchType="System.Diagnostics.SourceSwitch">
-
         <listeners>
-
           <add name="console" type="System.Diagnostics.ConsoleTraceListener"/>
-
           <remove name="Default"/>
-
           <add name="ADALListener"/>
-
         </listeners>
-
       </source>-->
-
     </sources>
     <switches>
-
       <!-- 
-
 						Possible values for switches: Off, Error, Warning, Info, Verbose
-
 								All"        includes Error, Warning, Info, Verbose, Activity Tracing Trace levels
-
 								ActivityTracing:  Just Activity Tracing
-
 								Verbose:    includes Error, Warning, Info, Trace levels
-
 								Info:       includes Error, Warning, Info levels
-
 								Warning:    includes Error, Warning levels
-
 								Error:      includes Error level
-
 				-->
-
       <add name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" value="Error" />
       <add name="Microsoft.Xrm.Tooling.CrmConnectControl" value="Error" />
       <add name="Microsoft.IdentityModel.Clients.ActiveDirectory" value="Error" />
     </switches>
     <sharedListeners>
       <add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" />
       <add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" BaseFileName="PowerApps-Sample-Log" Location="LocalUserApplicationDirectory" MaxFileSize="52428800" />
-
       <!--
-
       fileListener Log written to 
-
       \\{Computer Name}\Users\{UserName}\AppData\Roaming\PowerApps\{Sample Project Name}\1.0.0.0\PowerApps-Sample-Log-{YYYY}-{MM}-{DD}.log
-
       -->
       <!--ADALListener conflicts with using ADAL libraries directly without the Xrm.Tooling.Connector assemblies.
       Uncomment this if you are using the Xrm.Tooling.Connector-->
@@ -117,7 +83,7 @@
     </sharedListeners>
   </system.diagnostics>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -138,17 +104,17 @@
         <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-       <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.29.0.1078" newVersion="2.29.0.1078" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.29.0.1078" newVersion="2.29.0.1078" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/cds/GenerateEntityDiagram/GenerateEntityDiagram/App.config b/cds/GenerateEntityDiagram/GenerateEntityDiagram/App.config
@@ -31,7 +31,13 @@
 
     <!--Online using Office 365-->
 
-    <!--<add name="Connect" connectionString="Url=https://yourorgname.crm.dynamics.com; [email protected]; Password=password; authtype=Office365; RequireNewInstance=True"/>-->
+    <!--<add name="Connect"
+ connectionString="
+  AuthType=OAuth;
+[email protected];
+Url=https://contosotest.crm.dynamics.com; AppId=51f81489-12ee-4a9e-aaae-a2591f45987d;
+  RedirectUri=app://58145B91-0C36-4500-8554-080854F2AC97;
+  LoginPrompt=Auto"/>-->
   </connectionStrings>
   <system.diagnostics>
     <trace autoflush="true" />

diff --git a/cds/orgsvc/C#/.vscode/settings.json b/cds/orgsvc/C#/.vscode/settings.json