diff --git a/FSharp.ProjectScaffold.sln b/FlurlFs.sln similarity index 69% rename from FSharp.ProjectScaffold.sln rename to FlurlFs.sln index 94710c4..f8020f7 100644 --- a/FSharp.ProjectScaffold.sln +++ b/FlurlFs.sln @@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.ProjectTemplate", "src\FSharp.ProjectTemplate\FSharp.ProjectTemplate.fsproj", "{7E90D6CE-A10B-4858-A5BC-41DF7250CBCA}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FlurlFs", "src\FlurlFs\FlurlFs.fsproj", "{428F2DF8-5BB7-4D2D-8EAB-B35446551FE3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}" ProjectSection(SolutionItems) = preProject @@ -32,7 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.ProjectTemplate.Tests", "tests\FSharp.ProjectTemplate.Tests\FSharp.ProjectTemplate.Tests.fsproj", "{E789C72A-5CFD-436B-8EF1-61AA2852A89F}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FlurlFs.Tests", "tests\FlurlFs.Tests\FlurlFs.Tests.fsproj", "{FCEBB52D-24A5-4E3A-BA2A-90F9A75A7466}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -40,14 +40,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7E90D6CE-A10B-4858-A5BC-41DF7250CBCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E90D6CE-A10B-4858-A5BC-41DF7250CBCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E90D6CE-A10B-4858-A5BC-41DF7250CBCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E90D6CE-A10B-4858-A5BC-41DF7250CBCA}.Release|Any CPU.Build.0 = Release|Any CPU - {E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Release|Any CPU.Build.0 = Release|Any CPU + {428F2DF8-5BB7-4D2D-8EAB-B35446551FE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {428F2DF8-5BB7-4D2D-8EAB-B35446551FE3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {428F2DF8-5BB7-4D2D-8EAB-B35446551FE3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {428F2DF8-5BB7-4D2D-8EAB-B35446551FE3}.Release|Any CPU.Build.0 = Release|Any CPU + {FCEBB52D-24A5-4E3A-BA2A-90F9A75A7466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FCEBB52D-24A5-4E3A-BA2A-90F9A75A7466}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCEBB52D-24A5-4E3A-BA2A-90F9A75A7466}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCEBB52D-24A5-4E3A-BA2A-90F9A75A7466}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,6 +55,6 @@ Global GlobalSection(NestedProjects) = preSolution {83F16175-43B1-4C90-A1EE-8E351C33435D} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1} {8E6D5255-776D-4B61-85F9-73C37AA1FB9A} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1} - {E789C72A-5CFD-436B-8EF1-61AA2852A89F} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4} + {FCEBB52D-24A5-4E3A-BA2A-90F9A75A7466} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4} EndGlobalSection EndGlobal diff --git a/build.template b/build.fsx similarity index 97% rename from build.template rename to build.fsx index 7d6a0f7..3401904 100644 --- a/build.template +++ b/build.fsx @@ -28,38 +28,38 @@ open SourceLink // The name of the project // (used by attributes in AssemblyInfo, name of a NuGet package and directory in 'src') -let project = "##ProjectName##" +let project = "FlurlFs" // Short summary of the project // (used as description in AssemblyInfo and as a short summary for NuGet package) -let summary = "##Summary##" +let summary = "F# Implementation of Flurl URL Builder" // Longer description of the project // (used as a description for NuGet package; line breaks are automatically cleaned up) -let description = "##Description##" +let description = "F# Implementation of Flurl URL Builder" // List of author names (for NuGet package) -let authors = [ "##Author##" ] +let authors = [ "Jon Roberts" ] // Tags for your project (for NuGet package) -let tags = "##Tags##" +let tags = "url uri fsharp" // File system information -let solutionFile = "##ProjectName##.sln" +let solutionFile = "FlurlFs.sln" // Pattern specifying assemblies to be tested using NUnit let testAssemblies = "tests/**/bin/Release/*Tests*.dll" // Git configuration (used for publishing documentation in gh-pages branch) // The profile where the project is posted -let gitOwner = "##GitHome##" +let gitOwner = "bigjonroberts" let gitHome = "https://github.com/" + gitOwner // The name of the project on GitHub -let gitName = "##GitName##" +let gitName = "Flurl.fs" // The url for the raw files hosted -let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/##GitHome##" +let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/bigjonroberts" // -------------------------------------------------------------------------------------- // END TODO: The rest of the file includes standard build steps diff --git a/docs/content/index.fsx b/docs/content/index.fsx index 57fd816..619bc8b 100644 --- a/docs/content/index.fsx +++ b/docs/content/index.fsx @@ -1,10 +1,10 @@ -(*** hide ***) +(*** hide ***) // This block of code is omitted in the generated HTML documentation. Use // it to define helpers that you do not want to show in the documentation. #I "../../bin" (** -FSharp.ProjectScaffold +FlurlFs ====================== Documentation @@ -13,8 +13,8 @@ Documentation
- The FSharp.ProjectScaffold library can be installed from NuGet: - 
PM> Install-Package FSharp.ProjectScaffold
+ The FlurlFs library can be installed from NuGet: + 
PM> Install-Package FlurlFs
@@ -26,8 +26,8 @@ Example This example demonstrates using a function defined in this sample library. *) -#r "FSharp.ProjectScaffold.dll" -open FSharp.ProjectScaffold +#r "FlurlFs.dll" +open FlurlFs printfn "hello = %i" <| Library.hello 0 @@ -59,9 +59,9 @@ The library is available under Public Domain license, which allows modification redistribution for both commercial and non-commercial purposes. For more information see the [License file][license] in the GitHub repository. - [content]: https://github.com/fsprojects/FSharp.ProjectScaffold/tree/master/docs/content - [gh]: https://github.com/fsprojects/FSharp.ProjectScaffold - [issues]: https://github.com/fsprojects/FSharp.ProjectScaffold/issues - [readme]: https://github.com/fsprojects/FSharp.ProjectScaffold/blob/master/README.md - [license]: https://github.com/fsprojects/FSharp.ProjectScaffold/blob/master/LICENSE.txt + [content]: https://github.com/fsprojects/FlurlFs/tree/master/docs/content + [gh]: https://github.com/fsprojects/FlurlFs + [issues]: https://github.com/fsprojects/FlurlFs/issues + [readme]: https://github.com/fsprojects/FlurlFs/blob/master/README.md + [license]: https://github.com/fsprojects/FlurlFs/blob/master/LICENSE.txt *) diff --git a/docs/content/tutorial.fsx b/docs/content/tutorial.fsx index a8ef691..cc3b18f 100644 --- a/docs/content/tutorial.fsx +++ b/docs/content/tutorial.fsx @@ -1,4 +1,4 @@ -(*** hide ***) +(*** hide ***) // This block of code is omitted in the generated HTML documentation. Use // it to define helpers that you do not want to show in the documentation. #I "../../bin" @@ -10,8 +10,8 @@ Introducing your project Say more *) -#r "FSharp.ProjectScaffold.dll" -open FSharp.ProjectScaffold +#r "FlurlFs.dll" +open FlurlFs Library.hello 0 (** diff --git a/docs/output/README.md b/docs/output/README.md deleted file mode 100644 index fae92c5..0000000 --- a/docs/output/README.md +++ /dev/null @@ -1,17 +0,0 @@ -This file is in the `docs/output` directory. - -This directory will contain the final artifacts for both narrative and API documentation. -This folder will be automatically created by the documenation generation process. - -**It is strongly recommended that nothing be put into this directory.** - -It is **strongly advised** that the **contents of this directory not be committed** to source control -(with the sole exception being this `README.md` file). - ---- - -NOTE: - -This file is a placeholder, used to preserve directory structure in Git. - -This file does not need to be edited. diff --git a/docs/tools/generate.template b/docs/tools/generate.fsx similarity index 95% rename from docs/tools/generate.template rename to docs/tools/generate.fsx index 6ae7daa..864af1d 100644 --- a/docs/tools/generate.template +++ b/docs/tools/generate.fsx @@ -11,17 +11,17 @@ // (This is the original behaviour of ProjectScaffold prior to multi project support) let referenceBinaries = [] // Web site location for the generated documentation -let website = "/##ProjectName##" +let website = "/FlurlFs" -let githubLink = "http://github.com/##GitHome##/##GitName##" +let githubLink = "http://github.com/bigjonroberts/Flurl.fs" // Specify more information about your project let info = - [ "project-name", "##ProjectName##" - "project-author", "##Author##" - "project-summary", "##Summary##" + [ "project-name", "FlurlFs" + "project-author", "Jon Roberts" + "project-summary", "F# Implementation of Flurl URL Builder" "project-github", githubLink - "project-nuget", "http://nuget.org/packages/##ProjectName##" ] + "project-nuget", "http://nuget.org/packages/FlurlFs" ] // -------------------------------------------------------------------------------------- // For typical project, no changes are needed below diff --git a/init.fsx b/init.fsx deleted file mode 100644 index 3c3aac0..0000000 --- a/init.fsx +++ /dev/null @@ -1,240 +0,0 @@ -#r @"packages/build/FAKE/tools/FakeLib.dll" -open Fake -open System -open System.IO -open System.Collections.Generic - -// -------------------------------- -// init.fsx -// This file is run the first time that you run build.sh/build.cmd -// It generates the build.fsx and generate.fsx files -// -------------------------------- - -let dirsWithProjects = ["src";"tests";"docs/content"] - |> List.map (fun d -> directoryInfo (__SOURCE_DIRECTORY__ @@ d)) - -// special funtions -// many whom might be replaceable with FAKE functions - -let failfUnlessExists f msg p = if not <| File.Exists f then failwithf msg p -let combine p1 p2 = Path.Combine(p2, p1) -let move p1 p2 = - if File.Exists p1 then - printfn "moving %s to %s" p1 p2 - File.Move(p1, p2) - elif Directory.Exists p1 then - printfn "moving directory %s to %s" p1 p2 - Directory.Move(p1, p2) - else - failwithf "Could not move %s to %s" p1 p2 -let localFile f = combine f __SOURCE_DIRECTORY__ -let buildTemplatePath = localFile "build.template" -let outputPath = localFile "build.fsx" - -let prompt (msg:string) = - Console.Write(msg) - Console.ReadLine().Trim() - |> function | "" -> None | s -> Some s - |> Option.map (fun s -> s.Replace ("\"","\\\"")) -let runningOnAppveyor = - not <| String.IsNullOrEmpty(Environment.GetEnvironmentVariable("CI")) -let runningOnTravis = - not <| String.IsNullOrEmpty(Environment.GetEnvironmentVariable("TRAVIS")) -let inCI = runningOnAppveyor || runningOnTravis -let promptFor friendlyName = - if inCI then Some "CONTINUOUSINTEGRATION" - else prompt (sprintf "%s: " friendlyName) -let rec promptForNoSpaces friendlyName = - match promptFor friendlyName with - | None -> None - | Some s when not <| String.exists (fun c -> c = ' ') s -> Some s - | _ -> Console.WriteLine("Sorry, spaces are disallowed"); promptForNoSpaces friendlyName -let rec promptYesNo msg = - match prompt (sprintf "%s [Yn]: " msg) with - | None - | Some "Y" | Some "y" -> true - | Some "N" | Some "n" -> false - | _ -> Console.WriteLine("Sorry, invalid answer"); promptYesNo msg - -failfUnlessExists buildTemplatePath "Cannot find build template file %s" - (Path.GetFullPath buildTemplatePath) - -// User input -let border = "#####################################################" -let print msg = - printfn """ - %s - %s - %s - """ border msg border - -print """ -# Project Scaffold Init Script -# Please answer a few questions and we will generate -# two files: -# -# build.fsx This will be your build script -# docs/tools/generate.fsx This script will generate your -# documentation -# -# NOTE: Aside from the Project Name, you may leave any -# of these blank, but you will need to change the defaults -# in the generated scripts. -# -""" - -let vars = Dictionary() -vars.["##ProjectName##"] <- promptForNoSpaces "Project Name (used for solution/project files)" -vars.["##Summary##"] <- promptFor "Summary (a short description)" -vars.["##Description##"] <- promptFor "Description (longer description used by NuGet)" -vars.["##Author##"] <- promptFor "Author" -vars.["##Tags##"] <- promptFor "Tags (separated by spaces)" -vars.["##GitHome##"] <- promptFor "Github User or Organization" -vars.["##GitName##"] <- promptFor "Github Project Name (leave blank to use Project Name)" - -let wantGit = if inCI - then false - else promptYesNo "Initialize git repo" -let givenOrigin = if wantGit - then promptForNoSpaces "Origin (url of git remote; blank to skip)" - else None - -//Basic settings -let solutionTemplateName = "FSharp.ProjectScaffold" -let projectTemplateName = "FSharp.ProjectTemplate" -let oldProjectGuid = "7E90D6CE-A10B-4858-A5BC-41DF7250CBCA" -let projectGuid = Guid.NewGuid().ToString() -let oldTestProjectGuid = "E789C72A-5CFD-436B-8EF1-61AA2852A89F" -let testProjectGuid = Guid.NewGuid().ToString() - -//Rename solution file -let templateSolutionFile = localFile (sprintf "%s.sln" solutionTemplateName) -failfUnlessExists templateSolutionFile "Cannot find solution file template %s" - (templateSolutionFile |> Path.GetFullPath) - -let projectName = - match vars.["##ProjectName##"] with - | Some p -> p.Replace(" ", "") - | None -> "ProjectScaffold" -let solutionFile = localFile (projectName + ".sln") -move templateSolutionFile solutionFile - -//Rename project files and directories -dirsWithProjects -|> List.iter (fun pd -> - // project files - pd - |> subDirectories - |> Array.collect (fun d -> filesInDirMatching "*.?sproj" d) - |> Array.iter (fun f -> f.MoveTo(f.Directory.FullName @@ (f.Name.Replace(projectTemplateName, projectName)))) - // project directories - pd - |> subDirectories - |> Array.iter (fun d -> d.MoveTo(pd.FullName @@ (d.Name.Replace(projectTemplateName, projectName)))) - ) - -//Now that everything is renamed, we need to update the content of some files -let replace t r (lines:seq) = - seq { - for s in lines do - if s.Contains(t) then yield s.Replace(t, r) - else yield s } - -let replaceWithVarOrMsg t n lines = - replace t (vars.[t] |> function | None -> n | Some s -> s) lines - -let overwrite file content = File.WriteAllLines(file, content |> Seq.toArray); file - -let replaceContent file = - File.ReadAllLines(file) |> Array.toSeq - |> replace projectTemplateName projectName - |> replace (oldProjectGuid.ToLowerInvariant()) (projectGuid.ToLowerInvariant()) - |> replace (oldTestProjectGuid.ToLowerInvariant()) (testProjectGuid.ToLowerInvariant()) - |> replace (oldProjectGuid.ToUpperInvariant()) (projectGuid.ToUpperInvariant()) - |> replace (oldTestProjectGuid.ToUpperInvariant()) (testProjectGuid.ToUpperInvariant()) - |> replace solutionTemplateName projectName - |> replaceWithVarOrMsg "##Author##" "Author not set" - |> replaceWithVarOrMsg "##Description##" "Description not set" - |> replaceWithVarOrMsg "##Summary##" "" - |> replaceWithVarOrMsg "##ProjectName##" "" - |> replaceWithVarOrMsg "##Tags##" "" - |> replaceWithVarOrMsg "##GitHome##" "[github-user]" - |> overwrite file - |> sprintf "%s updated" - -let rec filesToReplace dir = seq { - yield! Directory.GetFiles(dir, "*.?sproj") - yield! Directory.GetFiles(dir, "*.fs") - yield! Directory.GetFiles(dir, "*.cs") - yield! Directory.GetFiles(dir, "*.xaml") - yield! Directory.GetFiles(dir, "*.fsx") - yield! Directory.GetFiles(dir, "paket.template") - yield! Directory.EnumerateDirectories(dir) |> Seq.collect filesToReplace -} - -[solutionFile] @ (dirsWithProjects - |> List.collect (fun d -> d.FullName |> filesToReplace |> List.ofSeq)) -|> List.map replaceContent -|> List.iter print - -//Replace tokens in build template -let generate templatePath generatedFilePath = - failfUnlessExists templatePath "Cannot find template %s" (templatePath |> Path.GetFullPath) - - let newContent = - File.ReadAllLines(templatePath) |> Array.toSeq - |> replace "##ProjectName##" projectName - |> replaceWithVarOrMsg "##Summary##" "Project has no summmary; update build.fsx" - |> replaceWithVarOrMsg "##Description##" "Project has no description; update build.fsx" - |> replaceWithVarOrMsg "##Author##" "Update Author in build.fsx" - |> replaceWithVarOrMsg "##Tags##" "" - |> replaceWithVarOrMsg "##GitHome##" "Update GitHome in build.fsx" - |> replaceWithVarOrMsg "##GitName##" projectName - - File.WriteAllLines(generatedFilePath, newContent) - File.Delete(templatePath) - print (sprintf "# Generated %s" generatedFilePath) - -generate (localFile "build.template") (localFile "build.fsx") -generate (localFile "docs/tools/generate.template") (localFile "docs/tools/generate.fsx") - -//Handle source control -let isGitRepo () = - try - let info = Git.CommandHelper.findGitDir __SOURCE_DIRECTORY__ - info.Exists - with - | _ -> false - -let setRemote (name,url) workingDir = - try - let cmd = sprintf "remote add %s %s" name url - match Git.CommandHelper.runGitCommand __SOURCE_DIRECTORY__ cmd with - | true ,_,_ -> tracefn "Successfully add remote '%s' = '%s'" name url - | false,_,x -> traceError <| sprintf "Couldn't add remote: %s" x - with - | x -> traceException x - -let isRemote (name,url) value = - let remote = getRegEx <| sprintf @"^%s\s+%s\s+\(push\)$" name url - remote.IsMatch value - -let isScaffoldRemote = isRemote ("origin","http://github.com/fsprojects/ProjectScaffold.git") - -let hasScaffoldOrigin () = - try - match Git.CommandHelper.runGitCommand __SOURCE_DIRECTORY__ "remote -v" with - | true ,remotes,_ -> remotes |> Seq.exists isScaffoldRemote - | false,_ ,_ -> false - with - | _ -> false - -if isGitRepo () && hasScaffoldOrigin () then - DeleteDir (Git.CommandHelper.findGitDir __SOURCE_DIRECTORY__).FullName - -if wantGit then - Git.Repository.init __SOURCE_DIRECTORY__ false false - givenOrigin |> Option.iter (fun url -> setRemote ("origin",url) __SOURCE_DIRECTORY__) - -//Clean up -File.Delete "init.fsx" diff --git a/paket.lock b/paket.lock index 27fb0a3..607b473 100644 --- a/paket.lock +++ b/paket.lock @@ -4,26 +4,26 @@ GROUP Build NUGET remote: https://www.nuget.org/api/v2 specs: - FAKE (4.21.0) + FAKE (4.25.4) FSharp.Compiler.Service (2.0.0.6) - FSharp.Formatting (2.14.0) - FSharp.Compiler.Service (>= 2.0.0.3 < 2.1.0) - FSharpVSPowerTools.Core (>= 2.3.0 < 2.4.0) - FSharpVSPowerTools.Core (2.3.0) + FSharp.Formatting (2.14.2) + FSharp.Compiler.Service (2.0.0.6) + FSharpVSPowerTools.Core (>= 2.3 < 2.4) + FSharpVSPowerTools.Core (2.3) FSharp.Compiler.Service (>= 2.0.0.3) - Microsoft.Bcl (1.1.10) + Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full Microsoft.Bcl.Build (>= 1.0.14) - Microsoft.Bcl.Build (1.0.21) - import_targets: false - Microsoft.Net.Http (2.2.29) + Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full + Microsoft.Net.Http (2.2.29) - framework: net10, net11, net20, net30, net35, net40, net40-full Microsoft.Bcl (>= 1.1.10) Microsoft.Bcl.Build (>= 1.0.14) - Octokit (0.18.0) - Microsoft.Net.Http - SourceLink.Fake (1.1.0) + Octokit (0.19) + Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full + SourceLink.Fake (1.1) GITHUB remote: fsharp/FAKE specs: - modules/Octokit/Octokit.fsx (998ddffae27ce0add0d7b8634a02fb43a9f96409) + modules/Octokit/Octokit.fsx (db3139b0bf8a93047a68ca10f0135f1e94a10cae) Octokit GROUP Test NUGET diff --git a/src/FSharp.ProjectTemplate/AssemblyInfo.fs b/src/FSharp.ProjectTemplate/AssemblyInfo.fs deleted file mode 100644 index 2ecdd7c..0000000 --- a/src/FSharp.ProjectTemplate/AssemblyInfo.fs +++ /dev/null @@ -1,12 +0,0 @@ -namespace System -open System.Reflection - -[] -[] -[] -[] -[] -do () - -module internal AssemblyVersionInformation = - let [] Version = "1.0" diff --git a/src/FSharp.ProjectTemplate/Script.fsx b/src/FSharp.ProjectTemplate/Script.fsx deleted file mode 100644 index 774aec1..0000000 --- a/src/FSharp.ProjectTemplate/Script.fsx +++ /dev/null @@ -1,8 +0,0 @@ -// Learn more about F# at http://fsharp.org. See the 'F# Tutorial' project -// for more guidance on F# programming. - -#load "Library.fs" -open FSharp.ProjectTemplate - -let num = Library.hello 42 -printfn "%i" num diff --git a/src/FSharp.ProjectTemplate/paket.template b/src/FSharp.ProjectTemplate/paket.template deleted file mode 100644 index 8e1a169..0000000 --- a/src/FSharp.ProjectTemplate/paket.template +++ /dev/null @@ -1,25 +0,0 @@ -type project -title - ##ProjectName## -owners - ##Author## -authors - ##Author## -projectUrl - http://github.com/##GitHome##/FSharp.ProjectScaffold -iconUrl - https://raw.githubusercontent.com/##GitHome##/FSharp.ProjectScaffold/master/docs/files/img/logo.png -licenseUrl - http://github.com/##GitHome##/FSharp.ProjectScaffold/blob/master/LICENSE.txt -requireLicenseAcceptance - false -copyright - Copyright 2015 -tags - ##Tags## -summary - ##Summary## -description - ##Description## - - diff --git a/src/FlurlFs/AssemblyInfo.fs b/src/FlurlFs/AssemblyInfo.fs new file mode 100644 index 0000000..9d57031 --- /dev/null +++ b/src/FlurlFs/AssemblyInfo.fs @@ -0,0 +1,13 @@ +namespace System +open System.Reflection + +[] +[] +[] +[] +[] +do () + +module internal AssemblyVersionInformation = + let [] Version = "1.0" + let [] InformationalVersion = "1.0" diff --git a/src/FSharp.ProjectTemplate/FSharp.ProjectTemplate.fsproj b/src/FlurlFs/FlurlFs.fsproj similarity index 90% rename from src/FSharp.ProjectTemplate/FSharp.ProjectTemplate.fsproj rename to src/FlurlFs/FlurlFs.fsproj index 267ed1e..54b16c2 100644 --- a/src/FSharp.ProjectTemplate/FSharp.ProjectTemplate.fsproj +++ b/src/FlurlFs/FlurlFs.fsproj @@ -1,17 +1,17 @@ - + Debug AnyCPU 2.0 - 7e90d6ce-a10b-4858-a5bc-41df7250cbca + 428f2df8-5bb7-4d2d-8eab-b35446551fe3 Library - FSharp.ProjectTemplate - FSharp.ProjectTemplate + FlurlFs + FlurlFs v4.0 4.3.0.0 - FSharp.ProjectTemplate + FlurlFs @@ -31,7 +31,7 @@ .\bin\Release TRACE 3 - .\bin\Release\FSharp.ProjectTemplate.xml + .\bin\Release\FlurlFs.xml --warnon:1182 diff --git a/src/FSharp.ProjectTemplate/Library.fs b/src/FlurlFs/Library.fs similarity index 86% rename from src/FSharp.ProjectTemplate/Library.fs rename to src/FlurlFs/Library.fs index b6924e4..d6d5bcb 100644 --- a/src/FSharp.ProjectTemplate/Library.fs +++ b/src/FlurlFs/Library.fs @@ -1,4 +1,4 @@ -namespace FSharp.ProjectTemplate +namespace FlurlFs /// Documentation for my library /// diff --git a/src/FlurlFs/Script.fsx b/src/FlurlFs/Script.fsx new file mode 100644 index 0000000..6f7c0e3 --- /dev/null +++ b/src/FlurlFs/Script.fsx @@ -0,0 +1,8 @@ +// Learn more about F# at http://fsharp.org. See the 'F# Tutorial' project +// for more guidance on F# programming. + +#load "Library.fs" +open FlurlFs + +let num = Library.hello 42 +printfn "%i" num diff --git a/src/FSharp.ProjectTemplate/paket.references b/src/FlurlFs/paket.references similarity index 100% rename from src/FSharp.ProjectTemplate/paket.references rename to src/FlurlFs/paket.references diff --git a/src/FlurlFs/paket.template b/src/FlurlFs/paket.template new file mode 100644 index 0000000..4a5e142 --- /dev/null +++ b/src/FlurlFs/paket.template @@ -0,0 +1,25 @@ +type project +title + FlurlFs +owners + Jon Roberts +authors + Jon Roberts +projectUrl + http://github.com/bigjonroberts/FlurlFs +iconUrl + https://raw.githubusercontent.com/bigjonroberts/FlurlFs/master/docs/files/img/logo.png +licenseUrl + http://github.com/bigjonroberts/FlurlFs/blob/master/LICENSE.txt +requireLicenseAcceptance + false +copyright + Copyright 2015 +tags + url uri fsharp +summary + F# Implementation of Flurl URL Builder +description + F# Implementation of Flurl URL Builder + + diff --git a/tests/FSharp.ProjectTemplate.Tests/FSharp.ProjectTemplate.Tests.fsproj b/tests/FlurlFs.Tests/FlurlFs.Tests.fsproj similarity index 88% rename from tests/FSharp.ProjectTemplate.Tests/FSharp.ProjectTemplate.Tests.fsproj rename to tests/FlurlFs.Tests/FlurlFs.Tests.fsproj index 20f6831..0f0698b 100644 --- a/tests/FSharp.ProjectTemplate.Tests/FSharp.ProjectTemplate.Tests.fsproj +++ b/tests/FlurlFs.Tests/FlurlFs.Tests.fsproj @@ -1,17 +1,17 @@ - + Debug AnyCPU 2.0 - e789c72a-5cfd-436b-8ef1-61aa2852a89f + fcebb52d-24a5-4e3a-ba2a-90f9a75a7466 Library - FSharp.ProjectTemplate.Tests - FSharp.ProjectTemplate.Tests + FlurlFs.Tests + FlurlFs.Tests v4.0 4.3.0.0 - FSharp.ProjectTemplate.Tests + FlurlFs.Tests ..\..\ @@ -68,9 +68,9 @@ - - FSharp.ProjectTemplate - {7e90d6ce-a10b-4858-a5bc-41df7250cbca} + + FlurlFs + {428f2df8-5bb7-4d2d-8eab-b35446551fe3} True diff --git a/tests/FSharp.ProjectTemplate.Tests/Tests.fs b/tests/FlurlFs.Tests/Tests.fs similarity index 68% rename from tests/FSharp.ProjectTemplate.Tests/Tests.fs rename to tests/FlurlFs.Tests/Tests.fs index 8f349f5..b3c8d05 100644 --- a/tests/FSharp.ProjectTemplate.Tests/Tests.fs +++ b/tests/FlurlFs.Tests/Tests.fs @@ -1,6 +1,6 @@ -module FSharp.ProjectScaffold.Tests +module FlurlFs.Tests -open FSharp.ProjectTemplate +open FlurlFs open NUnit.Framework [] diff --git a/tests/FSharp.ProjectTemplate.Tests/paket.references b/tests/FlurlFs.Tests/paket.references similarity index 100% rename from tests/FSharp.ProjectTemplate.Tests/paket.references rename to tests/FlurlFs.Tests/paket.references