Skip to content

Commit

Permalink
Merge branch 'release/8.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Timothé Larivière committed Feb 21, 2024
2 parents 0bdc628 + be850d6 commit 3574dd8
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 11 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

_No unreleased changes_

## [8.1.0-pre12] - 2024-02-19

### Changed
- Use Fabulous 2.5.0-pre11

## [8.1.0-pre11] - 2024-02-19

### Changed
- Use Fabulous 2.5.0-pre10

## [8.1.0-pre10] - 2024-02-12

### Changed
Expand Down Expand Up @@ -205,7 +215,9 @@ Essentially v2.8.1 and v8.0.0 are similar except for the required .NET version.
### Changed
- Fabulous.MauiControls has moved from the Fabulous repository to its own repository: [https://github.com/fabulous-dev/Fabulous.MauiControls](https://github.com/fabulous-dev/Fabulous.MauiControls)

[unreleased]: https://github.com/fabulous-dev/Fabulous.MauiControls/compare/8.1.0-pre10...HEAD
[unreleased]: https://github.com/fabulous-dev/Fabulous.MauiControls/compare/8.1.0-pre12...HEAD
[8.1.0-pre12]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/8.1.0-pre12
[8.1.0-pre11]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/8.1.0-pre11
[8.1.0-pre10]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/8.1.0-pre10
[8.1.0-pre9]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/8.1.0-pre9
[8.1.0-pre8]: https://github.com/fabulous-dev/Fabulous.MauiControls/releases/tag/8.1.0-pre8
Expand Down
16 changes: 8 additions & 8 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="Fabulous" Version="2.5.0-pre8" />
<PackageVersion Include="Fabulous" Version="2.5.0-pre11" />
<PackageVersion Include="FsCheck.NUnit" Version="2.16.6" />
<PackageVersion Include="FSharp.Core" Version="8.0.100" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageVersion Include="FSharp.Core" Version="8.0.200" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="NUnit" Version="3.14.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="FSharp.Maui.WinUICompat" Version="1.1.0" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.7" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.7" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Fabulous.MauiControls/Fabulous.MauiControls.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
This version will be used as the lower bound in the NuGet package
-->
<PackageReference Include="FSharp.Core" VersionOverride="8.0.100" PrivateAssets="All" />
<PackageReference Include="Fabulous" Condition="'$(UseLocalProjectReference)' != 'true'" VersionOverride="[2.5.0-pre9]" />
<PackageReference Include="Fabulous" Condition="'$(UseLocalProjectReference)' != 'true'" VersionOverride="[2.5.0-pre11]" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
<PackageReference Include="Microsoft.Maui.Controls" VersionOverride="8.0.3" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" VersionOverride="8.0.3" />
Expand Down
2 changes: 1 addition & 1 deletion templates/content/blank/.template.config/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"type": "parameter",
"dataType": "string",
"replaces": "FabulousPkgVersion",
"defaultValue": "2.5.0-pre9"
"defaultValue": "2.5.0-pre11"
},
"FabulousMauiControlsPkgVersion": {
"type": "parameter",
Expand Down

0 comments on commit 3574dd8

Please sign in to comment.