diff --git a/.vscode/launch.json b/.vscode/launch.json index eced15a9f..5d872271f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/src/AdventOfCode.Site/bin/Debug/net9.0/AdventOfCode.Site.dll", + "program": "${workspaceFolder}/src/AdventOfCode.Site/bin/Debug/net10.0/AdventOfCode.Site.dll", "args": [], "cwd": "${workspaceFolder}/src/AdventOfCode.Site", "stopAtEntry": false, diff --git a/.vsconfig b/.vsconfig index 91470691c..0a6b8e2cd 100644 --- a/.vsconfig +++ b/.vsconfig @@ -3,7 +3,7 @@ "components": [ "Microsoft.VisualStudio.Component.CoreEditor", "Microsoft.VisualStudio.Workload.CoreEditor", - "Microsoft.NetCore.Component.Runtime.9.0", + "Microsoft.NetCore.Component.Runtime.10.0", "Microsoft.NetCore.Component.SDK", "Microsoft.VisualStudio.Component.Roslyn.Compiler", "Microsoft.VisualStudio.Component.Roslyn.LanguageServices", diff --git a/Directory.Packages.props b/Directory.Packages.props index 2e12cbc6e..58d2ac853 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,16 +7,16 @@ - + - - - + + + - + diff --git a/NuGet.config b/NuGet.config index 38ac8e75e..ec403bfe2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,9 +2,14 @@ + + + + + diff --git a/crank.yml b/crank.yml index 461807733..80e352ce6 100644 --- a/crank.yml +++ b/crank.yml @@ -26,14 +26,14 @@ jobs: scenarios: microbenchmarks: application: - framework: net9.0 + framework: net10.0 job: microbenchmarks root: application: - framework: net9.0 + framework: net10.0 job: server load: - framework: net9.0 + framework: net10.0 job: bombardier variables: serverPort: 5000 diff --git a/global.json b/global.json index d06f4d4f5..1d9235573 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.300", + "version": "10.0.100-preview.4.25258.110", "allowPrerelease": false, "rollForward": "latestMajor", "paths": [ ".dotnet", "$host$" ], diff --git a/src/AdventOfCode.Console/AdventOfCode.Console.csproj b/src/AdventOfCode.Console/AdventOfCode.Console.csproj index d64a38915..addbf3b8b 100644 --- a/src/AdventOfCode.Console/AdventOfCode.Console.csproj +++ b/src/AdventOfCode.Console/AdventOfCode.Console.csproj @@ -5,7 +5,7 @@ Speed Exe MartinCostello.AdventOfCode.Console - net9.0 + net10.0 diff --git a/src/AdventOfCode.Resources/AdventOfCode.Resources.csproj b/src/AdventOfCode.Resources/AdventOfCode.Resources.csproj index dc0b8306c..25054ae56 100644 --- a/src/AdventOfCode.Resources/AdventOfCode.Resources.csproj +++ b/src/AdventOfCode.Resources/AdventOfCode.Resources.csproj @@ -4,7 +4,7 @@ true Library MartinCostello.AdventOfCode - net9.0 + net10.0 diff --git a/src/AdventOfCode.Site/AdventOfCode.Site.csproj b/src/AdventOfCode.Site/AdventOfCode.Site.csproj index f7408337a..e0cf89286 100644 --- a/src/AdventOfCode.Site/AdventOfCode.Site.csproj +++ b/src/AdventOfCode.Site/AdventOfCode.Site.csproj @@ -11,7 +11,7 @@ Exe true MartinCostello.AdventOfCode.Site - net9.0 + net10.0 true latest @@ -25,7 +25,7 @@ - + @@ -60,4 +60,12 @@ + + + + + + diff --git a/src/AdventOfCode.Site/aws-lambda-tools-defaults.json b/src/AdventOfCode.Site/aws-lambda-tools-defaults.json index 373effeb9..7666bff48 100644 --- a/src/AdventOfCode.Site/aws-lambda-tools-defaults.json +++ b/src/AdventOfCode.Site/aws-lambda-tools-defaults.json @@ -2,7 +2,7 @@ "region": "eu-west-2", "profile": "", "configuration": "Release", - "framework": "net9.0", + "framework": "net10.0", "function-architecture": "arm64", "function-description": "The Advent of Code as a Service function.", "function-handler": "AdventOfCode.Site", diff --git a/src/AdventOfCode/AdventOfCode.csproj b/src/AdventOfCode/AdventOfCode.csproj index 8df6e38b0..14b9e5ea4 100644 --- a/src/AdventOfCode/AdventOfCode.csproj +++ b/src/AdventOfCode/AdventOfCode.csproj @@ -6,7 +6,7 @@ $(NoWarn);CA1034;CA2007;CA2225;CA5351 Library MartinCostello.AdventOfCode - net9.0 + net10.0 diff --git a/src/AdventOfCode/Puzzles/Y2020/Day22.cs b/src/AdventOfCode/Puzzles/Y2020/Day22.cs index 6d9473389..3016604a8 100644 --- a/src/AdventOfCode/Puzzles/Y2020/Day22.cs +++ b/src/AdventOfCode/Puzzles/Y2020/Day22.cs @@ -42,10 +42,7 @@ public static int PlayCombat(IList startingDeck, bool recursive) .TakeWhile((p) => !string.IsNullOrEmpty(p)) .Select(Parse); -#pragma warning disable IDE0306 - // HACK https://github.com/dotnet/roslyn/issues/77177 return Play(new(deck1), new(deck2), recursive); -#pragma warning restore IDE0306 static int Play(Queue deck1, Queue deck2, bool recursive) { diff --git a/src/AdventOfCode/Puzzles/Y2022/Day11.cs b/src/AdventOfCode/Puzzles/Y2022/Day11.cs index d7e353b9e..0bf94fcdb 100644 --- a/src/AdventOfCode/Puzzles/Y2022/Day11.cs +++ b/src/AdventOfCode/Puzzles/Y2022/Day11.cs @@ -158,10 +158,7 @@ private sealed class Monkey(int number, IEnumerable items) { public int Inspections { get; private set; } -#pragma warning disable IDE0306 - // HACK https://github.com/dotnet/roslyn/issues/77177 public Queue Items { get; } = new(items); -#pragma warning restore IDE0306 public Func Next { get; set; } = default!; diff --git a/startvscode.cmd b/startvscode.cmd index 70dbdc278..91142b503 100644 --- a/startvscode.cmd +++ b/startvscode.cmd @@ -11,7 +11,7 @@ SET DOTNET_ROOT(x86)=%~dp0.dotnet\x86 SET PATH=%DOTNET_ROOT%;%PATH% :: Sets the Target Framework for Visual Studio Code. -SET TARGET=net6.0 +SET TARGET=net10.0 SET FOLDER=%~1 diff --git a/tests/AdventOfCode.Benchmarks/AdventOfCode.Benchmarks.csproj b/tests/AdventOfCode.Benchmarks/AdventOfCode.Benchmarks.csproj index e50d990b3..a7e920da4 100644 --- a/tests/AdventOfCode.Benchmarks/AdventOfCode.Benchmarks.csproj +++ b/tests/AdventOfCode.Benchmarks/AdventOfCode.Benchmarks.csproj @@ -5,7 +5,7 @@ $(NoWarn);CA1034;CA1056;CA1819;CA2007;SA1600 Exe MartinCostello.AdventOfCode.Benchmarks - net9.0 + net10.0 diff --git a/tests/AdventOfCode.Tests/AdventOfCode.Tests.csproj b/tests/AdventOfCode.Tests/AdventOfCode.Tests.csproj index 5418767c8..7190a2cbd 100644 --- a/tests/AdventOfCode.Tests/AdventOfCode.Tests.csproj +++ b/tests/AdventOfCode.Tests/AdventOfCode.Tests.csproj @@ -4,7 +4,7 @@ $(NoWarn);xUnit1004 Exe MartinCostello.AdventOfCode - net9.0 + net10.0 true @@ -20,10 +20,19 @@ + + + + + + +