Skip to content

Commit 55d360f

Browse files
committed
fix rebase conflicts, update to DynObj v4.0.3, remove Directory.Build.props
1 parent d5d5201 commit 55d360f

41 files changed

Lines changed: 105 additions & 4043 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ARCtrl.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
.github\workflows\build-test.yml = .github\workflows\build-test.yml
1111
build.cmd = build.cmd
1212
build.sh = build.sh
13-
Directory.Build.props = Directory.Build.props
1413
Directory.Packages.props = Directory.Packages.props
1514
.config\dotnet-tools.json = .config\dotnet-tools.json
1615
global.json = global.json

Directory.Build.props

Lines changed: 0 additions & 20 deletions
This file was deleted.

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageVersion Include="Thoth.Json.Newtonsoft" Version="0.2.0" />
1313
<PackageVersion Include="FsSpreadsheet" Version="6.3.0-alpha.4" />
1414
<PackageVersion Include="YAMLicious" Version="0.0.1" />
15-
<PackageVersion Include="DynamicObj" Version="4.0.0" />
15+
<PackageVersion Include="DynamicObj" Version="4.0.3" />
1616
<PackageVersion Include="Fable.SimpleHttp" Version="3.5.0" />
1717
<PackageVersion Include="Fable.Fetch" Version="2.6.0" />
1818
<PackageVersion Include="Fable.Node" Version="1.2.0" />

src/ARCtrl/packages.lock.json

Lines changed: 0 additions & 165 deletions
This file was deleted.

src/CWL/packages.lock.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/Contract/packages.lock.json

Lines changed: 0 additions & 134 deletions
This file was deleted.

0 commit comments

Comments
 (0)