Skip to content

Commit c69ef0d

Browse files
pheckephecke
committed
Merge branch 'master' into pehecke-webapi-sample-update
2 parents 7e76d25 + 4f8d98f commit c69ef0d

File tree

73 files changed

+326
-317
lines changed

Some content is hidden

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

73 files changed

+326
-317
lines changed

‎cds/App.config

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<connectionStrings>
44
<!--
@@ -24,18 +24,18 @@
2424
LoginPrompt=Auto"/>-->
2525
</connectionStrings>
2626
<system.diagnostics>
27-
<trace autoflush="true"/>
27+
<trace autoflush="true" />
2828
<sources>
2929
<source name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" switchName="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" switchType="System.Diagnostics.SourceSwitch">
3030
<listeners>
31-
<add name="console" type="System.Diagnostics.ConsoleTraceListener"/>
32-
<add name="fileListener"/>
31+
<add name="console" type="System.Diagnostics.ConsoleTraceListener" />
32+
<add name="fileListener" />
3333
</listeners>
3434
</source>
3535
<source name="Microsoft.Xrm.Tooling.CrmConnectControl" switchName="Microsoft.Xrm.Tooling.CrmConnectControl" switchType="System.Diagnostics.SourceSwitch">
3636
<listeners>
37-
<add name="console" type="System.Diagnostics.ConsoleTraceListener"/>
38-
<add name="fileListener"/>
37+
<add name="console" type="System.Diagnostics.ConsoleTraceListener" />
38+
<add name="fileListener" />
3939
</listeners>
4040
</source>
4141
<!--ADALListener conflicts with using ADAL libraries directly without the Xrm.Tooling.Connector assemblies.
@@ -58,13 +58,13 @@
5858
Warning: includes Error, Warning levels
5959
Error: includes Error level
6060
-->
61-
<add name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" value="Error"/>
62-
<add name="Microsoft.Xrm.Tooling.CrmConnectControl" value="Error"/>
63-
<add name="Microsoft.IdentityModel.Clients.ActiveDirectory" value="Error"/>
61+
<add name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" value="Error" />
62+
<add name="Microsoft.Xrm.Tooling.CrmConnectControl" value="Error" />
63+
<add name="Microsoft.IdentityModel.Clients.ActiveDirectory" value="Error" />
6464
</switches>
6565
<sharedListeners>
66-
<add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector"/>
67-
<add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" BaseFileName="PowerApps-Sample-Log" Location="LocalUserApplicationDirectory" MaxFileSize="52428800"/>
66+
<add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" />
67+
<add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" BaseFileName="PowerApps-Sample-Log" Location="LocalUserApplicationDirectory" MaxFileSize="52428800" />
6868
<!--
6969
fileListener Log written to
7070
\\{Computer Name}\Users\{UserName}\AppData\Roaming\PowerApps\{Sample Project Name}\1.0.0.0\PowerApps-Sample-Log-{YYYY}-{MM}-{DD}.log
@@ -83,37 +83,37 @@
8383
</sharedListeners>
8484
</system.diagnostics>
8585
<startup>
86-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
86+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
8787
</startup>
8888
<runtime>
8989
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
9090
<dependentAssembly>
91-
<assemblyIdentity name="Microsoft.Xrm.Sdk" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
92-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
91+
<assemblyIdentity name="Microsoft.Xrm.Sdk" publicKeyToken="31bf3856ad364e35" culture="neutral" />
92+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
9393
</dependentAssembly>
9494
<dependentAssembly>
95-
<assemblyIdentity name="Microsoft.Xrm.Sdk.Workflow" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
96-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
95+
<assemblyIdentity name="Microsoft.Xrm.Sdk.Workflow" publicKeyToken="31bf3856ad364e35" culture="neutral" />
96+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
9797
</dependentAssembly>
9898
<dependentAssembly>
99-
<assemblyIdentity name="Microsoft.Xrm.Tooling.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
100-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
99+
<assemblyIdentity name="Microsoft.Xrm.Tooling.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral" />
100+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
101101
</dependentAssembly>
102102
<dependentAssembly>
103-
<assemblyIdentity name="Microsoft.Crm.Sdk.Proxy" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
104-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
103+
<assemblyIdentity name="Microsoft.Crm.Sdk.Proxy" publicKeyToken="31bf3856ad364e35" culture="neutral" />
104+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
105105
</dependentAssembly>
106106
<dependentAssembly>
107-
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
108-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
107+
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
108+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
109109
</dependentAssembly>
110110
<dependentAssembly>
111-
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
112-
<bindingRedirect oldVersion="0.0.0.0-2.29.0.1078" newVersion="2.29.0.1078"/>
111+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
112+
<bindingRedirect oldVersion="0.0.0.0-2.29.0.1078" newVersion="2.29.0.1078" />
113113
</dependentAssembly>
114114
<dependentAssembly>
115-
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
116-
<bindingRedirect oldVersion="0.0.0.0-2.29.0.1078" newVersion="2.29.0.1078"/>
115+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms" publicKeyToken="31bf3856ad364e35" culture="neutral" />
116+
<bindingRedirect oldVersion="0.0.0.0-2.29.0.1078" newVersion="2.29.0.1078" />
117117
</dependentAssembly>
118118
</assemblyBinding>
119119
</runtime>

‎cds/orgsvc/C#/CRUDEmailAttachements/CRUDEmailAttachments.sln renamed to ‎cds/orgsvc/C#/CRUDEmailAttachments/CRUDEmailAttachments.sln

File renamed without changes.

‎cds/orgsvc/C#/CRUDEmailAttachements/CRUDEmailAttachements/App.config renamed to ‎cds/orgsvc/C#/CRUDEmailAttachments/CRUDEmailAttachments/App.config

File renamed without changes.

‎cds/orgsvc/C#/CRUDEmailAttachements/CRUDEmailAttachements/CRUDEmailAttachments.csproj renamed to ‎cds/orgsvc/C#/CRUDEmailAttachments/CRUDEmailAttachments/CRUDEmailAttachments.csproj

File renamed without changes.

‎cds/orgsvc/C#/CRUDEmailAttachements/CRUDEmailAttachements/Helper-Code/MyOrganizationSdkTypes.cs renamed to ‎cds/orgsvc/C#/CRUDEmailAttachments/CRUDEmailAttachments/Helper-Code/MyOrganizationSdkTypes.cs

File renamed without changes.

‎cds/orgsvc/C#/CRUDEmailAttachements/CRUDEmailAttachements/Helper-Code/OptionSets.cs renamed to ‎cds/orgsvc/C#/CRUDEmailAttachments/CRUDEmailAttachments/Helper-Code/OptionSets.cs

File renamed without changes.

‎cds/orgsvc/C#/CRUDEmailAttachements/CRUDEmailAttachements/Helper-Code/SampleHelpers.cs renamed to ‎cds/orgsvc/C#/CRUDEmailAttachments/CRUDEmailAttachments/Helper-Code/SampleHelpers.cs

File renamed without changes.

‎cds/orgsvc/C#/CRUDEmailAttachements/CRUDEmailAttachements/Helper-Code/SystemUserProvider.cs renamed to ‎cds/orgsvc/C#/CRUDEmailAttachments/CRUDEmailAttachments/Helper-Code/SystemUserProvider.cs

File renamed without changes.

‎cds/orgsvc/C#/CRUDEmailAttachements/CRUDEmailAttachements/Login-UX/ExampleLoginForm.xaml renamed to ‎cds/orgsvc/C#/CRUDEmailAttachments/CRUDEmailAttachments/Login-UX/ExampleLoginForm.xaml

File renamed without changes.

‎cds/orgsvc/C#/CRUDEmailAttachements/CRUDEmailAttachements/Login-UX/ExampleLoginForm.xaml.cs renamed to ‎cds/orgsvc/C#/CRUDEmailAttachments/CRUDEmailAttachments/Login-UX/ExampleLoginForm.xaml.cs

File renamed without changes.

0 commit comments

Comments
 (0)