From: Greg Burri Date: Tue, 10 Dec 2024 23:26:53 +0000 (+0100) Subject: Update to .NET 9 X-Git-Url: https://git.euphorik.ch/?a=commitdiff_plain;h=e821eb092ba4b471f3714653e6a6ec13e7f165be;p=advent_of_code_2017.git Update to .NET 9 --- diff --git a/.gitignore b/.gitignore index 4a6c7e8..8d7dc34 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ obj/ packages/ .vs *.exe -*.suo \ No newline at end of file +*.suo +AdventOfCode2017/Data/day* \ No newline at end of file diff --git a/AdventOfCode2017/AdventOfCode2017.fsproj b/AdventOfCode2017/AdventOfCode2017.fsproj index 852dc74..8f287f5 100644 --- a/AdventOfCode2017/AdventOfCode2017.fsproj +++ b/AdventOfCode2017/AdventOfCode2017.fsproj @@ -1,60 +1,8 @@ - - - + - Debug - AnyCPU - 2.0 - d3555943-8102-43d1-b3cb-570a4e4ec513 Exe - AdventOfCode2017 - AdventOfCode2017 - v4.6.2 - true - 4.4.1.0 - AdventOfCode2017 + net9.0 - - true - full - false - false - bin\$(Configuration)\ - DEBUG;TRACE - 3 - AnyCPU - bin\$(Configuration)\$(AssemblyName).XML - true - 25 - - - pdbonly - true - true - bin\$(Configuration)\ - TRACE - 3 - AnyCPU - bin\$(Configuration)\$(AssemblyName).XML - true - 25 - - - 11 - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - @@ -85,7 +33,6 @@ - PreserveNewest @@ -161,26 +108,8 @@ PreserveNewest - - - ..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll - - - - - - - ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - True - + - \ No newline at end of file diff --git a/AdventOfCode2017/App.config b/AdventOfCode2017/App.config deleted file mode 100644 index b50c74f..0000000 --- a/AdventOfCode2017/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/AdventOfCode2017/Data/put_your_data_files_here.txt b/AdventOfCode2017/Data/put_your_data_files_here.txt new file mode 100644 index 0000000..52a6950 --- /dev/null +++ b/AdventOfCode2017/Data/put_your_data_files_here.txt @@ -0,0 +1 @@ +Filename: "dayXX.input" \ No newline at end of file diff --git a/AdventOfCode2017/Day22.fs b/AdventOfCode2017/Day22.fs index 532c465..bc7ddbf 100644 --- a/AdventOfCode2017/Day22.fs +++ b/AdventOfCode2017/Day22.fs @@ -25,7 +25,7 @@ let infection (rule : CellState -> CellState * ((int * int) -> (int * int))) (nb let nextState, f = match m.TryGetValue ((x, y)) with true, state -> rule state | _ -> rule Clean let dx, dy = f d if nextState = Clean then - m.Remove (x, y) |> ignore + m.Remove ((x, y)) |> ignore else m.[(x, y)] <- nextState burst (x + dx, y + dy) (dx, dy) (n - 1) (if nextState = Infected then becomeInfected + 1 else becomeInfected) diff --git a/AdventOfCode2017/packages.config b/AdventOfCode2017/packages.config deleted file mode 100644 index 42fe79c..0000000 --- a/AdventOfCode2017/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Tests/App.config b/Tests/App.config deleted file mode 100644 index 7b47f78..0000000 --- a/Tests/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Tests/Tests.fsproj b/Tests/Tests.fsproj index 16f4250..7156be3 100644 --- a/Tests/Tests.fsproj +++ b/Tests/Tests.fsproj @@ -1,58 +1,8 @@ - - - - - + - Debug - AnyCPU - 2.0 - 238bffbe-e2d4-4dc4-804c-6e43205e4701 - Library - Tests - Tests - v4.6.2 - 4.4.1.0 - true - Tests - - + net9.0 + false - - true - full - false - false - bin\$(Configuration)\ - DEBUG;TRACE - 3 - bin\$(Configuration)\$(AssemblyName).XML - - - pdbonly - true - true - bin\$(Configuration)\ - TRACE - 3 - bin\$(Configuration)\$(AssemblyName).XML - - - 11 - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - @@ -79,56 +29,20 @@ - - - - ..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll - - - - - - - ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - True - - - AdventOfCode2017 - {d3555943-8102-43d1-b3cb-570a4e4ec513} - True - - - ..\packages\Unquote.4.0.0\lib\net45\Unquote.dll - - - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - - - ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll - - - ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll - - - ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/Tests/packages.config b/Tests/packages.config deleted file mode 100644 index 41b642a..0000000 --- a/Tests/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file