Skip to content

Commit

Permalink
Merge branch '1.x' into backport/backport-230-to-1.x
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
  • Loading branch information
Xtansia committed Jul 5, 2023
2 parents ea50422 + d51899c commit f0f0707
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bumps `Microsoft.CSharp` from 4.6.0 to 4.7.0
- Bumps `FSharp.Data` from 5.0.2 to 6.2.0
- Bumps `BenchMarkDotNet` from 0.13.4 to 0.13.5
- Bumps `FSharp.Core` from 6.0.7 to 7.0.300
- Bumps `Fake.IO.FileSystem` from 5.23.1 to 6.0.0
- Bumps `Microsoft.SourceLink.GitHub` from 1.0.0 to 1.1.1
- Bumps `System.Diagnostics.DiagnosticSource` from 6.0.0 to 6.0.1
Expand Down
2 changes: 1 addition & 1 deletion tests/Tests.YamlRunner/Tests.YamlRunner.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="6.0.7" />
<PackageReference Update="FSharp.Core" Version="7.0.300" />

<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="FSharp.Data" Version="6.2.0" />
Expand Down
6 changes: 3 additions & 3 deletions tests/Tests.YamlRunner/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"FSharp.Core": {
"type": "Direct",
"requested": "[6.0.7, )",
"resolved": "6.0.7",
"contentHash": "e6wGrq5smV3Yk2fBE/Y0nBG5oFyF59k5Je0a0QDydUpg6liyaafGjD3xvutciKepCP2knspZ/sWViC/F1OyyQQ=="
"requested": "[7.0.300, )",
"resolved": "7.0.300",
"contentHash": "8vvItREJ1l5lcp3vBCSJ1mFevVAhR48I34DuF/EoUa7o1KlFpQpagyuZkVYMAsHPIjdp47ZxM9sI4eqeXaeWkA=="
},
"FSharp.Data": {
"type": "Direct",
Expand Down
2 changes: 1 addition & 1 deletion tests/Tests/Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
Expand Down

0 comments on commit f0f0707

Please sign in to comment.