Skip to content

Commit 59af74c

Browse files
scottdurowaelsmorepawelgradecki
authored
Spkl dev (#388)
* Spkl dev 191212 (#347) * Resolves #176 * Updated dependancies to v9 * 1.0.4 Updated assembly name and added dependnacy on fakeiteasy * Added support for setting all ExecutionContext properties * Fixes #218 & SetState & SetStateDynamicEntity message property of EntityMoniker (#220) * Fixes #218 * SetState & SetStateDynamicEntity use message property of EntityMoniker * Fixes #232 * Version 1.0.6 * ix dependency load error - Cannot resolve dependency to assembly 'Sy… …stem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' because it has not been preloaded. When using the ReflectionOnly APIs, dependent assemblies must be pre-loaded or loaded on demand through the ReflectionOnlyAssemblyResolve event. site:stackoverflow.com * Fix #226: Predefined Type '' is not defined or imported (#236) Due to Visual Studio 2017 changes in how assemblies are resolved. Now project can be built using Visual Studio 2017 * Fixed typo (#280) * Fix some typos (#311) * Let OOB batch files to pass parameters like "/p" to spkl.exe * Add support for workflow base class Fix dependency load error * Fix dependency load error (#346) * ix dependency load error - Cannot resolve dependency to assembly 'Sy… …stem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089' because it has not been preloaded. When using the ReflectionOnly APIs, dependent assemblies must be pre-loaded or loaded on demand through the ReflectionOnlyAssemblyResolve event. site:stackoverflow.com * Add support for workflow base class Fix dependency load error * #308 Removed dependency on OrganizationServiceProxy that does not support OAuth * 🧹 Fixed typo and formatting * 🧹 Code formatting clean up * 🧪 Unit/Integration Test Playlists * 📦 Updated to latest nuget packages * Added FilteringService dependencies * Removed WindowsForms reference from nuget package as it's no longer included in the SDK * Updated nuget spec to depend on CoreTools 9.1.0.25 * Compare web resources content before update (#352) * Comparing WebResource content, to skip unnecessary update * Comparing WebResource content, to skip unnecessary update * Ability to specify earlybound types as array, not single string with comma separator * #354 Export command 🧹 Code formatting tidy up * Use xrm tooling for command line login prompt (#373) * #369 New Command Line Login using Xrm.Tooling * Added message about /l legacy login switch * #366 - Allow registering of combined plugin/wf activity libraries (#374) * 🐛 Pick up Release assembly when in Release mode Co-authored-by: Andy Elsmore <[email protected]> Co-authored-by: pawelgradecki <[email protected]>
1 parent 9da12da commit 59af74c

File tree

73 files changed

+14956
-493
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

+14956
-493
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -139,3 +139,4 @@ UpgradeLog*.XML
139139
*.ide-shm
140140
*.ide-wal
141141
/.vs
142+
/spkl/.vs/spkl

‎spkl/CrmSvcUtilFilteringService/CrmSvcUtil.FilteringService.csproj

+43-18
Original file line numberDiff line numberDiff line change
@@ -52,48 +52,66 @@
5252
<HintPath>..\packages\Microsoft.CrmSdk.CoreTools.9.0.0.7\content\bin\coretools\CrmSvcUtil.exe</HintPath>
5353
</Reference>
5454
<Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.0.7\lib\net452\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
55+
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.21\lib\net462\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
5656
</Reference>
57-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
60-
<Private>True</Private>
57+
<Reference Include="Microsoft.CSharp" />
58+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.5.2.4\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
6160
</Reference>
62-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<SpecificVersion>False</SpecificVersion>
64-
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
61+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.0.25\lib\net462\Microsoft.Rest.ClientRuntime.dll</HintPath>
6563
<Private>True</Private>
6664
</Reference>
6765
<Reference Include="Microsoft.Xrm.Sdk, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.0.7\lib\net452\Microsoft.Xrm.Sdk.dll</HintPath>
66+
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.21\lib\net462\Microsoft.Xrm.Sdk.dll</HintPath>
6967
</Reference>
7068
<Reference Include="Microsoft.Xrm.Sdk.Deployment, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\packages\Microsoft.CrmSdk.Deployment.9.0.0.7\lib\net452\Microsoft.Xrm.Sdk.Deployment.dll</HintPath>
72-
<Private>True</Private>
69+
<HintPath>..\packages\Microsoft.CrmSdk.Deployment.9.0.2.21\lib\net462\Microsoft.Xrm.Sdk.Deployment.dll</HintPath>
7370
</Reference>
7471
<Reference Include="Microsoft.Xrm.Sdk.Workflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Microsoft.CrmSdk.Workflow.9.0.0.7\lib\net452\Microsoft.Xrm.Sdk.Workflow.dll</HintPath>
72+
<HintPath>..\packages\Microsoft.CrmSdk.Workflow.9.0.2.21\lib\net462\Microsoft.Xrm.Sdk.Workflow.dll</HintPath>
7673
</Reference>
77-
<Reference Include="Microsoft.Xrm.Tooling.Connector, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.0.0.7\lib\net452\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
74+
<Reference Include="Microsoft.Xrm.Tooling.Connector, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.0.25\lib\net462\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
7976
<Private>True</Private>
8077
</Reference>
78+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
79+
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
80+
</Reference>
8181
<Reference Include="PresentationFramework" />
8282
<Reference Include="System" />
8383
<Reference Include="System.Activities" />
8484
<Reference Include="System.Activities.Presentation" />
8585
<Reference Include="System.Core" />
8686
<Reference Include="System.Configuration" />
87+
<Reference Include="System.Data" />
88+
<Reference Include="System.Data.DataSetExtensions" />
8789
<Reference Include="System.DirectoryServices" />
8890
<Reference Include="System.DirectoryServices.AccountManagement" />
91+
<Reference Include="System.Drawing" />
8992
<Reference Include="System.IdentityModel" />
90-
<Reference Include="System.Net.Http" />
93+
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94+
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
95+
</Reference>
9196
<Reference Include="System.Runtime.Serialization" />
9297
<Reference Include="System.Security" />
98+
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
99+
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
100+
</Reference>
101+
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
102+
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
103+
</Reference>
104+
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
105+
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
106+
</Reference>
107+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
108+
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
109+
</Reference>
93110
<Reference Include="System.ServiceModel" />
94111
<Reference Include="System.ServiceModel.Web" />
95112
<Reference Include="System.Web" />
96113
<Reference Include="System.Web.Services" />
114+
<Reference Include="System.Windows.Forms" />
97115
<Reference Include="System.Workflow.Activities" />
98116
<Reference Include="System.Workflow.ComponentModel" />
99117
<Reference Include="System.Workflow.Runtime" />
@@ -108,7 +126,7 @@
108126
<ItemGroup>
109127
<None Include="app.config" />
110128
<None Include="bin\coretools\CrmSvcUtil.exe.config" />
111-
<None Include="bin\coretools\LicenseTerms.docx" />
129+
<None Include="bin\coretools\SolutionPackager.exe.config" />
112130
<None Include="spkl.crmsvcutil.config">
113131
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
114132
<SubType>Designer</SubType>
@@ -120,16 +138,23 @@
120138
<ItemGroup>
121139
<Content Include="bin\coretools\CrmSvcUtil.exe" />
122140
<Content Include="bin\coretools\CrmSvcUtil.xml" />
141+
<Content Include="bin\coretools\Microsoft.ApplicationInsights.dll" />
123142
<Content Include="bin\coretools\Microsoft.Crm.Sdk.Proxy.dll" />
124143
<Content Include="bin\coretools\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
125-
<Content Include="bin\coretools\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
144+
<Content Include="bin\coretools\Microsoft.PowerApps.AppInsights.BatchedTelemetry.dll" />
145+
<Content Include="bin\coretools\Microsoft.PowerApps.AppInsights.BatchedTelemetryChannel.dll" />
146+
<Content Include="bin\coretools\Microsoft.Rest.ClientRuntime.dll" />
126147
<Content Include="bin\coretools\Microsoft.Xrm.Sdk.Deployment.dll" />
127148
<Content Include="bin\coretools\Microsoft.Xrm.Sdk.dll" />
128149
<Content Include="bin\coretools\Microsoft.Xrm.Tooling.Connector.dll" />
129150
<Content Include="bin\coretools\Microsoft.Xrm.Tooling.CrmConnectControl.dll" />
130151
<Content Include="bin\coretools\Microsoft.Xrm.Tooling.Ui.Styles.dll" />
131-
<Content Include="bin\coretools\Other Redistributable.txt" />
152+
<Content Include="bin\coretools\Newtonsoft.Json.dll" />
153+
<Content Include="bin\coretools\pacTelemetryUpload.exe" />
132154
<Content Include="bin\coretools\SolutionPackager.exe" />
155+
<Content Include="bin\coretools\SolutionPackagerLib.dll" />
156+
<Content Include="bin\coretools\System.Diagnostics.DiagnosticSource.dll" />
157+
<Content Include="bin\coretools\System.ValueTuple.dll" />
133158
</ItemGroup>
134159
<ItemGroup>
135160
<Folder Include="bin\Debug\" />

‎spkl/CrmSvcUtilFilteringService/app.config

+12
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@
1414
<assemblyIdentity name="Microsoft.Xrm.Tooling.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral" />
1515
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
1616
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
28+
</dependentAssembly>
1729
</assemblyBinding>
1830
</runtime>
1931
</configuration>

‎spkl/CrmSvcUtilFilteringService/bin/coretools/CrmSvcUtil.exe

136 KB
Binary file not shown.

‎spkl/CrmSvcUtilFilteringService/bin/coretools/CrmSvcUtil.exe.config

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<appSettings>
4+
<add key="MaxCrmConnectionTimeOutMinutes" value="20"/>
5+
</appSettings>
6+
<system.diagnostics>
7+
<trace autoflush="true"/>
8+
<sources>
9+
<source name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" switchName="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" switchType="System.Diagnostics.SourceSwitch">
10+
<listeners>
11+
<add name="console" type="System.Diagnostics.ConsoleTraceListener"/>
12+
<add name="fileListener"/>
13+
</listeners>
14+
</source>
15+
<source name="Microsoft.Xrm.Tooling.CrmConnectControl" switchName="Microsoft.Xrm.Tooling.CrmConnectControl" switchType="System.Diagnostics.SourceSwitch">
16+
<listeners>
17+
<add name="console" type="System.Diagnostics.ConsoleTraceListener"/>
18+
<add name="fileListener"/>
19+
</listeners>
20+
</source>
21+
<source name="CrmSvcUtil" switchName="CrmSvcUtil" switchType="System.Diagnostics.SourceSwitch">
22+
<listeners>
23+
<add name="console" type="System.Diagnostics.ConsoleTraceListener"/>
24+
<add name="fileListener"/>
25+
</listeners>
26+
</source>
27+
<!-- ADAL Log Source -->
28+
<source name="Microsoft.IdentityModel.Clients.ActiveDirectory" switchName="Microsoft.IdentityModel.Clients.ActiveDirectory" switchType="System.Diagnostics.SourceSwitch">
29+
<listeners>
30+
<add name="console" type="System.Diagnostics.DefaultTraceListener" />
31+
<add name="ADALListener" />
32+
</listeners>
33+
</source>
34+
</sources>
35+
<switches>
36+
<!--Possible values for switches: Off, Error, Warning, Information, Verbose
37+
Verbose: includes Error, Warning, Info, Trace levels
38+
Information: includes Error, Warning, Info levels
39+
Warning: includes Error, Warning levels
40+
Error: includes Error level-->
41+
<add name="Microsoft.Xrm.Tooling.CrmConnectControl" value="Error"/>
42+
<add name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" value="Error"/>
43+
<add name="CrmSvcUtil" value="Error"/>
44+
<add name="Microsoft.IdentityModel.Clients.ActiveDirectory" value="Error" />
45+
</switches>
46+
<sharedListeners>
47+
<add name="fileListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="CrmSvcUtil.log"/>
48+
<add name="ADALListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="ADAL_CrmSvcUtil.log" />
49+
</sharedListeners>
50+
</system.diagnostics>
51+
<runtime>
52+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
53+
<dependentAssembly>
54+
<assemblyIdentity name="Microsoft.Crm.Sdk" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
55+
<bindingRedirect oldVersion="4.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
56+
</dependentAssembly>
57+
<dependentAssembly>
58+
<assemblyIdentity name="Microsoft.Xrm.Sdk" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
59+
<bindingRedirect oldVersion="4.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
60+
</dependentAssembly>
61+
<dependentAssembly>
62+
<assemblyIdentity name="Microsoft.Xrm.Sdk.Workflow" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
63+
<bindingRedirect oldVersion="4.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
64+
</dependentAssembly>
65+
<dependentAssembly>
66+
<assemblyIdentity name="Microsoft.Crm.Sdk.Proxy" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
67+
<bindingRedirect oldVersion="4.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
68+
</dependentAssembly>
69+
<dependentAssembly>
70+
<assemblyIdentity name="Microsoft.Xrm.Sdk.Deployment" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
71+
<bindingRedirect oldVersion="4.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
72+
</dependentAssembly>
73+
<dependentAssembly>
74+
<assemblyIdentity name="Microsoft.Crm.Workflow" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
75+
<bindingRedirect oldVersion="4.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
76+
</dependentAssembly>
77+
<dependentAssembly>
78+
<assemblyIdentity name="Microsoft.Crm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
79+
<bindingRedirect oldVersion="4.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
80+
</dependentAssembly>
81+
<dependentAssembly>
82+
<assemblyIdentity name="Microsoft.Xrm.Tooling.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
83+
<bindingRedirect oldVersion="1.0.0.0-99.0.0.0" newVersion="4.0.0.0"/>
84+
</dependentAssembly>
85+
<dependentAssembly>
86+
<assemblyIdentity name="Microsoft.Xrm.Tooling.CrmConnectControl" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
87+
<bindingRedirect oldVersion="1.0.0.0-99.0.0.0" newVersion="4.0.0.0"/>
88+
</dependentAssembly>
89+
<dependentAssembly>
90+
<assemblyIdentity name="Microsoft.Xrm.Tooling.Ui.Styles" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
91+
<bindingRedirect oldVersion="1.0.0.0-99.0.0.0" newVersion="4.0.0.0"/>
92+
</dependentAssembly>
93+
</assemblyBinding>
94+
</runtime>
95+
<startup>
96+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
97+
</startup>
98+
</configuration>

0 commit comments

Comments
 (0)