Skip to content

Commit 542c67f

Browse files
committed
chore: quickstart
1 parent 0b7aefe commit 542c67f

4 files changed

Lines changed: 41 additions & 24 deletions

File tree

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"isRoot": true,
44
"tools": {
55
"fantomas": {
6-
"version": "7.0.3",
6+
"version": "7.0.5",
77
"commands": [
88
"fantomas"
99
],
1010
"rollForward": false
1111
},
1212
"paket": {
13-
"version": "10.0.0-alpha011",
13+
"version": "10.3.1",
1414
"commands": [
1515
"paket"
1616
],

.paket/Paket.Restore.targets

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,9 @@
241241
<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
242242
<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
243243
<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
244+
<ReferenceCondition Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 10">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[9])</ReferenceCondition>
244245
</PaketReferencesFileLinesInfo>
245-
<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
246+
<PackageReference Condition=" ('$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct') AND ('%(PaketReferencesFileLinesInfo.ReferenceCondition)' == 'true' Or $(%(PaketReferencesFileLinesInfo.ReferenceCondition)) == 'true')" Include="%(PaketReferencesFileLinesInfo.PackageName)">
246247
<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
247248
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
248249
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
@@ -251,10 +252,8 @@
251252
<Aliases Condition=" %(PaketReferencesFileLinesInfo.Aliases) != ''">%(PaketReferencesFileLinesInfo.Aliases)</Aliases>
252253
<Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
253254
<AllowExplicitVersion>true</AllowExplicitVersion>
254-
255255
</PackageReference>
256-
257-
<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
256+
<PackageVersion Condition="('$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct') AND ('%(PaketReferencesFileLinesInfo.ReferenceCondition)' == 'true' Or $(%(PaketReferencesFileLinesInfo.ReferenceCondition)) == 'true')" Include="%(PaketReferencesFileLinesInfo.PackageName)">
258257
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
259258
</PackageVersion>
260259
</ItemGroup>
@@ -319,7 +318,17 @@
319318
</ItemGroup>
320319

321320
<Error Text="Error Because of PAKET_ERROR_ON_MSBUILD_EXEC (not calling fix-nuspecs)" Condition=" '$(PAKET_ERROR_ON_MSBUILD_EXEC)' == 'true' " />
322-
<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' />
321+
<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) show-conditions -s' ConsoleToMSBuild="true" StandardOutputImportance="low">
322+
<Output TaskParameter="ConsoleOutput" ItemName="_ConditionProperties"/>
323+
</Exec>
324+
<ItemGroup>
325+
<_DefinedConditionProperties Include="@(_ConditionProperties)" Condition="$(%(Identity)) == 'true'"/>
326+
</ItemGroup>
327+
<PropertyGroup>
328+
<_ConditionsParameter></_ConditionsParameter>
329+
<_ConditionsParameter Condition="@(_DefinedConditionProperties) != ''">--conditions @(_DefinedConditionProperties)</_ConditionsParameter>
330+
</PropertyGroup>
331+
<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" $(_ConditionsParameter)' />
323332
<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!' />
324333

325334
<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">

extLauncher/Program.fs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,18 @@ module Program =
352352
app.Configure(fun conf ->
353353
conf.SetApplicationName(IO.AppName) |> ignore
354354

355-
conf.AddCommand<PromptCommand>("prompt").WithDescription("[italic](default command)[/] Type to search. Arrows Up/Down to navigate. Enter to launch. Escape to quit.")
355+
conf
356+
.AddCommand<PromptCommand>("prompt")
357+
.WithDescription(
358+
"[italic](default command)[/] Type to search. Arrows Up/Down to navigate. Enter to launch. Escape to quit."
359+
)
356360
|> ignore
357361

358362
conf
359363
.AddCommand<IndexCommand>("index")
360-
.WithDescription("Indexes all files recursively with a specific pattern which can be a wildcard [italic](default)[/] or a regular expression.")
364+
.WithDescription(
365+
"Indexes all files recursively with a specific pattern which can be a wildcard [italic](default)[/] or a regular expression."
366+
)
361367
|> ignore
362368

363369
conf.AddBranch<LauncherSettings>(
@@ -376,7 +382,9 @@ module Program =
376382
conf.AddCommand<DeindexCommand>("deindex").WithDescription("Clears the current index.")
377383
|> ignore
378384

379-
conf.AddCommand<InfoCommand>("info").WithDescription("Prints the current pattern and all the indexed files.")
385+
conf
386+
.AddCommand<InfoCommand>("info")
387+
.WithDescription("Prints the current pattern and all the indexed files.")
380388
|> ignore
381389

382390
conf.AddCommand<RefreshCommand>("refresh").WithDescription("Updates the current index.")

0 commit comments

Comments
 (0)