Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update packages and frameworks #488

Merged
merged 3 commits into from
Jul 12, 2022
Merged

Update packages and frameworks #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d1afe7
Update frameworks to net6 and net480
TysonMN Jul 12, 2022
930f415
Simplify .NET SDK installations
marner2 Jun 22, 2022
9734ebd
Update all nuget packages to latest and consolidate
TysonMN Jul 12, 2022
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
11 changes: 4 additions & 7 deletions .github/workflows/continuous_integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,12 @@ jobs:

- uses: actions/checkout@v2

- name: Install .NET SDK 3.1.x
- name: Install .NET SDKs
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x

- name: Install .NET SDK 5.0.103
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.103
dotnet-version: |
3.1.x
6.0.x

- name: Restore
run: dotnet restore src/Elmish.WPF.sln
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,12 @@ jobs:

- uses: actions/checkout@v2

- name: Install .NET SDK 3.1.x
- name: Install .NET SDKs
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x

- name: Install .NET SDK 5.0.103
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.103
dotnet-version: |
3.1.x
6.0.x

- name: Restore
run: dotnet restore src/Elmish.WPF.sln
Expand Down
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
* Improved caching effect to not invalidating the cache too early (an issue introduced in version `3.5.3 `via PR 181)
* Renamed `Binding.SetMsgWithModel` to `Binding.setMsgWithModel` (breaking public API added in `4.0.0-beta-42`)
* Fixed bug with `mapMsgWithModel` and `setMsgWithModel` where the original model was sometimes given (an issue introduced in `4.0.0-beta-42`)
* Replaced framework targets `net461` and `net5.0-windows` with `net480` and `net6.0-windows` respectively.
* Updated minimum `FSharp.Core` version to `6.0.5`.
* Updated minimum `Microsoft.Extensions.Logging.Abstractions` version to `6.0.1`.

#### 4.0.0-beta-43
* Added `WpfProgram.withElmishErrorHandler`
Expand Down
14 changes: 7 additions & 7 deletions src/Elmish.WPF.Tests/Elmish.WPF.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net461</TargetFrameworks>
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net480</TargetFrameworks>
<UseWpf>true</UseWpf>
<!--Turn on warnings for unused values (arguments and let bindings) -->
<OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
Expand All @@ -22,13 +22,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Interop.Dynamic" Version="5.0.0.250" />
<PackageReference Include="Hedgehog" Version="0.10.0" />
<PackageReference Include="Hedgehog.Experimental" Version="0.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="Unquote" Version="5.0.0" />
<PackageReference Include="FSharp.Interop.Dynamic" Version="5.0.1.268" />
<PackageReference Include="Hedgehog" Version="0.12.1" />
<PackageReference Include="Hedgehog.Experimental" Version="0.6.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="Unquote" Version="6.1.0" />
<PackageReference Include="xunit.core" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
12 changes: 6 additions & 6 deletions src/Elmish.WPF.Tests/MergeTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ let ``starting with random items, when merging after a move, should contain the
let! list = GenX.auto<Guid list>
let! movedItem = Gen.guid
let! additionalItem = Gen.guid
let! i1 = (0, list.Length + 1) ||> Range.constant |> Gen.int
let! i2 = (0, list.Length + 1) ||> Range.constant |> Gen.int |> GenX.notEqualTo i1
let! i1 = (0, list.Length + 1) ||> Range.constant |> Gen.int32
let! i2 = (0, list.Length + 1) ||> Range.constant |> Gen.int32 |> GenX.notEqualTo i1

let list = additionalItem :: list
let list1 = list |> List.insert i1 movedItem
Expand All @@ -143,7 +143,7 @@ let ``starting with random items, when merging after a replacement, should conta
let! list1Head = Gen.guid
let! list1Tail = GenX.auto<Guid list>
let! list2Replacement = Gen.guid
let! replcementIndex = (0, list1Tail.Length) ||> Range.constant |> Gen.int
let! replcementIndex = (0, list1Tail.Length) ||> Range.constant |> Gen.int32

let list1 = list1Head :: list1Tail
let observableCollection = ObservableCollection<_> list1
Expand All @@ -165,7 +165,7 @@ let ``starting with random items, when merging after a replacement, should conta
let ``starting with random items, when merging after swapping two adjacent items, should contain the merged items and never call create and call update exactly once for each item`` () =
Property.check <| property {
let! list1 = Gen.guid |> Gen.list (Range.constant 2 50)
let! firstSwapIndex = (0, list1.Length - 2) ||> Range.constant |> Gen.int
let! firstSwapIndex = (0, list1.Length - 2) ||> Range.constant |> Gen.int32

let observableCollection = ObservableCollection<_> list1
let array2 =
Expand All @@ -186,8 +186,8 @@ let ``starting with random items, when merging after swapping two adjacent items
let ``starting with random items, when merging after swapping two items, should contain the merged items and never call create and call update exactly once for each item`` () =
Property.check <| property {
let! list1 = Gen.guid |> Gen.list (Range.constant 2 50)
let! i = (0, list1.Length - 1) ||> Range.constant |> Gen.int
let! j = (0, list1.Length - 1) ||> Range.constant |> Gen.int |> GenX.notEqualTo i
let! i = (0, list1.Length - 1) ||> Range.constant |> Gen.int32
let! j = (0, list1.Length - 1) ||> Range.constant |> Gen.int32 |> GenX.notEqualTo i

let observableCollection = ObservableCollection<_> list1
let array2 =
Expand Down
6 changes: 3 additions & 3 deletions src/Elmish.WPF/Elmish.WPF.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net461</TargetFrameworks>
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net480</TargetFrameworks>
<UseWpf>true</UseWpf>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down Expand Up @@ -52,11 +52,11 @@

<ItemGroup>
<PackageReference Include="Elmish" Version="[3.1.0, 3.99]" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.6, 99]" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[6.0.1, 99]" />
TysonMN marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="[4.6.2, 99]" />
<PackageReference Update="FSharp.Core" Version="[6.0.5, 99]" />
TysonMN marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did we have to make this change? It is causing a problem described in #509.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We were using some of the newer features in some of the code, but I'm sure there are workarounds. I don't remember specifics though.

</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/Samples/Capabilities.Core/Capabilities.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -15,9 +15,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Samples/Capabilities/Capabilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<OutputType>Exe</OutputType>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.3" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Samples/EventBindingsAndBehaviors.Core/EventBindingsAndBehaviors.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Samples/EventBindingsAndBehaviors/EventBindingsAndBehaviors.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<UseWpf>true</UseWpf>
<OutputType>Exe</OutputType>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.3" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Samples/FileDialogs.Core/FileDialogs.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Samples/FileDialogs/FileDialogs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<UseWpf>true</UseWpf>
<OutputType>Exe</OutputType>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
Expand Down
8 changes: 4 additions & 4 deletions src/Samples/FileDialogsCmdMsg.Core/FileDialogsCmdMsg.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Samples/FileDialogsCmdMsg/FileDialogsCmdMsg.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<UseWpf>true</UseWpf>
<OutputType>Exe</OutputType>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
Expand Down
8 changes: 4 additions & 4 deletions src/Samples/Multiselect.Core/Multiselect.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Samples/Multiselect/Multiselect.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<UseWpf>true</UseWpf>
<OutputType>Exe</OutputType>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
Expand Down
8 changes: 4 additions & 4 deletions src/Samples/NewWindow.Core/NewWindow.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -17,9 +17,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Samples/NewWindow/NewWindow.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<UseWpf>true</UseWpf>
<OutputType>Exe</OutputType>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.3" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Samples/OneWaySeq.Core/OneWaySeq.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Samples/OneWaySeq/OneWaySeq.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<UseWpf>true</UseWpf>
<OutputType>Exe</OutputType>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
Expand Down
Loading