Update Project Dependencies to Net46

Updated the project dependencies to the latest versions compatible with net46. Updated Type Provider SDK to Latest. Updated Build scripts to work with FAKE 4.64.18
FoothillSolutions · Jul 19, 2020 · d425151 · d425151
1 parent ea6b8f7
commit d425151
Show file tree

Hide file tree

Showing 13 changed files with 639 additions and 191 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/build.fsx b/build.fsx
@@ -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
@@ -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"

diff --git a/paket.dependencies b/paket.dependencies
@@ -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
diff --git a/paket.lock b/paket.lock
@@ -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)
diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs
@@ -1,4 +1,5 @@
-namespace System
+// Auto-Generated by FAKE; do not edit
+namespace System
 open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("DynamicsCRMProvider")>]
@@ -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"
diff --git a/src/DynamicsCRMProvider.DesignTime/DynamicsCRMProvider.DesignTime.fsproj b/src/DynamicsCRMProvider.DesignTime/DynamicsCRMProvider.DesignTime.fsproj
@@ -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>
@@ -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>
@@ -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>
@@ -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>