Skip to content

WIP: Update Dependencies to Net46 #17

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
falfaddaghi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Update Dependencies to Net46 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea6b8f7
Update Paket bootstrapper to the latest version.
falfaddaghi Jul 7, 2020
d425151
Update Project Dependencies to Net46
Jul 19, 2020
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
494 changes: 494 additions & 0 deletions .paket/Paket.Restore.targets
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified .paket/paket.bootstrapper.exe
View file
Open in desktop
Binary file not shown.
28 changes: 14 additions & 14 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,10 @@ Target "All" DoNothing
==> "Build"
==> "CopyBinaries"
// ==> "RunTests"
=?> ("GenerateReferenceDocs",isLocalBuild)
=?> ("GenerateDocs",isLocalBuild)
==> "All"
=?> ("ReleaseDocs",isLocalBuild)
// =?> ("GenerateReferenceDocs",isLocalBuild)
// =?> ("GenerateDocs",isLocalBuild)
// ==> "All"
// =?> ("ReleaseDocs",isLocalBuild)

"All"
#if MONO
Expand All @@ -362,19 +362,19 @@ Target "All" DoNothing
==> "NuGet"
==> "BuildPackage"

"CleanDocs"
==> "GenerateHelp"
==> "GenerateReferenceDocs"
==> "GenerateDocs"
// "CleanDocs"
// ==> "GenerateHelp"
// ==> "GenerateReferenceDocs"
// ==> "GenerateDocs"

"CleanDocs"
==> "GenerateHelpDebug"
// "CleanDocs"
// ==> "GenerateHelpDebug"

"GenerateHelp"
==> "KeepRunning"
// "GenerateHelp"
// ==> "KeepRunning"

"ReleaseDocs"
==> "Release"
// "ReleaseDocs"
// ==> "Release"

"BuildPackage"
==> "PublishNuget"
Expand Down
9 changes: 5 additions & 4 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
framework: net462
source https://nuget.org/api/v2

nuget FSharp.Formatting
nuget NUnit
nuget NUnit.Runners
nuget FAKE
nuget FAKE 4.64.18
nuget SourceLink.Fake
nuget Microsoft.CrmSdk.CoreAssemblies < 6.0.0
nuget Microsoft.CrmSdk.CoreAssemblies

github fsharp/FAKE modules/Octokit/Octokit.fsx
github FoothillSolutions/FAKE modules/Octokit/Octokit.fsx
github fsprojects/FSharp.TypeProviders.StarterPack src/ProvidedTypes.fsi
github fsprojects/FSharp.TypeProviders.StarterPack src/ProvidedTypes.fs
github fsprojects/FSharp.TypeProviders.StarterPack src/ProvidedTypes.fs
59 changes: 28 additions & 31 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,31 @@
RESTRICTION: == net462
NUGET
remote: https://nuget.org/api/v2
specs:
FAKE (3.18.0)
FSharp.Compiler.Service (0.0.85)
FSharp.Formatting (2.7.4)
FSharp.Compiler.Service (>= 0.0.82)
FSharpVSPowerTools.Core (>= 1.7.0)
FSharpVSPowerTools.Core (1.7.0)
FSharp.Compiler.Service (>= 0.0.81)
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)
NuGet.CommandLine (2.8.3)
NUnit (2.6.4)
NUnit.Runners (2.6.4)
Octokit (0.7.2)
Microsoft.Net.Http
SourceLink.Fake (0.4.2)
remote: https://www.nuget.org/api/v2
FAKE (4.64.18)
FSharp.Formatting (4.1)
Microsoft.CrmSdk.CoreAssemblies (9.0.2.26)
NUnit (3.12)
NUnit.Console (3.11.1)
NUnit.ConsoleRunner (>= 3.11.1)
NUnit.Extension.NUnitProjectLoader (>= 3.6)
NUnit.Extension.NUnitV2Driver (>= 3.8)
NUnit.Extension.NUnitV2ResultWriter (>= 3.6)
NUnit.Extension.TeamCityEventListener (>= 1.0.7)
NUnit.Extension.VSProjectLoader (>= 3.8)
NUnit.ConsoleRunner (3.11.1)
NUnit.Extension.NUnitProjectLoader (3.6)
NUnit.Extension.NUnitV2Driver (3.8)
NUnit.Extension.NUnitV2ResultWriter (3.6)
NUnit.Extension.TeamCityEventListener (1.0.7)
NUnit.Extension.VSProjectLoader (3.8)
NUnit.Runners (3.11.1)
NUnit.Console (>= 3.11.1)
Octokit (0.48)
SourceLink.Fake (1.1)
GITHUB
remote: fsharp/FAKE
specs:
modules/Octokit/Octokit.fsx (12b839de599dd8ed448416a963025bb26b978a8d)
Octokit
remote: FoothillSolutions/FAKE
modules/Octokit/Octokit.fsx (74421063dd3915e8e1e407926b38b8b25df50e36)
Octokit (>= 0.20)
remote: fsprojects/FSharp.TypeProviders.StarterPack
specs:
src/ProvidedTypes.fs (cf96cf990590da7082197452b1b544e26ebed472)
src/ProvidedTypes.fsi (cf96cf990590da7082197452b1b544e26ebed472)
src/ProvidedTypes.fs (b45779c1571b54a2bc6bafa12690a8d9763150d1)
src/ProvidedTypes.fsi (b45779c1571b54a2bc6bafa12690a8d9763150d1)
9 changes: 7 additions & 2 deletions src/Common/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
namespace System
// Auto-Generated by FAKE; do not edit
namespace System
open System.Reflection

[<assembly: AssemblyTitleAttribute("DynamicsCRMProvider")>]
Expand All @@ -9,4 +10,8 @@ open System.Reflection
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "0.2.1"
let [<Literal>] AssemblyTitle = "DynamicsCRMProvider"
let [<Literal>] AssemblyProduct = "DynamicsCRMProvider"
let [<Literal>] AssemblyDescription = "A type provider for Microsoft Dynamics CRM 2011."
let [<Literal>] AssemblyVersion = "0.2.1"
let [<Literal>] AssemblyFileVersion = "0.2.1"
48 changes: 15 additions & 33 deletions src/DynamicsCRMProvider.DesignTime/DynamicsCRMProvider.DesignTime.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
<OutputType>Library</OutputType>
<RootNamespace>DynamicsCRMProvider.DesignTime</RootNamespace>
<AssemblyName>FSharp.Data.DynamicsCRMProvider.DesignTime</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
<Name>DynamicsCRMProvider.DesignTime</Name>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -60,22 +61,14 @@
<Paket>True</Paket>
<Link>paket-files/ProvidedTypes.fsi</Link>
</Content>
<Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.StarterPack\src\ProvidedTypes.fsi">
<Paket>True</Paket>
<Link>paket-files/ProvidedTypes.fsi</Link>
</Compile>
<Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.StarterPack\src\ProvidedTypes.fs">
<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="..\Common\AssemblyInfo.fs">
<Link>AssemblyInfo.fs</Link>
</Compile>
Expand Down Expand Up @@ -103,18 +96,8 @@
</ProjectReference>
</ItemGroup>
<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')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.2'">
<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>
Expand Down Expand Up @@ -145,14 +128,13 @@
<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>
<Reference Include="Microsoft.Crm.Sdk.Proxy">
<HintPath>..\..\packages\Microsoft.CrmSdk.CoreAssemblies\lib\net462\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="Microsoft.Xrm.Sdk">
<HintPath>..\..\packages\Microsoft.CrmSdk.CoreAssemblies\lib\net462\Microsoft.Xrm.Sdk.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
Expand Down
Loading