Skip to content

Commit ec2d0af

Browse files
Bump version to 0.7.4
1 parent 341c231 commit ec2d0af

File tree

7 files changed

+25
-21
lines changed

7 files changed

+25
-21
lines changed

.paket/Paket.Restore.targets

+3-6
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,7 @@
7171
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreRequired>
7272
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
7373
</PropertyGroup>
74-
75-
<PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
76-
<PaketRestoreRequired>true</PaketRestoreRequired>
77-
</PropertyGroup>
74+
7875

7976
<!-- Do a global restore if required -->
8077
<Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
@@ -135,11 +132,11 @@
135132
<Error Condition=" '$(DoAllResolvedFilesExist)' != 'true' AND '$(ResolveNuGetPackages)' != 'False' " Text="One Paket file '@(PaketResolvedFilePaths)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
136133

137134
<!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
138-
<ReadLinesFromFile Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" >
135+
<ReadLinesFromFile Condition="'@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" ><!--Condition="Exists('%(PaketResolvedFilePaths.Identity)')"-->
139136
<Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/>
140137
</ReadLinesFromFile>
141138

142-
<ItemGroup Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketReferencesFileLines)' != '' " >
139+
<ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " >
143140
<PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
144141
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
145142
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>

RELEASE_NOTES.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### 0.7.4 - 20.07.2018
2+
* Fix adding multiple auth sources (by [@BohdanZhmud](https://github.com/BohdanZhmud))
3+
* Fix controller nesting bug (by [@TWith2Sugars](https://github.com/TWith2Sugars))
4+
* Reworks 'Key to string conversion as just using ToString was not the best way to tackle the SRTP constraint, `string` decides per type to do invariant conversions and format specializations if needed (by [@NinoFloris](https://github.com/NinoFloris))
5+
* Add protection against subcontroller routes that don't start with a forward slash, which lead to unwanted behavior (by [@NinoFloris](https://github.com/NinoFloris))
6+
* Use fake 5 api (by [@jeremyabbott](https://github.com/jeremyabbott))
7+
18
### 0.7.3 - 14.07.2018
29
* Use earlier FSharp.Core version (by [@Krzysztof-Cieslak](https://github.com/Krzysztof-Cieslak))
310
* Remove unnecessary ObsoleteAttribute from `use_router` (by [@Krzysztof-Cieslak](https://github.com/Krzysztof-Cieslak))

build.cmd

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
SET TOOL_PATH=.fake
1+
SET TOOL_PATH=.\.fake
22

33
IF NOT EXIST "%TOOL_PATH%\fake.exe" (
44
dotnet tool install fake-cli --tool-path ./%TOOL_PATH% --version 5.*
55
)
66

7-
"%TOOL_PATH%/fake.exe build" %*
7+
"%TOOL_PATH%\fake.exe build" %*

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.1.302"
3+
"version": "2.1.300"
44
}
55
}

src/Saturn.Extensions.Authorization/AssemblyInfo.fs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("Saturn.Extensions.Authorization")>]
66
[<assembly: AssemblyProductAttribute("Saturn")>]
77
[<assembly: AssemblyDescriptionAttribute("Opinionated, web development framework for F# which implements the server-side, functional MVC pattern")>]
8-
[<assembly: AssemblyVersionAttribute("0.7.3")>]
9-
[<assembly: AssemblyFileVersionAttribute("0.7.3")>]
8+
[<assembly: AssemblyVersionAttribute("0.7.4")>]
9+
[<assembly: AssemblyFileVersionAttribute("0.7.4")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "Saturn.Extensions.Authorization"
1414
let [<Literal>] AssemblyProduct = "Saturn"
1515
let [<Literal>] AssemblyDescription = "Opinionated, web development framework for F# which implements the server-side, functional MVC pattern"
16-
let [<Literal>] AssemblyVersion = "0.7.3"
17-
let [<Literal>] AssemblyFileVersion = "0.7.3"
16+
let [<Literal>] AssemblyVersion = "0.7.4"
17+
let [<Literal>] AssemblyFileVersion = "0.7.4"

src/Saturn.HttpSys/AssemblyInfo.fs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("Saturn.HttpSys")>]
66
[<assembly: AssemblyProductAttribute("Saturn")>]
77
[<assembly: AssemblyDescriptionAttribute("Opinionated, web development framework for F# which implements the server-side, functional MVC pattern")>]
8-
[<assembly: AssemblyVersionAttribute("0.7.3")>]
9-
[<assembly: AssemblyFileVersionAttribute("0.7.3")>]
8+
[<assembly: AssemblyVersionAttribute("0.7.4")>]
9+
[<assembly: AssemblyFileVersionAttribute("0.7.4")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "Saturn.HttpSys"
1414
let [<Literal>] AssemblyProduct = "Saturn"
1515
let [<Literal>] AssemblyDescription = "Opinionated, web development framework for F# which implements the server-side, functional MVC pattern"
16-
let [<Literal>] AssemblyVersion = "0.7.3"
17-
let [<Literal>] AssemblyFileVersion = "0.7.3"
16+
let [<Literal>] AssemblyVersion = "0.7.4"
17+
let [<Literal>] AssemblyFileVersion = "0.7.4"

src/Saturn/AssemblyInfo.fs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("Saturn")>]
66
[<assembly: AssemblyProductAttribute("Saturn")>]
77
[<assembly: AssemblyDescriptionAttribute("Opinionated, web development framework for F# which implements the server-side, functional MVC pattern")>]
8-
[<assembly: AssemblyVersionAttribute("0.7.3")>]
9-
[<assembly: AssemblyFileVersionAttribute("0.7.3")>]
8+
[<assembly: AssemblyVersionAttribute("0.7.4")>]
9+
[<assembly: AssemblyFileVersionAttribute("0.7.4")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "Saturn"
1414
let [<Literal>] AssemblyProduct = "Saturn"
1515
let [<Literal>] AssemblyDescription = "Opinionated, web development framework for F# which implements the server-side, functional MVC pattern"
16-
let [<Literal>] AssemblyVersion = "0.7.3"
17-
let [<Literal>] AssemblyFileVersion = "0.7.3"
16+
let [<Literal>] AssemblyVersion = "0.7.4"
17+
let [<Literal>] AssemblyFileVersion = "0.7.4"

0 commit comments

Comments
 (0)