Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions .paket/Paket.Restore.targets
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,9 @@
<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
<ReferenceCondition Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 10">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[9])</ReferenceCondition>
</PaketReferencesFileLinesInfo>
<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
<PackageReference Condition=" ('$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct') AND ('%(PaketReferencesFileLinesInfo.ReferenceCondition)' == 'true' Or $(%(PaketReferencesFileLinesInfo.ReferenceCondition)) == 'true')" Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
Expand All @@ -251,10 +252,8 @@
<Aliases Condition=" %(PaketReferencesFileLinesInfo.Aliases) != ''">%(PaketReferencesFileLinesInfo.Aliases)</Aliases>
<Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
<AllowExplicitVersion>true</AllowExplicitVersion>

</PackageReference>

<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
<PackageVersion Condition="('$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct') AND ('%(PaketReferencesFileLinesInfo.ReferenceCondition)' == 'true' Or $(%(PaketReferencesFileLinesInfo.ReferenceCondition)) == 'true')" Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
</PackageVersion>
</ItemGroup>
Expand Down Expand Up @@ -319,7 +318,17 @@
</ItemGroup>

<Error Text="Error Because of PAKET_ERROR_ON_MSBUILD_EXEC (not calling fix-nuspecs)" Condition=" '$(PAKET_ERROR_ON_MSBUILD_EXEC)' == 'true' " />
<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' />
<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) show-conditions -s' ConsoleToMSBuild="true" StandardOutputImportance="low">
<Output TaskParameter="ConsoleOutput" ItemName="_ConditionProperties"/>
</Exec>
<ItemGroup>
<_DefinedConditionProperties Include="@(_ConditionProperties)" Condition="$(%(Identity)) == 'true'"/>
</ItemGroup>
<PropertyGroup>
<_ConditionsParameter></_ConditionsParameter>
<_ConditionsParameter Condition="@(_DefinedConditionProperties) != ''">--conditions @(_DefinedConditionProperties)</_ConditionsParameter>
</PropertyGroup>
<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" $(_ConditionsParameter)' />
<Error Condition="@(_NuspecFiles) == ''" Text='Could not find nuspec files in "$(AdjustedNuspecOutputPath)" (Version: "$(PackageVersion)"), therefore we cannot call "paket fix-nuspecs" and have to error out!' />

<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
Expand Down
6 changes: 3 additions & 3 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ storage: none
framework: netstandard2.0, netstandard2.1, net6.0, net8.0, net9.0, net10.0

nuget FSharp.Core >= 5.0.0 lowest_matching: true
nuget Fable.Core 5.0.0-beta.4
nuget Fable.Core 5.0.0-beta.5

group Test
source https://api.nuget.org/v3/index.json
storage: none
framework: net9.0

nuget FSharp.Core
nuget Fable.Core 5.0.0-beta.4
nuget Fable.Core 5.0.0-beta.5
nuget Microsoft.NET.Test.Sdk ~> 16
nuget xunit ~> 2
nuget xunit.runner.visualstudio ~> 2
Expand All @@ -24,7 +24,7 @@ group Examples
framework: net10.0

nuget FSharp.Core
nuget Fable.Core 5.0.0-beta.4
nuget Fable.Core 5.0.0-beta.5
nuget Feliz.ViewEngine
nuget Zanaptak.TypedCssClasses
nuget FSharp.Control.AsyncRx
Expand Down
18 changes: 9 additions & 9 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ STORAGE: NONE
RESTRICTION: || (== net10.0) (== net6.0) (== net8.0) (== net9.0) (== netstandard2.0) (== netstandard2.1)
NUGET
remote: https://api.nuget.org/v3/index.json
Fable.Core (5.0.0-beta.4)
Fable.Core (5.0.0-beta.5)
FSharp.Core (>= 4.7.2)
FSharp.Core (5.0)

Expand All @@ -11,13 +11,13 @@ STORAGE: NONE
RESTRICTION: == net10.0
NUGET
remote: https://api.nuget.org/v3/index.json
Fable.Core (5.0.0-beta.4)
Fable.Core (5.0.0-beta.5)
FSharp.Core (>= 4.7.2)
Feliz.ViewEngine (1.0.3)
FSharp.Core (>= 4.7)
FSharp.Control.AsyncRx (1.6.7)
FSharp.Core (>= 6.0.6)
FSharp.Core (10.0.100)
FSharp.Core (10.0.103)
Zanaptak.TypedCssClasses (1.0)
FSharp.Core (>= 4.3.4)

Expand All @@ -26,9 +26,9 @@ STORAGE: NONE
RESTRICTION: == net9.0
NUGET
remote: https://api.nuget.org/v3/index.json
Fable.Core (5.0.0-beta.4)
Fable.Core (5.0.0-beta.5)
FSharp.Core (>= 4.7.2)
FSharp.Core (10.0.100)
FSharp.Core (10.0.103)
Microsoft.CodeCoverage (18.0.1)
Microsoft.NET.Test.Sdk (16.11)
Microsoft.CodeCoverage (>= 16.11)
Expand All @@ -39,15 +39,15 @@ NUGET
Microsoft.TestPlatform.ObjectModel (>= 18.0.1)
Newtonsoft.Json (>= 13.0.3)
Newtonsoft.Json (13.0.4)
System.Collections.Immutable (10.0)
System.Reflection.Metadata (10.0)
System.Collections.Immutable (>= 10.0)
System.Collections.Immutable (10.0.3)
System.Reflection.Metadata (10.0.3)
System.Collections.Immutable (>= 10.0.3)
xunit (2.9.3)
xunit.analyzers (>= 1.18)
xunit.assert (>= 2.9.3)
xunit.core (2.9.3)
xunit.abstractions (2.0.3)
xunit.analyzers (1.26)
xunit.analyzers (1.27)
xunit.assert (2.9.3)
xunit.core (2.9.3)
xunit.extensibility.core (2.9.3)
Expand Down