Skip to content

Commit

Permalink
Added dependency to official CRM package - Microsoft.CrmSdk.CoreAssem…
Browse files Browse the repository at this point in the history
…blies

fsprojects#2
  • Loading branch information
sergey-tihon committed Mar 6, 2015
1 parent b63d0e6 commit a111af4
Show file tree
Hide file tree
Showing 13 changed files with 1,223 additions and 19 deletions.
6 changes: 6 additions & 0 deletions DynamicsCRMProvider.sln
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{D383A6BC-F
docs\tools\templates\template.cshtml = docs\tools\templates\template.cshtml
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Crm.Services.Utility", "src\Microsoft.Crm.Services.Utility\Microsoft.Crm.Services.Utility.csproj", "{53CF97C2-34BC-4580-B62E-9F12E7626120}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -31,6 +33,10 @@ Global
{4EEA1AD8-E8A9-4D54-BC39-D5F536366945}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EEA1AD8-E8A9-4D54-BC39-D5F536366945}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EEA1AD8-E8A9-4D54-BC39-D5F536366945}.Release|Any CPU.Build.0 = Release|Any CPU
{53CF97C2-34BC-4580-B62E-9F12E7626120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53CF97C2-34BC-4580-B62E-9F12E7626120}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53CF97C2-34BC-4580-B62E-9F12E7626120}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53CF97C2-34BC-4580-B62E-9F12E7626120}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
7 changes: 4 additions & 3 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#### 0.1.1 - 05.01.2015
#### 0.2.0 - 08.02.2015
* Migration to Paket
* Latest version of ProvidedTypes.fs
* Reference API
* Update to the latest version of ProvidedTypes.fs
* Added dependency to Microsoft.CrmSdk.CoreAssemblies
* Added Reference API

#### 0.1.0 - 26.01.2014
* Ported DynamicsCRMProvider from FSharpx
4 changes: 2 additions & 2 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Target "AssemblyInfo" (fun _ ->
|> Seq.iter (fun (projFileName, projectName, folderName, attributes) ->
match projFileName with
| Fsproj -> CreateFSharpAssemblyInfo (("src" @@ folderName) @@ "AssemblyInfo.fs") attributes
| Csproj -> CreateFSharpAssemblyInfo ((folderName @@ "Properties") @@ "AssemblyInfo.cs") attributes
| Csproj -> CreateCSharpAssemblyInfo ((folderName @@ "Properties") @@ "AssemblyInfo.cs") attributes
| Vbproj -> CreateVisualBasicAssemblyInfo ((folderName @@ "My Project") @@ "AssemblyInfo.vb") attributes
)
)
Expand All @@ -107,7 +107,7 @@ Target "AssemblyInfo" (fun _ ->
// src folder to support multiple project outputs
Target "CopyBinaries" (fun _ ->
!! "src/**/*.??proj"
|> Seq.map (fun f -> ((System.IO.Path.GetDirectoryName f) @@ "bin/Release", "bin" @@ (System.IO.Path.GetFileNameWithoutExtension f)))
|> Seq.map (fun f -> ((System.IO.Path.GetDirectoryName f) @@ "bin/Release", "bin/DynamicsCRMProvider"))
|> Seq.iter (fun (fromDir, toDir) -> CopyDir toDir fromDir (fun _ -> true))
)

Expand Down
2 changes: 1 addition & 1 deletion paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ nuget NUnit
nuget NUnit.Runners
nuget FAKE
nuget SourceLink.Fake
nuget DynamicsCRMProvider
nuget Microsoft.CrmSdk.CoreAssemblies < 6.0.0

github fsharp/FAKE modules/Octokit/Octokit.fsx
github fsprojects/FSharp.TypeProviders.StarterPack src/ProvidedTypes.fsi
Expand Down
4 changes: 3 additions & 1 deletion paket.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
NUGET
remote: https://nuget.org/api/v2
specs:
DynamicsCRMProvider (0.1.0)
FAKE (3.18.0)
FSharp.Compiler.Service (0.0.85)
FSharp.Formatting (2.7.4)
Expand All @@ -12,6 +11,9 @@ NUGET
Microsoft.Bcl (1.1.10)
Microsoft.Bcl.Build (>= 1.0.14)
Microsoft.Bcl.Build (1.0.21)
Microsoft.CrmSdk.CoreAssemblies (5.0.18)
Microsoft.IdentityModel (>= 6.1.7600.16394) - framework: >= net40
Microsoft.IdentityModel (6.1.7600.16394) - framework: >= net40
Microsoft.Net.Http (2.2.29)
Microsoft.Bcl (>= 1.1.10)
Microsoft.Bcl.Build (>= 1.0.14)
Expand Down
6 changes: 3 additions & 3 deletions src/DynamicsCRMProvider/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ open System.Reflection
[<assembly: AssemblyTitleAttribute("DynamicsCRMProvider")>]
[<assembly: AssemblyProductAttribute("DynamicsCRMProvider")>]
[<assembly: AssemblyDescriptionAttribute("A type provider for Microsoft Dynamics CRM 2011.")>]
[<assembly: AssemblyVersionAttribute("0.1.1")>]
[<assembly: AssemblyFileVersionAttribute("0.1.1")>]
[<assembly: AssemblyVersionAttribute("0.2.0")>]
[<assembly: AssemblyFileVersionAttribute("0.2.0")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "0.1.1"
let [<Literal>] Version = "0.2.0"
77 changes: 71 additions & 6 deletions src/DynamicsCRMProvider/DynamicsCRMProvider.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,18 @@
<Paket>True</Paket>
<Link>paket-files/ProvidedTypes.fs</Link>
</Compile>
<Content Include="bin\tools\CrmSvcUtil.exe">
<Paket>True</Paket>
</Content>
<Content Include="bin\tools\CrmSvcUtil.xml">
<Paket>True</Paket>
</Content>
<Content Include="bin\tools\Microsoft.Xrm.Sdk.dll">
<Paket>True</Paket>
</Content>
<Content Include="bin\tools\SolutionPackager.exe">
<Paket>True</Paket>
</Content>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="AssemblyInfo.fs" />
<Compile Include="TypeProviders.Helper.fs" />
Expand All @@ -70,29 +82,82 @@
<Compile Include="XrmRuntime.Linq.fs" />
<Compile Include="XrmDesignTime.fs" />
<None Include="paket.template" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Crm.Services.Utility">
<HintPath>..\..\packages\DynamicsCRMProvider\lib\net40\Microsoft.Crm.Services.Utility.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xrm.Sdk">
<HintPath>..\..\packages\DynamicsCRMProvider\lib\net40\microsoft.xrm.sdk.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Crm.Services.Utility\Microsoft.Crm.Services.Utility.csproj">
<Name>Microsoft.Crm.Services.Utility</Name>
<Project>{53cf97c2-34bc-4580-b62e-9f12e7626120}</Project>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Choose>
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<ItemGroup>
<Reference Include="Microsoft.Crm.Sdk.Proxy">
<HintPath>..\..\packages\Microsoft.CrmSdk.CoreAssemblies\lib\net40\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="Microsoft.Xrm.Sdk">
<HintPath>..\..\packages\Microsoft.CrmSdk.CoreAssemblies\lib\net40\Microsoft.Xrm.Sdk.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.DirectoryServices">
<Paket>True</Paket>
</Reference>
<Reference Include="System.DirectoryServices.AccountManagement">
<Paket>True</Paket>
</Reference>
<Reference Include="System.IdentityModel">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Security">
<Paket>True</Paket>
</Reference>
<Reference Include="System.ServiceModel.Web">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Web">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Xml">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Xml.Linq">
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<ItemGroup>
<Reference Include="Microsoft.IdentityModel">
<HintPath>..\..\packages\Microsoft.IdentityModel\lib\net35\Microsoft.IdentityModel.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
</Project>
1 change: 1 addition & 0 deletions src/DynamicsCRMProvider/paket.references
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Microsoft.CrmSdk.CoreAssemblies
File:ProvidedTypes.fsi
File:ProvidedTypes.fs
5 changes: 2 additions & 3 deletions src/DynamicsCRMProvider/paket.template
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ description
files
../../bin/DynamicsCRMProvider/FSharp.Data.DynamicsCRMProvider.pdb ==> lib/net40
../../bin/DynamicsCRMProvider/FSharp.Data.DynamicsCRMProvider.xml ==> lib/net40
../../bin/DynamicsCRMProvider/Microsoft.Crm.Services.Utility.dll ==> lib/net40
../../bin/DynamicsCRMProvider/microsoft.xrm.sdk.xml ==> lib/net40
../../bin/DynamicsCRMProvider/microsoft.xrm.sdk.dll ==> lib/net40
../../bin/DynamicsCRMProvider/Microsoft.Crm.Services.Utility.pdb ==> lib/net40
../../bin/DynamicsCRMProvider/Microsoft.Crm.Services.Utility.xml ==> lib/net40
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{53CF97C2-34BC-4580-B62E-9F12E7626120}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Crm.Services.Utility</RootNamespace>
<AssemblyName>Microsoft.Crm.Services.Utility</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Microsoft.Crm.Services.Utility.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Content Include="bin\tools\CrmSvcUtil.exe">
<Paket>True</Paket>
</Content>
<Content Include="bin\tools\CrmSvcUtil.xml">
<Paket>True</Paket>
</Content>
<Content Include="bin\tools\Microsoft.Xrm.Sdk.dll">
<Paket>True</Paket>
</Content>
<Content Include="bin\tools\SolutionPackager.exe">
<Paket>True</Paket>
</Content>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="deviceidmanager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="paket.references" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Choose>
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<ItemGroup>
<Reference Include="Microsoft.Crm.Sdk.Proxy">
<HintPath>..\..\packages\Microsoft.CrmSdk.CoreAssemblies\lib\net40\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="Microsoft.Xrm.Sdk">
<HintPath>..\..\packages\Microsoft.CrmSdk.CoreAssemblies\lib\net40\Microsoft.Xrm.Sdk.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.DirectoryServices">
<Paket>True</Paket>
</Reference>
<Reference Include="System.DirectoryServices.AccountManagement">
<Paket>True</Paket>
</Reference>
<Reference Include="System.IdentityModel">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Runtime.Serialization">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Security">
<Paket>True</Paket>
</Reference>
<Reference Include="System.ServiceModel">
<Paket>True</Paket>
</Reference>
<Reference Include="System.ServiceModel.Web">
<Paket>True</Paket>
</Reference>
<Reference Include="System.Web">
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
<ItemGroup>
<Reference Include="Microsoft.IdentityModel">
<HintPath>..\..\packages\Microsoft.IdentityModel\lib\net35\Microsoft.IdentityModel.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
</Project>
13 changes: 13 additions & 0 deletions src/Microsoft.Crm.Services.Utility/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// <auto-generated/>
using System.Reflection;

[assembly: AssemblyTitleAttribute("Microsoft.Crm.Services.Utility")]
[assembly: AssemblyProductAttribute("DynamicsCRMProvider")]
[assembly: AssemblyDescriptionAttribute("A type provider for Microsoft Dynamics CRM 2011.")]
[assembly: AssemblyVersionAttribute("0.2.0")]
[assembly: AssemblyFileVersionAttribute("0.2.0")]
namespace System {
internal static class AssemblyVersionInformation {
internal const string Version = "0.2.0";
}
}
Loading

0 comments on commit a111af4

Please sign in to comment.