Merge pull request #66 from microsoft/users/mbarbour/updateGDSSample

Users/mbarbour/update gds sample
microsoft · Nov 19, 2019 · 1f9b855 · 1f9b855
2 parents 8f6318b + dc29cd7
commit 1f9b855
Show file tree

Hide file tree

Showing 4 changed files with 357 additions and 63 deletions.
diff --git a/cds/App.config b/cds/App.config
@@ -1,12 +1,144 @@
 <?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"/>-->
+  </connectionStrings>
+  <system.diagnostics>
+    <trace autoflush="true" />
+    <sources>
+      <source name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" switchName="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" switchType="System.Diagnostics.SourceSwitch">
+        <listeners>
+          <add name="console" type="System.Diagnostics.ConsoleTraceListener" />
+          <add name="fileListener" />
+        </listeners>
+      </source>
+      <source name="Microsoft.Xrm.Tooling.CrmConnectControl" switchName="Microsoft.Xrm.Tooling.CrmConnectControl" switchType="System.Diagnostics.SourceSwitch">
+        <listeners>
+          <add name="console" type="System.Diagnostics.ConsoleTraceListener" />
+          <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-->
+      <!--<add name="ADALListener"
+        type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector"
+        BaseFileName="PowerApps-Sample-Log-ADAL"
+        Location="LocalUserApplicationDirectory"
+        MaxFileSize="52428800"/>-->
+      <!--
+      ADALListener Log written to 
+      \\{Computer Name}\Users\{UserName}\AppData\Roaming\PowerApps\{Sample Project Name}\1.0.0.0\PowerApps-Sample-Log-ADAL-{YYYY}-{MM}-{DD}.log
+      -->
+    </sharedListeners>
+  </system.diagnostics>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <assemblyIdentity name="Microsoft.Xrm.Sdk" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Xrm.Sdk.Workflow" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Xrm.Tooling.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Crm.Sdk.Proxy" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <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" />
         <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3" />
       </dependentAssembly>
     </assemblyBinding>

diff --git a/cds/webapi/C#/GlobalDiscovery/GlobalDiscovery/GlobalDiscovery.csproj b/cds/webapi/C#/GlobalDiscovery/GlobalDiscovery/GlobalDiscovery.csproj
@@ -35,7 +35,7 @@
     <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.5.2.4\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />