Skip to content

Commit 83e097c

Browse files
committed
Bump version to 2.0.19-alpha01
1 parent dd362f2 commit 83e097c

File tree

8 files changed

+589
-580
lines changed

8 files changed

+589
-580
lines changed

.paket/Paket.Restore.targets

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,24 @@
3838
<NoWarn>$(NoWarn);NU1603</NoWarn>
3939
</PropertyGroup>
4040

41+
<!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk -->
42+
<PropertyGroup>
43+
<PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
44+
<PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
45+
</PropertyGroup>
46+
47+
<!-- If shasum and awk exist get the hashes -->
48+
<Exec Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
49+
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
50+
</Exec>
51+
<Exec Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
52+
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
53+
</Exec>
54+
4155
<PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
42-
<PaketRestoreCachedHash>$([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))</PaketRestoreCachedHash>
43-
<PaketRestoreLockFileHash>$([System.IO.File]::ReadAllText('$(PaketLockFilePath)'))</PaketRestoreLockFileHash>
56+
<!-- if no hash has been done yet fall back to just reading in the files and comparing them -->
57+
<PaketRestoreCachedHash Condition=" '$(PaketRestoreCachedHash)' == '' ">$([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))</PaketRestoreCachedHash>
58+
<PaketRestoreLockFileHash Condition=" '$(PaketRestoreLockFileHash)' == '' ">$([System.IO.File]::ReadAllText('$(PaketLockFilePath)'))</PaketRestoreLockFileHash>
4459
<PaketRestoreRequired>true</PaketRestoreRequired>
4560
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreRequired>
4661
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
@@ -137,27 +152,28 @@
137152

138153
<Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
139154
<ItemGroup>
140-
<_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)/*.nuspec"/>
155+
<_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/>
141156
</ItemGroup>
142157

143158
<PropertyGroup>
144159
<PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
145160
<ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
146-
<UseNewPack>false</UseNewPack>
161+
<UseNewPack>true</UseNewPack>
147162
<UseNewPack Condition=" '$(NuGetToolVersion)' != '4.0.0' ">true</UseNewPack>
148-
<AdjustedNuspecOutputPath>$(BaseIntermediateOutputPath)$(Configuration)/</AdjustedNuspecOutputPath>
163+
<AdjustedNuspecOutputPath>$(BaseIntermediateOutputPath)$(Configuration)</AdjustedNuspecOutputPath>
149164
<AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(BaseIntermediateOutputPath)</AdjustedNuspecOutputPath>
150165
</PropertyGroup>
151166

152167
<ItemGroup>
153-
<_NuspecFiles Include="$(AdjustedNuspecOutputPath)*.nuspec"/>
168+
<_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/>
154169
</ItemGroup>
155170

156171
<Exec Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' Condition="@(_NuspecFiles) != ''" />
157172

158173
<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
159174
<Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
160-
</ConvertToAbsolutePath>
175+
</ConvertToAbsolutePath>
176+
161177

162178
<!-- Call Pack -->
163179
<PackTask Condition="$(UseNewPack)"

.paket/paket.bootstrapper.exe

39 KB
Binary file not shown.

.paket/paket.exe

7.86 MB
Binary file not shown.

build.fsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,13 @@ Target "RunTests" (fun _ ->
7777
// Build a NuGet package
7878

7979
Target "NuGet" (fun _ ->
80-
Paket.Pack (fun p ->
81-
{ p with
82-
OutputPath = buildDir
83-
Version = release.NugetVersion
84-
ReleaseNotes = (toLines release.Notes) })
85-
(*
80+
81+
//Paket.Pack (fun p ->
82+
// { p with
83+
// OutputPath = buildDir
84+
// Version = release.NugetVersion
85+
// ReleaseNotes = (toLines release.Notes) })
86+
8687
DotNetCli.Pack (fun p ->
8788
{ p with
8889
Project = project
@@ -93,7 +94,6 @@ Target "NuGet" (fun _ ->
9394
//"/p:ReleaseNotes=" + (toLines release.Notes)
9495
]
9596
})
96-
*)
9797
)
9898

9999
Target "PublishNuget" (fun _ ->

0 commit comments

Comments
 (0)