Skip to content

Commit 467c89b

Browse files
committed
Bump version to 0.3.2
1 parent 1fc144f commit 467c89b

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

.paket/Paket.Restore.targets

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@
1818
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
1919
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
2020
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
21+
22+
<!-- .net core fdd -->
23+
<_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
24+
<PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
25+
26+
<!-- no extension is a shell script -->
27+
<PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>
28+
2129
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
2230
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
2331
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
@@ -45,10 +53,10 @@
4553
</PropertyGroup>
4654

4755
<!-- If shasum and awk exist get the hashes -->
48-
<Exec Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
56+
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
4957
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
5058
</Exec>
51-
<Exec Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
59+
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
5260
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
5361
</Exec>
5462

@@ -114,9 +122,11 @@
114122
<PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
115123
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
116124
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
125+
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
117126
</PaketReferencesFileLinesInfo>
118127
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
119128
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
129+
<PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
120130
</PackageReference>
121131
</ItemGroup>
122132

@@ -138,9 +148,10 @@
138148
</DotNetCliToolReference>
139149
</ItemGroup>
140150

151+
<!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964
141152
<PropertyGroup>
142153
<RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
143-
</PropertyGroup>
154+
</PropertyGroup> -->
144155

145156
</Target>
146157

src/FSharp.Json/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Json")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Json")>]
77
[<assembly: AssemblyDescriptionAttribute("F# JSON Reflection based serialization library")>]
8-
[<assembly: AssemblyVersionAttribute("0.3.1")>]
9-
[<assembly: AssemblyFileVersionAttribute("0.3.1")>]
8+
[<assembly: AssemblyVersionAttribute("0.3.2")>]
9+
[<assembly: AssemblyFileVersionAttribute("0.3.2")>]
1010
[<assembly: AssemblyConfigurationAttribute("Release")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
1414
let [<Literal>] AssemblyTitle = "FSharp.Json"
1515
let [<Literal>] AssemblyProduct = "FSharp.Json"
1616
let [<Literal>] AssemblyDescription = "F# JSON Reflection based serialization library"
17-
let [<Literal>] AssemblyVersion = "0.3.1"
18-
let [<Literal>] AssemblyFileVersion = "0.3.1"
17+
let [<Literal>] AssemblyVersion = "0.3.2"
18+
let [<Literal>] AssemblyFileVersion = "0.3.2"
1919
let [<Literal>] AssemblyConfiguration = "Release"

0 commit comments

Comments
 (0)