Skip to content

merging to spkl_dev 2 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lukasbelak wants to merge 1 commit into
base: spkl_dev
Choose a base branch
from
Open

merging to spkl_dev 2 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,4 @@ UpgradeLog*.XML
/NuGet/ScriptSharpVSIX/.vs/ScriptSharpVSIX/v15/sqlite3/storage.ide
/spkl/XmlDiffLib
/spkl.fakes/.vs/spkl.fakes/v15/sqlite3
/spkl/.vs/spkl/v15/Server/sqlite3
112 changes: 90 additions & 22 deletions spkl/CrmSvcUtilFilteringService/CrmSvcUtil.FilteringService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<AssemblyName>spkl.CrmSvcUtilExtensions</AssemblyName>
<OutputType>Library</OutputType>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Expand Down Expand Up @@ -50,39 +50,49 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.CrmSdk.CoreTools.8.2.0.5\content\bin\coretools\CrmSvcUtil.exe</HintPath>
</Reference>
<Reference Include="Microsoft.Crm.Sdk.Proxy, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.8.2.0.2\lib\net452\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
<Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.0.7\lib\net452\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.6.1.7600.16394\lib\net35\Microsoft.IdentityModel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.17.3.35304, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.17.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.17.3.35304, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.17.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xrm.Sdk, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.8.2.0.2\lib\net452\Microsoft.Xrm.Sdk.dll</HintPath>
<Reference Include="Microsoft.Xrm.Sdk, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.0.7\lib\net452\Microsoft.Xrm.Sdk.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xrm.Sdk.Deployment, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.Deployment.8.2.0\lib\net45\Microsoft.Xrm.Sdk.Deployment.dll</HintPath>
<Reference Include="Microsoft.Xrm.Sdk.Deployment, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.Deployment.9.0.0.7\lib\net452\Microsoft.Xrm.Sdk.Deployment.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Xrm.Sdk.Workflow, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.Workflow.8.2.0\lib\net45\Microsoft.Xrm.Sdk.Workflow.dll</HintPath>
<Reference Include="Microsoft.Xrm.Sdk.Workflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.CrmSdk.Workflow.9.0.0.7\lib\net452\Microsoft.Xrm.Sdk.Workflow.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Xrm.Tooling.Connector, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.8.2.0.1\lib\net45\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
<Reference Include="Microsoft.Xrm.Tooling.Connector, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.0.0.7\lib\net452\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Xrm.Tooling.CrmConnectControl, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.8.2.0.5\lib\net452\Microsoft.Xrm.Tooling.CrmConnectControl.dll</HintPath>
<Reference Include="Microsoft.Xrm.Tooling.CrmConnectControl, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.0.0.7\lib\net452\Microsoft.Xrm.Tooling.CrmConnectControl.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Xrm.Tooling.Ui.Styles, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.8.2.0.5\lib\net452\Microsoft.Xrm.Tooling.Ui.Styles.dll</HintPath>
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.0.0.7\lib\net452\Microsoft.Xrm.Tooling.Ui.Styles.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Xrm.Tooling.WebResourceUtility, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.8.2.0.5\lib\net452\Microsoft.Xrm.Tooling.WebResourceUtility.dll</HintPath>
<Reference Include="Microsoft.Xrm.Tooling.WebResourceUtility, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.0.0.7\lib\net452\Microsoft.Xrm.Tooling.WebResourceUtility.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationFramework" />
<Reference Include="System" />
Expand All @@ -93,9 +103,23 @@
<Reference Include="System.DirectoryServices" />
<Reference Include="System.DirectoryServices.AccountManagement" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Web" />
Expand All @@ -115,11 +139,55 @@
<Compile Include="MetadataProviderQueryService.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="bin\coretools\CrmSvcUtil.exe.config" />
<None Include="bin\coretools\LicenseTerms.docx" />
<None Include="bin\Debug\CrmSvcUtil.exe.config" />
<None Include="bin\Debug\spkl.crmsvcutil.config" />
<None Include="spkl.crmsvcutil.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="bin\coretools\CrmSvcUtil.exe" />
<Content Include="bin\coretools\CrmSvcUtil.xml" />
<Content Include="bin\coretools\Microsoft.Crm.Sdk.Proxy.dll" />
<Content Include="bin\coretools\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
<Content Include="bin\coretools\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
<Content Include="bin\coretools\Microsoft.Xrm.Sdk.Deployment.dll" />
<Content Include="bin\coretools\Microsoft.Xrm.Sdk.dll" />
<Content Include="bin\coretools\Microsoft.Xrm.Tooling.Connector.dll" />
<Content Include="bin\coretools\Microsoft.Xrm.Tooling.CrmConnectControl.dll" />
<Content Include="bin\coretools\Microsoft.Xrm.Tooling.Ui.Styles.dll" />
<Content Include="bin\coretools\Other Redistributable.txt" />
<Content Include="bin\coretools\SolutionPackager.exe" />
<Content Include="bin\Debug\CrmSvcUtil.exe" />
<Content Include="bin\Debug\CrmSvcUtil.xml" />
<Content Include="bin\Debug\Microsoft.Crm.Sdk.Proxy.dll" />
<Content Include="bin\Debug\Microsoft.Crm.Sdk.Proxy.xml" />
<Content Include="bin\Debug\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
<Content Include="bin\Debug\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
<Content Include="bin\Debug\Microsoft.IdentityModel.Clients.ActiveDirectory.xml" />
<Content Include="bin\Debug\Microsoft.IdentityModel.dll" />
<Content Include="bin\Debug\Microsoft.Xrm.Sdk.Deployment.dll" />
<Content Include="bin\Debug\Microsoft.Xrm.Sdk.Deployment.xml" />
<Content Include="bin\Debug\Microsoft.Xrm.Sdk.dll" />
<Content Include="bin\Debug\Microsoft.Xrm.Sdk.Workflow.dll" />
<Content Include="bin\Debug\Microsoft.Xrm.Sdk.Workflow.xml" />
<Content Include="bin\Debug\Microsoft.Xrm.Sdk.xml" />
<Content Include="bin\Debug\Microsoft.Xrm.Tooling.Connector.dll" />
<Content Include="bin\Debug\Microsoft.Xrm.Tooling.Connector.xml" />
<Content Include="bin\Debug\Microsoft.Xrm.Tooling.CrmConnectControl.dll" />
<Content Include="bin\Debug\Microsoft.Xrm.Tooling.CrmConnectControl.xml" />
<Content Include="bin\Debug\Microsoft.Xrm.Tooling.Ui.Styles.dll" />
<Content Include="bin\Debug\Microsoft.Xrm.Tooling.WebResourceUtility.dll" />
<Content Include="bin\Debug\Microsoft.Xrm.Tooling.WebResourceUtility.xml" />
<Content Include="bin\Debug\spkl.CrmSvcUtilExtensions.dll" />
<Content Include="bin\Debug\spkl.CrmSvcUtilExtensions.pdb" />
</ItemGroup>
<ItemGroup>
<Folder Include="bin\Release\" />
</ItemGroup>
</Project>
27 changes: 27 additions & 0 deletions spkl/CrmSvcUtilFilteringService/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<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.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="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.Xrm.Tooling.CrmConnectControl" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.22.0.0" newVersion="2.22.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
20 changes: 12 additions & 8 deletions spkl/CrmSvcUtilFilteringService/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CrmSdk.CoreAssemblies" version="8.2.0.2" targetFramework="net452" />
<package id="Microsoft.CrmSdk.CoreTools" version="8.2.0.5" targetFramework="net452" />
<package id="Microsoft.CrmSdk.Deployment" version="8.2.0" targetFramework="net452" />
<package id="Microsoft.CrmSdk.Workflow" version="8.2.0" targetFramework="net452" />
<package id="Microsoft.CrmSdk.XrmTooling.CoreAssembly" version="8.2.0.1" targetFramework="net452" />
<package id="Microsoft.CrmSdk.XrmTooling.WpfControls" version="8.2.0.5" targetFramework="net452" />
<package id="Microsoft.CrmSdk.CoreAssemblies" version="9.0.0.7" targetFramework="net462" />
<package id="Microsoft.CrmSdk.CoreTools" version="9.0.0.7" targetFramework="net462" />
<package id="Microsoft.CrmSdk.Deployment" version="9.0.0.7" targetFramework="net462" />
<package id="Microsoft.CrmSdk.Workflow" version="9.0.0.7" targetFramework="net462" />
<package id="Microsoft.CrmSdk.XrmTooling.CoreAssembly" version="9.0.0.7" targetFramework="net462" />
<package id="Microsoft.CrmSdk.XrmTooling.WpfControls" version="9.0.0.7" targetFramework="net462" />
<package id="Microsoft.IdentityModel" version="6.1.7600.16394" targetFramework="net452" />
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.22.302111727" targetFramework="net452" />
<package id="System.Net.Http" version="4.3.1" targetFramework="net452" />
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.17.3" targetFramework="net462" />
<package id="System.Net.Http" version="4.3.3" targetFramework="net462" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
</packages>
3 changes: 2 additions & 1 deletion spkl/SparkleXrm.Tasks.Tests/GetWebresources.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public void GetWebresourcesWithRootFolder()
var existingWebresource = new WebResource
{
DisplayName = "new_/js/somefile.js",
Name = "new_/js/somefile.js"
Name = "new_/js/somefile.js",
DependencyXml = "<Dependencies><Dependency componentType=\"WebResource\"><Library name=\"new_/js/contact.js\" displayName=\"new_\\script.js\" languagecode=\"\" description=\"dd\" libraryUniqueId=\"{b5004acf-77d5-4622-bbe4-f9bd3cea0ac9}\" /></Dependency><Dependency componentType=\"Attribute\"><Attribute attributeId=\"00000000-0000-0000-0000-000000000000\" attributeName=\"accountid\" entityName=\"account\" /></Dependency></Dependencies>"
};

// Act
Expand Down
Loading