Skip to content

Commit 9e2c60d

Browse files
author
Maxime Mangel
committed
Bump version to 4.0.1
1 parent 34a367f commit 9e2c60d

File tree

6 files changed

+93
-94
lines changed

6 files changed

+93
-94
lines changed

.paket/Paket.Restore.targets

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
7373
</PropertyGroup>
7474

75+
<PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
76+
<PaketRestoreRequired>true</PaketRestoreRequired>
77+
</PropertyGroup>
7578

7679
<!-- Do a global restore if required -->
7780
<Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
@@ -93,7 +96,7 @@
9396
<PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath>
9497
<!-- paket.references -->
9598
<PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath>
96-
99+
97100
<DoAllResolvedFilesExist>false</DoAllResolvedFilesExist>
98101
<DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist>
99102
<PaketRestoreRequired>true</PaketRestoreRequired>
@@ -132,20 +135,21 @@
132135
<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'." />
133136

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

139-
<ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " >
142+
<ItemGroup Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketReferencesFileLines)' != '' " >
140143
<PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
141144
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
142145
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
143146
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
147+
<CopyLocal>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
144148
</PaketReferencesFileLinesInfo>
145149
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
146150
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
147151
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
148-
<ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
152+
<ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
149153
<Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
150154
</PackageReference>
151155
</ItemGroup>

paket.dependencies

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
source https://www.nuget.org/api/v2
22
storage: none
33

4-
clitool dotnet-Fable 2.0.0-alpha-007
5-
nuget Fable.Core 2.0.0-alpha-006
4+
clitool dotnet-Fable
5+
nuget Fable.Core
66
nuget Fable.Geojson
77
nuget Fable.Import.Browser
88
nuget Fable.Leaflet
@@ -14,4 +14,4 @@ framework: net46
1414
nuget FSharp.Core redirects:force, content:none
1515
nuget FAKE
1616
github fsharp/FAKE modules/Octokit/Octokit.fsx
17-
github fable-compiler/fake-helpers Fable.FakeHelpers.fs
17+
github fable-compiler/fake-helpers Fable.FakeHelpers.fs

0 commit comments

Comments
 (0)