Skip to content

Commit 7e8725a

Browse files
xperiandrixperiandri
committed
WIP migrating to Azure Storage SDK 10.0
1 parent a435df8 commit 7e8725a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+835
-427
lines changed

‎.paket/Paket.Restore.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
</PropertyGroup>
253253

254254
<ItemGroup>
255-
<_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/>
255+
<_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion).nuspec"/>
256256
</ItemGroup>
257257

258258
<Exec Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' Condition="@(_NuspecFiles) != ''" />

‎FSharp.Azure.StorageTypeProvider.sln‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.28010.2046
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.28917.182
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{94066CAA-4417-4C43-A286-40182E920E43}"
66
ProjectSection(SolutionItems) = preProject
@@ -18,7 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1818
sample-tables.json = sample-tables.json
1919
EndProjectSection
2020
EndProject
21-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Azure.StorageTypeProvider", "src\FSharp.Azure.StorageTypeProvider\FSharp.Azure.StorageTypeProvider.fsproj", "{FB7CA8F3-C158-49E9-B816-501741E2921F}"
21+
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}"
2222
EndProject
2323
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{7CAF8D38-6250-41CB-A65B-ABD760B09281}"
2424
ProjectSection(SolutionItems) = preProject
@@ -37,6 +37,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{1535
3737
docs\content\tables.fsx = docs\content\tables.fsx
3838
EndProjectSection
3939
EndProject
40+
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}"
41+
EndProject
42+
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}"
43+
EndProject
44+
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}"
45+
EndProject
46+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{08E5CE37-D346-49D6-810E-7E7AB8872E8B}"
47+
ProjectSection(SolutionItems) = preProject
48+
build\common.props = build\common.props
49+
build\packages.props = build\packages.props
50+
build\version.props = build\version.props
51+
EndProjectSection
52+
EndProject
4053
Global
4154
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4255
Debug|Any CPU = Debug|Any CPU
@@ -47,6 +60,18 @@ Global
4760
{FB7CA8F3-C158-49E9-B816-501741E2921F}.Debug|Any CPU.Build.0 = Debug|Any CPU
4861
{FB7CA8F3-C158-49E9-B816-501741E2921F}.Release|Any CPU.ActiveCfg = Release|Any CPU
4962
{FB7CA8F3-C158-49E9-B816-501741E2921F}.Release|Any CPU.Build.0 = Release|Any CPU
63+
{9D66D199-9BCA-41B3-B005-1381589B9A2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64+
{9D66D199-9BCA-41B3-B005-1381589B9A2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
65+
{9D66D199-9BCA-41B3-B005-1381589B9A2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
66+
{9D66D199-9BCA-41B3-B005-1381589B9A2F}.Release|Any CPU.Build.0 = Release|Any CPU
67+
{8B477649-8E69-499C-825B-992C4FA7A162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68+
{8B477649-8E69-499C-825B-992C4FA7A162}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{8B477649-8E69-499C-825B-992C4FA7A162}.Release|Any CPU.ActiveCfg = Release|Any CPU
70+
{8B477649-8E69-499C-825B-992C4FA7A162}.Release|Any CPU.Build.0 = Release|Any CPU
71+
{6D7FEFAE-24AF-49C0-888C-68BC3EBEF123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72+
{6D7FEFAE-24AF-49C0-888C-68BC3EBEF123}.Debug|Any CPU.Build.0 = Debug|Any CPU
73+
{6D7FEFAE-24AF-49C0-888C-68BC3EBEF123}.Release|Any CPU.ActiveCfg = Release|Any CPU
74+
{6D7FEFAE-24AF-49C0-888C-68BC3EBEF123}.Release|Any CPU.Build.0 = Release|Any CPU
5075
EndGlobalSection
5176
GlobalSection(SolutionProperties) = preSolution
5277
HideSolutionNode = FALSE

‎build.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ Target.Create "NuGet" (fun _ ->
109109
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."
110110
Version = release.NugetVersion
111111
ReleaseNotes = release.Notes |> String.concat Environment.NewLine
112-
Tags = "azure, f#, fsharp, type provider, blob, table, queue, script"
112+
Tags = "azure, f#, fsharp, type provider, blob, table, queue, cosmos, script"
113113
OutputPath = @"bin\package"
114114
Dependencies = [ "WindowsAzure.Storage", "9.3.2" ]
115115
References = [ "FSharp.Azure.StorageTypeProvider.dll" ]
116116
Files =
117117
([ "FSharp.Azure.StorageTypeProvider.xml"; "FSharp.Azure.StorageTypeProvider.dll"
118-
"Microsoft.WindowsAzure.Storage.dll"; "Newtonsoft.Json.dll" ]
118+
"Microsoft.Azure.Storage.dll"; "Newtonsoft.Json.dll" ]
119119
|> List.map (fun file -> "../bin/netstandard2.0/publish/" + file, Some "lib/netstandard2.0", None))
120120
@ [ "StorageTypeProvider.fsx", None, None ] })
121121
("nuget/" + project + ".nuspec"))

‎docs/content/blobs.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Working with Blobs
1111
==================
1212
1313
For more information on Blobs in general, please see some of the many articles on
14-
[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: -
14+
[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: -
1515
1616
## Rapid navigation
1717

‎docs/content/queues.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Working with Queues
1010
===================
1111
1212
For more information on Queues in general, please see some of the many articles on
13-
[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: -
13+
[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: -
1414
1515
## Rapid navigation
1616

‎docs/content/tables.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
open Deedle
44
open FSharp.Azure.StorageTypeProvider
55
open FSharp.Azure.StorageTypeProvider.Table
6-
open Microsoft.WindowsAzure.Storage.Table
6+
open Microsoft.Azure.Cosmos.Table
77
open System
88
type Azure = AzureTypeProvider<"UseDevelopmentStorage=true">
99

@@ -21,7 +21,7 @@ Working with Tables
2121
===================
2222
2323
For more information on Tables in general, please see some of the many articles on
24-
[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: -
24+
[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: -
2525
2626
##Rapid navigation
2727

‎docs/tools/references.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#r @"..\..\bin\Microsoft.Data.OData.dll"
33
#r @"..\..\bin\Microsoft.Data.Services.Client.dll"
44
#r @"..\..\bin\Microsoft.Data.Edm.dll"
5-
#r @"..\..\bin\Microsoft.WindowsAzure.Storage.dll"
5+
#r @"..\..\bin\Microsoft.Azure.Storage.dll"
66
#r @"..\..\bin\Newtonsoft.Json.dll"
77
#r @"..\..\bin\System.Spatial.dll"
88
#r @"System.Xml.Linq.dll"

‎paket.dependencies‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1+
storage: none
12
redirects: force
23
source https://www.nuget.org/api/v2/
34
framework: netstandard2.0, netcoreapp2.0
45
generate_load_scripts: true
56

67
nuget FSharp.Core
7-
nuget WindowsAzure.Storage 9.3.2
8-
nuget Newtonsoft.Json 10.0.2
8+
nuget Microsoft.Azure.Storage.Common
9+
nuget Microsoft.Azure.Storage.Blob
10+
nuget Microsoft.Azure.Storage.Queue
11+
nuget Microsoft.Azure.Cosmos.Table
12+
nuget Newtonsoft.Json
913
nuget System.Net.Http
1014

1115
nuget FAKE

0 commit comments

Comments
 (0)