Skip to content

Commit

Permalink
chore: update Fable.Package.SDK to package fable folder correctly +…
Browse files Browse the repository at this point in the history
… make release
  • Loading branch information
MangelMaxime committed Sep 19, 2024
1 parent d9f38ab commit 4186268
Show file tree
Hide file tree
Showing 20 changed files with 120 additions and 81 deletions.
7 changes: 5 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Fable.Package.SDK" Version="0.1.0" />
<PackageVersion Include="EasyBuild.PackageReleaseNotes.Tasks" Version="1.2.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
<PackageVersion Include="Fable.Package.SDK" Version="1.0.0" />
<PackageVersion Include="Fable.Python" Version="4.3.0" />
<PackageVersion Include="Fable.Pyxpecto" Version="1.1.0" />
<PackageVersion Include="FSharp.Core" Version="5.0.0" />
<PackageVersion Include="Fable.Core" Version="4.1.0" />
<PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="SimpleExec" Version="11.0.0" />
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
Expand Down
9 changes: 6 additions & 3 deletions build/Commands/Publish.fs
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,14 @@ let private publish (projectDir: string) =
let nupkgPath = Dotnet.pack projectDir
Dotnet.Nuget.push (nupkgPath, nugetKey, skipDuplicate = true)

type PublishSettings() =
inherit CommandSettings()

type PublishCommand() =
inherit Command<CommandSettings>()
interface ICommandLimiter<CommandSettings>
inherit Command<PublishSettings>()
interface ICommandLimiter<PublishSettings>

override _.Execute(context: CommandContext, settings: CommandSettings) =
override _.Execute(context: CommandContext, settings: PublishSettings) =
TestCommand().Execute(context, TestSettings()) |> ignore

publish Workspace.packages.``Thoth.Json``.``.``
Expand Down
6 changes: 6 additions & 0 deletions packages/Thoth.Json.Core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## 0.4.0 - 2024-09-19

### Fixed

* Package correctly the `fable` folder

## 0.3.0 - 2024-06-15

### Added
Expand Down
5 changes: 4 additions & 1 deletion packages/Thoth.Json.Core/Thoth.Json.Core.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ Pick the right additional package for your runtime:
<!-- <Compile Include="Extra.fs" /> -->
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyBuild.PackageReleaseNotes.Tasks">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Fable.Core" />
<PackageReference Include="Fable.Package.SDK" />
<PackageReference Include="Ionide.KeepAChangelog.Tasks" PrivateAssets="all" />
</ItemGroup>
</Project>
18 changes: 9 additions & 9 deletions packages/Thoth.Json.Core/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
"Microsoft.SourceLink.GitLab": "1.1.1"
}
},
"EasyBuild.PackageReleaseNotes.Tasks": {
"type": "Direct",
"requested": "[1.2.0, )",
"resolved": "1.2.0",
"contentHash": "Fy/NaewrJUaUBIr2KTI7lTZsV5KLNL1YTGPM9pvglf7dYAlSWcvsmVWD2xr+FohuG9oEDbnxeYQNBZqOi4Is6g=="
},
"Fable.Core": {
"type": "Direct",
"requested": "[4.1.0, )",
Expand All @@ -22,22 +28,16 @@
},
"Fable.Package.SDK": {
"type": "Direct",
"requested": "[0.1.0, )",
"resolved": "0.1.0",
"contentHash": "wrEcGovUimN0PRGgVHlX/gsqCm5d/p9eOG74iaHoteX2dsFZQ9P7d066LRAl5Gj7GUHy7azLyDE41KFvZx1v9A=="
"requested": "[1.0.0, )",
"resolved": "1.0.0",
"contentHash": "TIXktcGpeqE3QOr2coV+w5erpLtfijpfBilhb0MNV2OSao/Y5Zg3r7StF+wZ4jSm4Pkid4HpjshZB/V9fUc/Ew=="
},
"FSharp.Core": {
"type": "Direct",
"requested": "[5.0.0, )",
"resolved": "5.0.0",
"contentHash": "iHoYXA0VaSQUONGENB1aVafjDDZDZpwu39MtaRCTrmwFW/cTcK0b2yKNVYneFHJMc3ChtsSoM9lNtJ1dYXkHfA=="
},
"Ionide.KeepAChangelog.Tasks": {
"type": "Direct",
"requested": "[0.1.8, )",
"resolved": "0.1.8",
"contentHash": "hHUZIVz9BlF++B5w183c5HwbqSIXUtJU+lxhKz3ebQ5X8INBIWV7dS/FK8uSqSMUTYavuKkRRTZvJlbYXPUykg=="
},
"NETStandard.Library": {
"type": "Direct",
"requested": "[2.0.3, )",
Expand Down
6 changes: 6 additions & 0 deletions packages/Thoth.Json.JavaScript/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## 0.3.0 - 2024-09-19

### Fixed

* Package correctly the `fable` folder

## 0.2.0 - 2024-06-15

### Changed
Expand Down
5 changes: 4 additions & 1 deletion packages/Thoth.Json.JavaScript/Thoth.Json.JavaScript.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
<Compile Include="Encode.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyBuild.PackageReleaseNotes.Tasks">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Fable.Core" />
<PackageReference Include="Fable.Package.SDK" />
<PackageReference Include="Ionide.KeepAChangelog.Tasks" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Thoth.Json.Core\Thoth.Json.Core.fsproj" />
Expand Down
20 changes: 10 additions & 10 deletions packages/Thoth.Json.JavaScript/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
"Microsoft.SourceLink.GitLab": "1.1.1"
}
},
"EasyBuild.PackageReleaseNotes.Tasks": {
"type": "Direct",
"requested": "[1.2.0, )",
"resolved": "1.2.0",
"contentHash": "Fy/NaewrJUaUBIr2KTI7lTZsV5KLNL1YTGPM9pvglf7dYAlSWcvsmVWD2xr+FohuG9oEDbnxeYQNBZqOi4Is6g=="
},
"Fable.Core": {
"type": "Direct",
"requested": "[4.1.0, )",
Expand All @@ -22,22 +28,16 @@
},
"Fable.Package.SDK": {
"type": "Direct",
"requested": "[0.1.0, )",
"resolved": "0.1.0",
"contentHash": "wrEcGovUimN0PRGgVHlX/gsqCm5d/p9eOG74iaHoteX2dsFZQ9P7d066LRAl5Gj7GUHy7azLyDE41KFvZx1v9A=="
"requested": "[1.0.0, )",
"resolved": "1.0.0",
"contentHash": "TIXktcGpeqE3QOr2coV+w5erpLtfijpfBilhb0MNV2OSao/Y5Zg3r7StF+wZ4jSm4Pkid4HpjshZB/V9fUc/Ew=="
},
"FSharp.Core": {
"type": "Direct",
"requested": "[5.0.0, )",
"resolved": "5.0.0",
"contentHash": "iHoYXA0VaSQUONGENB1aVafjDDZDZpwu39MtaRCTrmwFW/cTcK0b2yKNVYneFHJMc3ChtsSoM9lNtJ1dYXkHfA=="
},
"Ionide.KeepAChangelog.Tasks": {
"type": "Direct",
"requested": "[0.1.8, )",
"resolved": "0.1.8",
"contentHash": "hHUZIVz9BlF++B5w183c5HwbqSIXUtJU+lxhKz3ebQ5X8INBIWV7dS/FK8uSqSMUTYavuKkRRTZvJlbYXPUykg=="
},
"NETStandard.Library": {
"type": "Direct",
"requested": "[2.0.3, )",
Expand Down Expand Up @@ -103,7 +103,7 @@
"dependencies": {
"FSharp.Core": "[5.0.0, )",
"Fable.Core": "[4.1.0, )",
"Fable.Package.SDK": "[0.1.0, )"
"Fable.Package.SDK": "[1.0.0, )"
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion packages/Thoth.Json.Newtonsoft/Thoth.Json.Newtonsoft.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@
<ProjectReference Include="..\Thoth.Json.Core\Thoth.Json.Core.fsproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyBuild.PackageReleaseNotes.Tasks">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Fable.Core" />
<PackageReference Include="Fable.Package.SDK" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="Ionide.KeepAChangelog.Tasks" PrivateAssets="all" />
</ItemGroup>
</Project>
20 changes: 10 additions & 10 deletions packages/Thoth.Json.Newtonsoft/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
"Microsoft.SourceLink.GitLab": "1.1.1"
}
},
"EasyBuild.PackageReleaseNotes.Tasks": {
"type": "Direct",
"requested": "[1.2.0, )",
"resolved": "1.2.0",
"contentHash": "Fy/NaewrJUaUBIr2KTI7lTZsV5KLNL1YTGPM9pvglf7dYAlSWcvsmVWD2xr+FohuG9oEDbnxeYQNBZqOi4Is6g=="
},
"Fable.Core": {
"type": "Direct",
"requested": "[4.1.0, )",
Expand All @@ -22,22 +28,16 @@
},
"Fable.Package.SDK": {
"type": "Direct",
"requested": "[0.1.0, )",
"resolved": "0.1.0",
"contentHash": "wrEcGovUimN0PRGgVHlX/gsqCm5d/p9eOG74iaHoteX2dsFZQ9P7d066LRAl5Gj7GUHy7azLyDE41KFvZx1v9A=="
"requested": "[1.0.0, )",
"resolved": "1.0.0",
"contentHash": "TIXktcGpeqE3QOr2coV+w5erpLtfijpfBilhb0MNV2OSao/Y5Zg3r7StF+wZ4jSm4Pkid4HpjshZB/V9fUc/Ew=="
},
"FSharp.Core": {
"type": "Direct",
"requested": "[5.0.0, )",
"resolved": "5.0.0",
"contentHash": "iHoYXA0VaSQUONGENB1aVafjDDZDZpwu39MtaRCTrmwFW/cTcK0b2yKNVYneFHJMc3ChtsSoM9lNtJ1dYXkHfA=="
},
"Ionide.KeepAChangelog.Tasks": {
"type": "Direct",
"requested": "[0.1.8, )",
"resolved": "0.1.8",
"contentHash": "hHUZIVz9BlF++B5w183c5HwbqSIXUtJU+lxhKz3ebQ5X8INBIWV7dS/FK8uSqSMUTYavuKkRRTZvJlbYXPUykg=="
},
"NETStandard.Library": {
"type": "Direct",
"requested": "[2.0.3, )",
Expand Down Expand Up @@ -109,7 +109,7 @@
"dependencies": {
"FSharp.Core": "[5.0.0, )",
"Fable.Core": "[4.1.0, )",
"Fable.Package.SDK": "[0.1.0, )"
"Fable.Package.SDK": "[1.0.0, )"
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions packages/Thoth.Json.Python/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## 0.4.0 - 2024-09-19

### Fixed

* Package correctly the `fable` folder

## 0.3.0 - 2024-06-15

### Changed
Expand Down
5 changes: 4 additions & 1 deletion packages/Thoth.Json.Python/Thoth.Json.Python.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@
<Compile Include="Encode.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyBuild.PackageReleaseNotes.Tasks">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Fable.Core" />
<PackageReference Include="Fable.Package.SDK" />
<PackageReference Include="Fable.Python" />
<PackageReference Include="Ionide.KeepAChangelog.Tasks" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Thoth.Json.Core\Thoth.Json.Core.fsproj" />
Expand Down
20 changes: 10 additions & 10 deletions packages/Thoth.Json.Python/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
"Microsoft.SourceLink.GitLab": "1.1.1"
}
},
"EasyBuild.PackageReleaseNotes.Tasks": {
"type": "Direct",
"requested": "[1.2.0, )",
"resolved": "1.2.0",
"contentHash": "Fy/NaewrJUaUBIr2KTI7lTZsV5KLNL1YTGPM9pvglf7dYAlSWcvsmVWD2xr+FohuG9oEDbnxeYQNBZqOi4Is6g=="
},
"Fable.Core": {
"type": "Direct",
"requested": "[4.1.0, )",
Expand All @@ -22,9 +28,9 @@
},
"Fable.Package.SDK": {
"type": "Direct",
"requested": "[0.1.0, )",
"resolved": "0.1.0",
"contentHash": "wrEcGovUimN0PRGgVHlX/gsqCm5d/p9eOG74iaHoteX2dsFZQ9P7d066LRAl5Gj7GUHy7azLyDE41KFvZx1v9A=="
"requested": "[1.0.0, )",
"resolved": "1.0.0",
"contentHash": "TIXktcGpeqE3QOr2coV+w5erpLtfijpfBilhb0MNV2OSao/Y5Zg3r7StF+wZ4jSm4Pkid4HpjshZB/V9fUc/Ew=="
},
"Fable.Python": {
"type": "Direct",
Expand All @@ -42,12 +48,6 @@
"resolved": "5.0.0",
"contentHash": "iHoYXA0VaSQUONGENB1aVafjDDZDZpwu39MtaRCTrmwFW/cTcK0b2yKNVYneFHJMc3ChtsSoM9lNtJ1dYXkHfA=="
},
"Ionide.KeepAChangelog.Tasks": {
"type": "Direct",
"requested": "[0.1.8, )",
"resolved": "0.1.8",
"contentHash": "hHUZIVz9BlF++B5w183c5HwbqSIXUtJU+lxhKz3ebQ5X8INBIWV7dS/FK8uSqSMUTYavuKkRRTZvJlbYXPUykg=="
},
"NETStandard.Library": {
"type": "Direct",
"requested": "[2.0.3, )",
Expand Down Expand Up @@ -113,7 +113,7 @@
"dependencies": {
"FSharp.Core": "[5.0.0, )",
"Fable.Core": "[4.1.0, )",
"Fable.Package.SDK": "[0.1.0, )"
"Fable.Package.SDK": "[1.0.0, )"
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion packages/Thoth.Json/Thoth.Json.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ If you are interested on using it against .NET Core or .NET Framework, please us
<Compile Include="Extra.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyBuild.PackageReleaseNotes.Tasks">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Fable.Core" />
<PackageReference Include="Fable.Package.SDK" />
<PackageReference Include="Ionide.KeepAChangelog.Tasks" PrivateAssets="all" />
</ItemGroup>
</Project>
18 changes: 9 additions & 9 deletions packages/Thoth.Json/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
"Microsoft.SourceLink.GitLab": "1.1.1"
}
},
"EasyBuild.PackageReleaseNotes.Tasks": {
"type": "Direct",
"requested": "[1.2.0, )",
"resolved": "1.2.0",
"contentHash": "Fy/NaewrJUaUBIr2KTI7lTZsV5KLNL1YTGPM9pvglf7dYAlSWcvsmVWD2xr+FohuG9oEDbnxeYQNBZqOi4Is6g=="
},
"Fable.Core": {
"type": "Direct",
"requested": "[4.1.0, )",
Expand All @@ -22,22 +28,16 @@
},
"Fable.Package.SDK": {
"type": "Direct",
"requested": "[0.1.0, )",
"resolved": "0.1.0",
"contentHash": "wrEcGovUimN0PRGgVHlX/gsqCm5d/p9eOG74iaHoteX2dsFZQ9P7d066LRAl5Gj7GUHy7azLyDE41KFvZx1v9A=="
"requested": "[1.0.0, )",
"resolved": "1.0.0",
"contentHash": "TIXktcGpeqE3QOr2coV+w5erpLtfijpfBilhb0MNV2OSao/Y5Zg3r7StF+wZ4jSm4Pkid4HpjshZB/V9fUc/Ew=="
},
"FSharp.Core": {
"type": "Direct",
"requested": "[5.0.0, )",
"resolved": "5.0.0",
"contentHash": "iHoYXA0VaSQUONGENB1aVafjDDZDZpwu39MtaRCTrmwFW/cTcK0b2yKNVYneFHJMc3ChtsSoM9lNtJ1dYXkHfA=="
},
"Ionide.KeepAChangelog.Tasks": {
"type": "Direct",
"requested": "[0.1.8, )",
"resolved": "0.1.8",
"contentHash": "hHUZIVz9BlF++B5w183c5HwbqSIXUtJU+lxhKz3ebQ5X8INBIWV7dS/FK8uSqSMUTYavuKkRRTZvJlbYXPUykg=="
},
"NETStandard.Library": {
"type": "Direct",
"requested": "[2.0.3, )",
Expand Down
10 changes: 5 additions & 5 deletions tests/Thoth.Json.Tests.JavaScript/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@
"dependencies": {
"FSharp.Core": "[5.0.0, )",
"Fable.Core": "[4.1.0, )",
"Fable.Package.SDK": "[0.1.0, )"
"Fable.Package.SDK": "[1.0.0, )"
}
},
"thoth.json.javascript": {
"type": "Project",
"dependencies": {
"FSharp.Core": "[5.0.0, )",
"Fable.Core": "[4.1.0, )",
"Fable.Package.SDK": "[0.1.0, )",
"Fable.Package.SDK": "[1.0.0, )",
"Thoth.Json.Core": "[1.0.0, )"
}
},
Expand All @@ -125,9 +125,9 @@
},
"Fable.Package.SDK": {
"type": "CentralTransitive",
"requested": "[0.1.0, )",
"resolved": "0.1.0",
"contentHash": "wrEcGovUimN0PRGgVHlX/gsqCm5d/p9eOG74iaHoteX2dsFZQ9P7d066LRAl5Gj7GUHy7azLyDE41KFvZx1v9A=="
"requested": "[1.0.0, )",
"resolved": "1.0.0",
"contentHash": "TIXktcGpeqE3QOr2coV+w5erpLtfijpfBilhb0MNV2OSao/Y5Zg3r7StF+wZ4jSm4Pkid4HpjshZB/V9fUc/Ew=="
},
"Fable.Python": {
"type": "CentralTransitive",
Expand Down
Loading

0 comments on commit 4186268

Please sign in to comment.