patrick/ray-tracing-fsharp
1
0
Fork 0
mirror of https://github.com/Smaug123/ray-tracing-fsharp synced 2025-12-15 20:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump stuff

Browse Source
This commit is contained in:
Smaug123
2024-12-24 20:29:10 +00:00
parent 3f426728ad
commit 58a042c3ee
8 changed files with 53 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.config/dotnet-tools.json
View File

@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"fantomas": {
"version": "6.3.10",
"version": "6.3.15",
"commands": [
"fantomas"
]

6
RayTracing.App/Program.fs
View File

@@ -19,7 +19,7 @@ module Program =
let logFile =
pngOutput.FileSystem.Path.GetTempFileName ()
|> pngOutput.FileSystem.FileInfo.FromFileName
|> pngOutput.FileSystem.FileInfo.New
use stream = logFile.OpenWrite ()
use writer = new StreamWriter (stream)
@@ -64,8 +64,8 @@ module Program =
| [| name |] ->
SampleImages.Parse name,
fs.Path.GetTempFileName ()
|> fun i -> fs.Path.ChangeExtension (i, ".png") |> fs.FileInfo.FromFileName
| [| name ; output |] -> SampleImages.Parse name, fs.FileInfo.FromFileName output
|> fun i -> fs.Path.ChangeExtension (i, ".png") |> fs.FileInfo.New
| [| name ; output |] -> SampleImages.Parse name, fs.FileInfo.New output
| _ -> failwithf "Expected two args 'sample name' 'output file', got %+A" argv
let progress =

2
RayTracing.App/RayTracing.App.fsproj
View File

@@ -17,7 +17,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Spectre.Console" Version="0.38.1-preview.0.17" />
<PackageReference Include="Spectre.Console" Version="0.49.2-preview.0.9" />
</ItemGroup>
</Project>

10
RayTracing.Test/RayTracing.Test.fsproj
View File

@@ -19,11 +19,11 @@
<ItemGroup>
<PackageReference Include="FsCheck" Version="3.0.0-rc3" />
<PackageReference Include="FsUnit" Version="6.0.0" />
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="13.2.28" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="FsUnit" Version="7.0.0" />
<PackageReference Include="NUnit" Version="4.3.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.1.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
<ItemGroup>

2
RayTracing.Test/TestPpmOutput.fs
View File

@@ -30,7 +30,7 @@ module TestRayTracing =
|> Array.map async.Return
|> Image.make 2 3
let outputFile = fs.Path.GetTempFileName () |> fs.FileInfo.FromFileName
let outputFile = fs.Path.GetTempFileName () |> fs.FileInfo.New
let tempOutput, await = ImageOutput.toPpm ignore image fs

4
RayTracing/ImageOutput.fs
View File

@@ -1,4 +1,4 @@
namespace RayTracing
namespace RayTracing
open System
open System.IO
@@ -134,7 +134,7 @@ module ImageOutput =
(fs : IFileSystem)
: IFileInfo * Task<unit>
=
let tempFile = fs.Path.GetTempFileName () |> fs.FileInfo.FromFileName
let tempFile = fs.Path.GetTempFileName () |> fs.FileInfo.New
let task =
async {

6
RayTracing/RayTracing.fsproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
@@ -26,8 +26,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.IO.Abstractions" Version="13.2.28" />
<PackageReference Include="SkiaSharp" Version="2.88.8" />
<PackageReference Include="System.IO.Abstractions" Version="21.1.7" />
<PackageReference Include="SkiaSharp" Version="3.116.1" />
</ItemGroup>
</Project>

154
nix/deps.json
View File

@@ -1,8 +1,8 @@
[
{
"pname": "fantomas",
"version": "6.3.10",
"hash": "sha256-2m4YevDp9CRm/Ci2hguDXd6DUMElRg3hNAne9LHntWM="
"version": "6.3.15",
"hash": "sha256-Gjw7MxjUNckMWSfnOye4UTe5fZWnor6RHCls3PNsuG8="
},
{
"pname": "FsCheck",
@@ -11,103 +11,28 @@
},
{
"pname": "FsUnit",
"version": "6.0.0",
"hash": "sha256-q87WQf6MqGhzvaQ7WkkUlCdoE94DY0CD5PaXEj64A6M="
},
{
"pname": "Microsoft.AspNetCore.App.Ref",
"version": "7.0.20",
"hash": "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
"version": "7.0.20",
"hash": "sha256-ewal9R6o20GV0R02ylSijVFdWZAbdN8TK1PCc/ltHBQ="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "7.0.20",
"hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
"version": "7.0.20",
"hash": "sha256-PHBb0AuRpB8kkQvQJIJSLu5Ub/U2pYA0wMGBarUkS8o="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
"version": "7.0.20",
"hash": "sha256-+MQMRFzfG2CbNJnfw0buP4VorL2yR+T4UeEBSbKSmPY="
"version": "7.0.0",
"hash": "sha256-eoHwX2wPrmP8Wgq2v91tWJvQG+5v4iNYG5jMLPwKXNc="
},
{
"pname": "Microsoft.CodeCoverage",
"version": "17.10.0",
"hash": "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="
"version": "17.12.0",
"hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE="
},
{
"pname": "Microsoft.NET.Test.Sdk",
"version": "17.10.0",
"hash": "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-arm64",
"version": "7.0.20",
"hash": "sha256-/20dMbO1Ft0WVhl+Lv1916Thvr4kPP9LuuX4bKE+czE="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "7.0.20",
"hash": "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-arm64",
"version": "7.0.20",
"hash": "sha256-MTyRTWhDmMaCsNorju/tLb0w+ssKydDX/NBFzSfqB0Q="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-x64",
"version": "7.0.20",
"hash": "sha256-DdumMpP5QN0rPDsB8sjxACM13mT7Wbb0w3LaCe96twc="
},
{
"pname": "Microsoft.NETCore.App.Ref",
"version": "7.0.20",
"hash": "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
"version": "7.0.20",
"hash": "sha256-TemMvbNrDzJVHWwxVgnNN2CnTyI6TcvvZDpF4ts6IAw="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "7.0.20",
"hash": "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
"version": "7.0.20",
"hash": "sha256-VHmF1/ObK5hxGYvm5/+pTdketHnxxcnAGK5RaTQpVqE="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-x64",
"version": "7.0.20",
"hash": "sha256-yktNSySitxWbO6LjcxUuewWFMF2EbcoM2w18CqxmVlc="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "5.0.0",
"hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
"version": "17.12.0",
"hash": "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
"version": "17.10.0",
"hash": "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="
"version": "17.12.0",
"hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w="
},
{
"pname": "Microsoft.TestPlatform.TestHost",
"version": "17.10.0",
"hash": "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="
"version": "17.12.0",
"hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I="
},
{
"pname": "Newtonsoft.Json",
@@ -116,48 +41,43 @@
},
{
"pname": "NUnit",
"version": "4.1.0",
"hash": "sha256-srzj0lf2ReKw41TnigZwf8rqKKNzGRRVrgN3hR/vRjo="
"version": "4.3.1",
"hash": "sha256-7XWgjdgEll4gDLa4p9LpizH+bJzFMIvkQ/olpAXJvCE="
},
{
"pname": "NUnit3TestAdapter",
"version": "4.5.0",
"hash": "sha256-ER3ogl0L5FYyc6pVVPY1ch+AQxG/WgFcnWECnYQJPes="
"version": "4.6.0",
"hash": "sha256-9Yav2fYhC4w0OgsyUwU4/5rDy4FVDTpKnWHuwl/uKJQ="
},
{
"pname": "SkiaSharp",
"version": "2.88.8",
"hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
"version": "3.116.1",
"hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "2.88.8",
"hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
"version": "3.116.1",
"hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "2.88.8",
"hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
"version": "3.116.1",
"hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4="
},
{
"pname": "Spectre.Console",
"version": "0.38.1-preview.0.17",
"hash": "sha256-vAeuOqv8qqBT4nYnOgvazYP1lA/T4tQaDPr4PG4D2Uk="
"version": "0.49.2-preview.0.9",
"hash": "sha256-rPi6HEAwVlr7CAv/Nf+O6ke3r+4AmvpNvv5zhhxIEdA="
},
{
"pname": "System.IO.Abstractions",
"version": "13.2.28",
"hash": "sha256-RLQAwF1ic6nr4TAfqdvYxpW7aT2uQJxijLMjxP3dksk="
"version": "21.1.7",
"hash": "sha256-f5VSR/MlQ/uXfQvj1533qV6nrlIeaoCmSC1VHfMTOGk="
},
{
"pname": "System.IO.Abstractions.TestingHelpers",
"version": "13.2.28",
"hash": "sha256-NyaRsWxU1zkn7mC8HaOJUBjGpnqua5hqtidbsftRtxQ="
},
{
"pname": "System.IO.FileSystem.AccessControl",
"version": "5.0.0",
"hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc="
"version": "21.1.7",
"hash": "sha256-0va3hVh1qaKtgvtUHq0PSkq2BgAdeJndVA5i8k7jq+A="
},
{
"pname": "System.Reflection.Metadata",
@@ -165,18 +85,18 @@
"hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
},
{
"pname": "System.Security.AccessControl",
"version": "5.0.0",
"hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
"pname": "TestableIO.System.IO.Abstractions",
"version": "21.1.7",
"hash": "sha256-EX5bkC9IW045vCdnl9UjjwyUtL99P8jTqkdXYEs0czI="
},
{
"pname": "System.Security.Principal.Windows",
"version": "5.0.0",
"hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
"pname": "TestableIO.System.IO.Abstractions.TestingHelpers",
"version": "21.1.7",
"hash": "sha256-68506JkB2MtKp3heaSrIocp/t+6EDZdXFSdsq+IA+es="
},
{
"pname": "Wcwidth",
"version": "0.2.0",
"hash": "sha256-GgRJ+dAyCS5PfZvnACQ50rM+EnMvUW/LJhSnHnVU/1w="
"pname": "TestableIO.System.IO.Abstractions.Wrappers",
"version": "21.1.7",
"hash": "sha256-sYF7wt6vTed2B62BJzzHw+7ySyDplFD+cTJjL5MlLig="
}
]