Skip to content

Commit a435df8

Browse files
isaacabrahamisaacabraham
committed
Merge branch 'remove-compiler-tools'
# Conflicts: # .paket/Paket.Restore.targets # build.fsx # paket.dependencies # paket.lock
2 parents ae91204 + 0da2820 commit a435df8

File tree

11 files changed

+79
-54
lines changed

11 files changed

+79
-54
lines changed

‎FSharp.Azure.StorageTypeProvider.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1414
docs\tools\generate.fsx = docs\tools\generate.fsx
1515
README.md = README.md
1616
RELEASE_NOTES.md = RELEASE_NOTES.md
17+
sample-blobs.json = sample-blobs.json
18+
sample-tables.json = sample-tables.json
1719
EndProjectSection
1820
EndProject
1921
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Azure.StorageTypeProvider", "src\FSharp.Azure.StorageTypeProvider\FSharp.Azure.StorageTypeProvider.fsproj", "{FB7CA8F3-C158-49E9-B816-501741E2921F}"

‎RELEASE_NOTES.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,8 @@
102102
### 2.0.0 - 28th December 2018
103103
* Support for blob-only accounts
104104

105-
### 2.0.1 - 05th February 2018
106-
* Fix #119 (Even when JSON tableSchema parameter is used Emulator required to be running)
105+
### 2.0.1 - 05th February 2019
106+
* Fix #119 (Even when JSON tableSchema parameter is used Emulator required to be running)
107+
108+
### 2.0.2 - 7th April 2019
109+
* Remove dependency on FSharp.Compiler.Tools.

‎build.fsx‎

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ open System.IO
1717
open Fake.IO
1818
open Fake.Azure
1919
open Fake.DotNet.NuGet
20-
open Fake.Tools.Git
2120
open Fake.IO.FileSystemOperators
2221

2322
// The name of the project
@@ -27,14 +26,6 @@ let project = "FSharp.Azure.StorageTypeProvider"
2726
// (used as description in AssemblyInfo and as a short summary for NuGet package)
2827
let summary = "Allows easy access to Azure Storage assets through F# scripts."
2928

30-
// Git configuration (used for publishing documentation in gh-pages branch)
31-
// The profile where the project is posted
32-
let gitOwner = "fsprojects"
33-
let gitHome = "https://github.com/" + gitOwner
34-
35-
// The name of the project on GitHub
36-
let gitName = "AzureStorageTypeProvider"
37-
3829
// Read additional information from the release notes document
3930
Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
4031

@@ -46,10 +37,6 @@ let projectPath = Path.getFullName "./src/FSharp.Azure.StorageTypeProvider"
4637

4738
// Test path
4839
let testPath = Path.getFullName "./tests/IntegrationTests"
49-
// Read additional information from the release notes document
50-
51-
// Test Output Dir
52-
let testOutPutDir = "TestOutput"
5340

5441

5542
let release =
@@ -68,10 +55,6 @@ Target.Create "AssemblyInfo" (fun _ ->
6855

6956
let inline withWorkDir wd =
7057
DotNet.Options.withWorkingDirectory wd
71-
let runDotNet cmd workingDir =
72-
let result =
73-
DotNet.exec (withWorkDir workingDir) cmd ""
74-
if result.ExitCode <> 0 then failwithf "'dotnet %s' failed in %s" cmd workingDir
7558

7659
// --------------------------------------------------------------------------------------
7760
// Clean build results
@@ -96,28 +79,22 @@ Target.Create "Build" (fun _ ->
9679
Target.Create "ResetTestData" (fun _ ->
9780
let script = Path.Combine(testPath, "ResetTestData.fsx")
9881
Emulators.startStorageEmulator()
99-
Fsi.exec (fun p ->
82+
Fsi.exec (fun p ->
83+
printfn "%A" p
10084
{ p with
10185
TargetProfile = Fsi.Profile.Netcore
10286
WorkingDirectory = testPath
10387
}) script [""]
10488
|> snd
105-
|> Seq.iter(fun x -> printfn "%s" x)) ///ToBeFixed
89+
|> Seq.iter (printfn "%s"))
10690

10791
// Run integration tests
10892
let root = __SOURCE_DIRECTORY__
109-
let testNetCoreDir = root </> "tests" </> "IntegrationTests" </> "bin" </> "Release" </> "netcoreapp2.0" </> "win10-x64" </> "publish"
11093

11194
Target.Create "RunTests" (fun _ ->
112-
let result = DotNet.exec (withWorkDir testPath) "publish --self-contained -c Release -r win10-x64" ""
113-
if not result.OK then failwith "Publish failed"
114-
printfn "Dkr: %s" testNetCoreDir
115-
let result = DotNet.exec (withWorkDir testNetCoreDir) "" "IntegrationTests.dll"
116-
if result.OK then
117-
printfn "Expecto for netcore finished without Errors"
118-
else
119-
printfn "Expecto for netcore finished with Errors"
120-
)
95+
let testNetCoreDir = root </> "tests" </> "IntegrationTests" </> "bin" </> "Release" </> "netcoreapp2.0" </> "publish" </> "IntegrationTests.dll"
96+
DotNet.publish (fun p -> { p with Configuration = DotNet.BuildConfiguration.Release }) testPath
97+
DotNet.exec id testNetCoreDir "" |> ignore)
12198

12299
// --------------------------------------------------------------------------------------
123100
// Build a NuGet package
@@ -134,8 +111,7 @@ Target.Create "NuGet" (fun _ ->
134111
ReleaseNotes = release.Notes |> String.concat Environment.NewLine
135112
Tags = "azure, f#, fsharp, type provider, blob, table, queue, script"
136113
OutputPath = @"bin\package"
137-
Dependencies = [ "WindowsAzure.Storage", "9.3.2"
138-
"FSharp.Compiler.Tools", "10.2.1" ]
114+
Dependencies = [ "WindowsAzure.Storage", "9.3.2" ]
139115
References = [ "FSharp.Azure.StorageTypeProvider.dll" ]
140116
Files =
141117
([ "FSharp.Azure.StorageTypeProvider.xml"; "FSharp.Azure.StorageTypeProvider.dll"

‎build.fsx.lock‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
STORAGE: NONE
2+
RESTRICTION: == netstandard2.0
3+
NUGET
4+
remote: https://api.nuget.org/v3/index.json
5+
FSharp.Core (4.6.2)

‎paket.dependencies‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ nuget FSharp.Core
77
nuget WindowsAzure.Storage 9.3.2
88
nuget Newtonsoft.Json 10.0.2
99
nuget System.Net.Http
10-
nuget FSharp.Compiler.Tools
1110

1211
nuget FAKE
1312
nuget Nuget.CommandLine
@@ -43,4 +42,4 @@ nuget Fake.DotNet.Fsi
4342
nuget Fake.DotNet.AssemblyInfoFile
4443
nuget Fake.DotNet.NuGet
4544
nuget Fake.IO.FileSystem
46-
nuget Fake.Tools.Git
45+
nuget Fake.Tools.Git

‎paket.lock‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ NUGET
2020
System.Reflection.TypeExtensions (>= 4.3)
2121
System.Runtime.Loader (>= 4.0)
2222
System.Security.Cryptography.Algorithms (>= 4.3)
23-
FSharp.Compiler.Tools (10.2.3)
2423
FSharp.Core (4.6.2)
2524
FSharp.Formatting (3.1)
2625
FSharp.Compiler.Service (>= 27.0.1 < 28.0)
@@ -583,12 +582,12 @@ NUGET
583582
System.Runtime (>= 4.3)
584583
System.Text.Encoding (>= 4.3)
585584
System.Text.RegularExpressions (4.3)
586-
System.Collections (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8+wpa81)) (== netstandard2.0)
587-
System.Globalization (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8+wpa81)) (== netstandard2.0)
588-
System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8+wpa81)) (== netstandard2.0)
585+
System.Collections (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (== netstandard2.0)
586+
System.Globalization (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (== netstandard2.0)
587+
System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (== netstandard2.0)
589588
System.Runtime (>= 4.3)
590-
System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8+wpa81)) (== netstandard2.0)
591-
System.Threading (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8+wpa81)) (== netstandard2.0)
589+
System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (== netstandard2.0)
590+
System.Threading (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (== netstandard2.0)
592591
System.Threading (4.3)
593592
System.Runtime (>= 4.3)
594593
System.Threading.Tasks (>= 4.3)
@@ -694,8 +693,8 @@ NUGET
694693
Newtonsoft.Json (>= 10.0.2)
695694
GITHUB
696695
remote: fsprojects/FSharp.TypeProviders.SDK
697-
src/ProvidedTypes.fs (f97f77ba03a8f91d927ab70259dc91eb8ba02e40)
698-
src/ProvidedTypes.fsi (f97f77ba03a8f91d927ab70259dc91eb8ba02e40)
696+
src/ProvidedTypes.fs (592d23a96db79b4248ed23a062db3a17433282ce)
697+
src/ProvidedTypes.fsi (592d23a96db79b4248ed23a062db3a17433282ce)
699698
GROUP build
700699
STORAGE: NONE
701700
RESTRICTION: || (== netcoreapp2.0) (== netstandard2.0)
@@ -1356,12 +1355,12 @@ NUGET
13561355
System.Runtime (>= 4.3)
13571356
System.Text.Encoding (>= 4.3)
13581357
System.Text.RegularExpressions (4.3)
1359-
System.Collections (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8+wpa81)) (== netstandard2.0)
1360-
System.Globalization (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8+wpa81)) (== netstandard2.0)
1361-
System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8+wpa81)) (== netstandard2.0)
1358+
System.Collections (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (== netstandard2.0)
1359+
System.Globalization (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (== netstandard2.0)
1360+
System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (== netstandard2.0)
13621361
System.Runtime (>= 4.3)
1363-
System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8+wpa81)) (== netstandard2.0)
1364-
System.Threading (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8+wpa81)) (== netstandard2.0)
1362+
System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (== netstandard2.0)
1363+
System.Threading (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netcoreapp1.1)) (== netstandard2.0)
13651364
System.Threading (4.3)
13661365
System.Runtime (>= 4.3)
13671366
System.Threading.Tasks (>= 4.3)

‎sample-blobs.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"samples": {
3+
"file1.txt": { "Type": "blockblob" },
4+
"file2.txt": null,
5+
"file3.txt": { "Type": "pageblob" },
6+
"folder/": {
7+
"childFile.txt": null
8+
},
9+
"folder2/": {
10+
"child/": {
11+
"descendant4.txt": null
12+
}
13+
}
14+
},
15+
"random": {
16+
"file.txt": null,
17+
"folder/": {
18+
"emptyFolder/": null
19+
}
20+
},
21+
"emptyContainer": { }
22+
}

‎sample-tables.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"Employee": {
3+
"Name": {
4+
"Type": "String"
5+
},
6+
"YearsWorking": {
7+
"Type": "int32"
8+
},
9+
"Dob": {
10+
"Type": "DateTime"
11+
},
12+
"Salary": {
13+
"Type": "double",
14+
"Optional": true
15+
},
16+
"IsManager": {
17+
"Type": "boolean",
18+
"Optional": true
19+
}
20+
}
21+
}

‎src/FSharp.Azure.StorageTypeProvider/AssemblyInfo.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Azure.StorageTypeProvider")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Azure.StorageTypeProvider")>]
77
[<assembly: AssemblyDescriptionAttribute("Allows easy access to Azure Storage assets through F# scripts.")>]
8-
[<assembly: AssemblyVersionAttribute("2.0.1")>]
9-
[<assembly: AssemblyFileVersionAttribute("2.0.1")>]
8+
[<assembly: AssemblyVersionAttribute("2.0.2")>]
9+
[<assembly: AssemblyFileVersionAttribute("2.0.2")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Azure.StorageTypeProvider"
1414
let [<Literal>] AssemblyProduct = "FSharp.Azure.StorageTypeProvider"
1515
let [<Literal>] AssemblyDescription = "Allows easy access to Azure Storage assets through F# scripts."
16-
let [<Literal>] AssemblyVersion = "2.0.1"
17-
let [<Literal>] AssemblyFileVersion = "2.0.1"
16+
let [<Literal>] AssemblyVersion = "2.0.2"
17+
let [<Literal>] AssemblyFileVersion = "2.0.2"

‎src/FSharp.Azure.StorageTypeProvider/paket.references‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ System.Configuration.ConfigurationManager
44
System.Net.Http
55
File:ProvidedTypes.fsi
66
File:ProvidedTypes.fs
7-
FSharp.Compiler.Tools
87
Taskbuilder.fs

0 commit comments

Comments
 (0)