diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ae633fc..a0a80ae 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -7,6 +7,12 @@ "commands": [ "fake" ] + }, + "paket": { + "version": "5.231.0", + "commands": [ + "paket" + ] } } } \ No newline at end of file diff --git a/.paket/paket.exe b/.paket/paket.exe deleted file mode 100644 index 0f9368e..0000000 Binary files a/.paket/paket.exe and /dev/null differ diff --git a/.paket/paket.exe.config b/.paket/paket.exe.config deleted file mode 100644 index 2fc733f..0000000 --- a/.paket/paket.exe.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.paket/paket.targets b/.paket/paket.targets deleted file mode 100644 index 18bacb3..0000000 --- a/.paket/paket.targets +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - true - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)..\ - $(PaketRootPath)paket.lock - $(PaketRootPath)paket-files\paket.restore.cached - /Library/Frameworks/Mono.framework/Commands/mono - mono - - - - - $(PaketRootPath)paket.exe - $(PaketToolsPath)paket.exe - "$(PaketExePath)" - $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" - - - - - - $(MSBuildProjectFullPath).paket.references - - - - - $(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references - - - - - $(MSBuildProjectDirectory)\paket.references - - - - - - - - - - - - $(PaketCommand) restore --references-file "$(PaketReferences)" - - RestorePackages; $(BuildDependsOn); - - - - true - - - - $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) - $([System.IO.File]::ReadAllText('$(PaketLockFilePath)')) - true - false - true - - - - - diff --git a/CHANGELOG.md b/CHANGELOG.md index 088788c..3ec665b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +## 3.0.0 + +* Remove setStatusCode and update comments (by @MaxDeg) + ## 2.3.0 ### Added diff --git a/build.fsx b/build.fsx index 01725ce..6c3d130 100644 --- a/build.fsx +++ b/build.fsx @@ -140,17 +140,23 @@ let pushNuget (newVersion: string) (projFile: string) = let projDir = Path.GetDirectoryName(projFile) - let files = + let file = Directory.GetFiles(projDir "bin" "Release", "*.nupkg") |> Array.find (fun nupkg -> nupkg.Contains(newVersion)) - |> fun x -> [x] if needsPublishing then - Paket.pushFiles (fun o -> - { o with ApiKey = nugetKey - PublishUrl = "https://www.nuget.org/api/v2/package" - WorkingDir = __SOURCE_DIRECTORY__ }) - files + run + "dotnet" + root + [ + "paket" + "push" + "--url" + "https://www.nuget.org/api/v2/package" + "--api-key" + nugetKey + file + ] let versionRegex = Regex("^## ?\\[?v?([\\w\\d.-]+\\.[\\w\\d.-]+[a-zA-Z0-9])\\]?", RegexOptions.IgnoreCase) diff --git a/src/Thoth.Json.Giraffe.fsproj b/src/Thoth.Json.Giraffe.fsproj index cd191c5..5de3d21 100644 --- a/src/Thoth.Json.Giraffe.fsproj +++ b/src/Thoth.Json.Giraffe.fsproj @@ -7,7 +7,7 @@ https://github.com/MangelMaxime/Thoth fsharp;json;Giraffe;ASP.NET;Core Maxime Mangel - 2.3.0 + 3.0.0 netstandard2.0