WIP migrating to Azure Storage SDK 10.0

.paket/Paket.Restore.targets

@@ -252,7 +252,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/>
+      <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion).nuspec"/>
     </ItemGroup>
 
     <Exec Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' Condition="@(_NuspecFiles) != ''" />

FSharp.Azure.StorageTypeProvider.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2046
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28917.182
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{94066CAA-4417-4C43-A286-40182E920E43}"
 	ProjectSection(SolutionItems) = preProject
@@ -14,9 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		docs\tools\generate.fsx = docs\tools\generate.fsx
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
+		sample-blobs.json = sample-blobs.json
+		sample-tables.json = sample-tables.json
 	EndProjectSection
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Azure.StorageTypeProvider", "src\FSharp.Azure.StorageTypeProvider\FSharp.Azure.StorageTypeProvider.fsproj", "{FB7CA8F3-C158-49E9-B816-501741E2921F}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Azure.StorageTypeProvider.Common", "src\FSharp.Azure.StorageTypeProvider.Common\FSharp.Azure.StorageTypeProvider.Common.fsproj", "{FB7CA8F3-C158-49E9-B816-501741E2921F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{7CAF8D38-6250-41CB-A65B-ABD760B09281}"
 	ProjectSection(SolutionItems) = preProject
@@ -35,6 +37,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{1535
 		docs\content\tables.fsx = docs\content\tables.fsx
 	EndProjectSection
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Azure.StorageTypeProvider.Blob", "src\FSharp.Azure.StorageTypeProvider.Blob\FSharp.Azure.StorageTypeProvider.Blob.fsproj", "{9D66D199-9BCA-41B3-B005-1381589B9A2F}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Azure.StorageTypeProvider.Queue", "src\FSharp.Azure.StorageTypeProvider.Queue\FSharp.Azure.StorageTypeProvider.Queue.fsproj", "{8B477649-8E69-499C-825B-992C4FA7A162}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Azure.StorageTypeProvider.Table", "src\FSharp.Azure.StorageTypeProvider.Table\FSharp.Azure.StorageTypeProvider.Table.fsproj", "{6D7FEFAE-24AF-49C0-888C-68BC3EBEF123}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{08E5CE37-D346-49D6-810E-7E7AB8872E8B}"
+	ProjectSection(SolutionItems) = preProject
+		build\common.props = build\common.props
+		build\packages.props = build\packages.props
+		build\version.props = build\version.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,6 +60,18 @@ Global
 		{FB7CA8F3-C158-49E9-B816-501741E2921F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FB7CA8F3-C158-49E9-B816-501741E2921F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB7CA8F3-C158-49E9-B816-501741E2921F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D66D199-9BCA-41B3-B005-1381589B9A2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D66D199-9BCA-41B3-B005-1381589B9A2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D66D199-9BCA-41B3-B005-1381589B9A2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D66D199-9BCA-41B3-B005-1381589B9A2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B477649-8E69-499C-825B-992C4FA7A162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B477649-8E69-499C-825B-992C4FA7A162}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B477649-8E69-499C-825B-992C4FA7A162}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B477649-8E69-499C-825B-992C4FA7A162}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D7FEFAE-24AF-49C0-888C-68BC3EBEF123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D7FEFAE-24AF-49C0-888C-68BC3EBEF123}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D7FEFAE-24AF-49C0-888C-68BC3EBEF123}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D7FEFAE-24AF-49C0-888C-68BC3EBEF123}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

RELEASE_NOTES.md

@@ -102,5 +102,8 @@
 ### 2.0.0 - 28th December 2018
 * Support for blob-only accounts
 
-### 2.0.1 - 05th February 2018
-* Fix #119 (Even when JSON tableSchema parameter is used Emulator required to be running)
+### 2.0.1 - 05th February 2019
+* Fix #119 (Even when JSON tableSchema parameter is used Emulator required to be running)
+
+### 2.0.2 - 7th April 2019
+* Remove dependency on FSharp.Compiler.Tools.

build.fsx

@@ -17,7 +17,6 @@ open System.IO
 open Fake.IO
 open Fake.Azure
 open Fake.DotNet.NuGet
-open Fake.Tools.Git
 open Fake.IO.FileSystemOperators
 
 // The name of the project
@@ -27,14 +26,6 @@ let project = "FSharp.Azure.StorageTypeProvider"
 // (used as description in AssemblyInfo and as a short summary for NuGet package)
 let summary = "Allows easy access to Azure Storage assets through F# scripts."
 
-// Git configuration (used for publishing documentation in gh-pages branch)
-// The profile where the project is posted
-let gitOwner = "fsprojects"
-let gitHome = "https://github.com/" + gitOwner
-
-// The name of the project on GitHub
-let gitName = "AzureStorageTypeProvider"
-
 // Read additional information from the release notes document
 Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
 
@@ -46,10 +37,6 @@ let projectPath = Path.getFullName "./src/FSharp.Azure.StorageTypeProvider"
 
 // Test path
 let testPath = Path.getFullName "./tests/IntegrationTests"
-// Read additional information from the release notes document
-
-// Test Output Dir
-let testOutPutDir = "TestOutput"
 
 
 let release =
@@ -68,10 +55,6 @@ Target.Create  "AssemblyInfo" (fun _ ->
 
 let inline withWorkDir wd = 
     DotNet.Options.withWorkingDirectory wd
-let runDotNet cmd workingDir =
-    let result =
-        DotNet.exec (withWorkDir workingDir) cmd ""
-    if result.ExitCode <> 0 then failwithf "'dotnet %s' failed in %s" cmd workingDir
 
 // --------------------------------------------------------------------------------------
 // Clean build results
@@ -96,28 +79,22 @@ Target.Create "Build" (fun _ ->
 Target.Create "ResetTestData" (fun _ ->
     let script = Path.Combine(testPath, "ResetTestData.fsx")
     Emulators.startStorageEmulator()
-    Fsi.exec (fun p -> 
+    Fsi.exec (fun p ->
+        printfn "%A" p
         { p with 
             TargetProfile = Fsi.Profile.Netcore
             WorkingDirectory = testPath
         }) script [""]
     |> snd
-    |> Seq.iter(fun x -> printfn "%s" x))  ///ToBeFixed
+    |> Seq.iter (printfn "%s"))
 
 // Run integration tests
 let root = __SOURCE_DIRECTORY__
-let testNetCoreDir = root </> "tests"  </> "IntegrationTests" </> "bin" </> "Release" </> "netcoreapp2.0" </> "win10-x64" </> "publish"
 
 Target.Create "RunTests" (fun _ ->
-    let result = DotNet.exec (withWorkDir testPath) "publish --self-contained -c Release -r win10-x64" ""
-    if not result.OK then failwith "Publish failed"
-    printfn "Dkr: %s" testNetCoreDir
-    let result = DotNet.exec (withWorkDir testNetCoreDir) "" "IntegrationTests.dll"
-    if result.OK then
-        printfn "Expecto for netcore finished without Errors"
-    else 
-        printfn "Expecto for netcore finished with Errors"
-    )
+    let testNetCoreDir = root </> "tests"  </> "IntegrationTests" </> "bin" </> "Release" </> "netcoreapp2.0" </> "publish" </> "IntegrationTests.dll"
+    DotNet.publish (fun p -> { p with Configuration = DotNet.BuildConfiguration.Release }) testPath
+    DotNet.exec id testNetCoreDir "" |> ignore)
 
 // --------------------------------------------------------------------------------------
 // Build a NuGet package
@@ -132,14 +109,13 @@ Target.Create "NuGet" (fun _ ->
             Description = "The F# Azure Storage Type Provider allows simple access to Blob, Table and Queue assets, using Azure Storage metadata to intelligently infer schema where possible, whilst providing a simple API for common tasks."
             Version = release.NugetVersion
             ReleaseNotes = release.Notes |> String.concat Environment.NewLine
-            Tags = "azure, f#, fsharp, type provider, blob, table, queue, script"
+            Tags = "azure, f#, fsharp, type provider, blob, table, queue, cosmos, script"
             OutputPath = @"bin\package"
-            Dependencies = [ "WindowsAzure.Storage", "9.3.2"
-                             "FSharp.Compiler.Tools", "10.2.1" ]
+            Dependencies = [ "WindowsAzure.Storage", "9.3.2" ]
             References = [ "FSharp.Azure.StorageTypeProvider.dll" ]
             Files = 
                 ([ "FSharp.Azure.StorageTypeProvider.xml"; "FSharp.Azure.StorageTypeProvider.dll"
-                   "Microsoft.WindowsAzure.Storage.dll"; "Newtonsoft.Json.dll" ] 
+                   "Microsoft.Azure.Storage.dll"; "Newtonsoft.Json.dll" ] 
                  |> List.map (fun file -> "../bin/netstandard2.0/publish/" + file, Some "lib/netstandard2.0", None))
                  @ [ "StorageTypeProvider.fsx", None, None ] }) 
           ("nuget/" + project + ".nuspec"))

build.fsx.lock

@@ -0,0 +1,5 @@
+STORAGE: NONE
+RESTRICTION: == netstandard2.0
+NUGET
+  remote: https://api.nuget.org/v3/index.json
+    FSharp.Core (4.6.2)

docs/content/blobs.fsx

@@ -11,7 +11,7 @@ Working with Blobs
 ==================
 
 For more information on Blobs in general, please see some of the many articles on
-[MSDN](https://msdn.microsoft.com/en-us/library/microsoft.windowsazure.storage.blob.aspx) or the [Azure](http://azure.microsoft.com/en-us/documentation/services/storage/) [documentation](http://azure.microsoft.com/en-us/documentation/articles/storage-dotnet-how-to-use-blobs/). Some of the core features of the Blob provider are: -
+[MSDN](https://msdn.microsoft.com/en-us/library/Microsoft.Azure.storage.blob.aspx) or the [Azure](http://azure.microsoft.com/en-us/documentation/services/storage/) [documentation](http://azure.microsoft.com/en-us/documentation/articles/storage-dotnet-how-to-use-blobs/). Some of the core features of the Blob provider are: -
 
 ## Rapid navigation
 

docs/content/queues.fsx

@@ -10,7 +10,7 @@ Working with Queues
 ===================
 
 For more information on Queues in general, please see some of the many articles on
-[MSDN](https://msdn.microsoft.com/en-us/library/microsoft.windowsazure.storage.queue.aspx) or the [Azure](http://azure.microsoft.com/en-us/documentation/services/storage/) [documentation](http://azure.microsoft.com/en-us/documentation/articles/storage-dotnet-how-to-use-queues/). Some of the core features of the Queue provider are: -
+[MSDN](https://msdn.microsoft.com/en-us/library/Microsoft.Azure.storage.queue.aspx) or the [Azure](http://azure.microsoft.com/en-us/documentation/services/storage/) [documentation](http://azure.microsoft.com/en-us/documentation/articles/storage-dotnet-how-to-use-queues/). Some of the core features of the Queue provider are: -
 
 ## Rapid navigation
 

docs/content/tables.fsx

@@ -3,7 +3,7 @@
 open Deedle
 open FSharp.Azure.StorageTypeProvider
 open FSharp.Azure.StorageTypeProvider.Table
-open Microsoft.WindowsAzure.Storage.Table
+open Microsoft.Azure.Cosmos.Table
 open System
 type Azure = AzureTypeProvider<"UseDevelopmentStorage=true">
 
@@ -21,7 +21,7 @@ Working with Tables
 ===================
 
 For more information on Tables in general, please see some of the many articles on
-[MSDN](https://msdn.microsoft.com/en-us/library/microsoft.windowsazure.storage.table.aspx) or the [Azure](http://azure.microsoft.com/en-us/documentation/services/storage/) [documentation](http://azure.microsoft.com/en-us/documentation/articles/storage-dotnet-how-to-use-tables/). Some of the core features of the Tables provider are: -
+[MSDN](https://msdn.microsoft.com/en-us/library/Microsoft.Azure.Cosmos.Table.aspx) or the [Azure](http://azure.microsoft.com/en-us/documentation/services/storage/) [documentation](http://azure.microsoft.com/en-us/documentation/articles/storage-dotnet-how-to-use-tables/). Some of the core features of the Tables provider are: -
 
 ##Rapid navigation
 

docs/tools/references.fsx

@@ -2,7 +2,7 @@
 #r @"..\..\bin\Microsoft.Data.OData.dll"
 #r @"..\..\bin\Microsoft.Data.Services.Client.dll"
 #r @"..\..\bin\Microsoft.Data.Edm.dll"
-#r @"..\..\bin\Microsoft.WindowsAzure.Storage.dll"
+#r @"..\..\bin\Microsoft.Azure.Storage.dll"
 #r @"..\..\bin\Newtonsoft.Json.dll"
 #r @"..\..\bin\System.Spatial.dll"
 #r @"System.Xml.Linq.dll"

paket.dependencies

@@ -1,13 +1,16 @@
+storage: none
 redirects: force
 source https://www.nuget.org/api/v2/
 framework: netstandard2.0, netcoreapp2.0
 generate_load_scripts: true
 
 nuget FSharp.Core
-nuget WindowsAzure.Storage 9.3.2
-nuget Newtonsoft.Json 10.0.2
+nuget Microsoft.Azure.Storage.Common
+nuget Microsoft.Azure.Storage.Blob
+nuget Microsoft.Azure.Storage.Queue
+nuget Microsoft.Azure.Cosmos.Table
+nuget Newtonsoft.Json
 nuget System.Net.Http
-nuget FSharp.Compiler.Tools
 
 nuget FAKE
 nuget Nuget.CommandLine
@@ -43,4 +46,4 @@ nuget Fake.DotNet.Fsi
 nuget Fake.DotNet.AssemblyInfoFile
 nuget Fake.DotNet.NuGet
 nuget Fake.IO.FileSystem
-nuget Fake.Tools.Git
+nuget Fake.Tools.Git