diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4cd87cb8..ee73f60f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: - dotnet-version: [ '8.x' ] + dotnet-version: [ '10.x' ] target: - dotnet: win-x64 os: windows-2025 @@ -27,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup dotnet ${{ matrix.dotnet-version }} - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ matrix.dotnet-version }} - name: Build ${{ matrix.target.dotnet }} diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..14fb7de6 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,35 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NuGet.Config b/NuGet.Config index f1bcb464..fb4a44cb 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,8 +1,17 @@  + - + + + + + + + + + diff --git a/codehelp/CodeHelpers.Test/CodeHelpers.Test.csproj b/codehelp/CodeHelpers.Test/CodeHelpers.Test.csproj index 77cf2a53..ac43772a 100644 --- a/codehelp/CodeHelpers.Test/CodeHelpers.Test.csproj +++ b/codehelp/CodeHelpers.Test/CodeHelpers.Test.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable @@ -10,23 +10,21 @@ - - - - - - - - - - + + + + + + + + + + - - - - - + + + diff --git a/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorFixerTest.cs b/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorFixerTest.cs index 0c63588d..36601f35 100644 --- a/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorFixerTest.cs +++ b/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorFixerTest.cs @@ -40,7 +40,7 @@ public partial class MyNewClass AdditionalReferences = { typeof(LogAttribute).Assembly }, - ReferenceAssemblies = ReferenceAssemblies.Net.Net80, + ReferenceAssemblies = ReferenceAssemblies.Net.Net100, Sources = { testString, }, diff --git a/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTest.cs b/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTest.cs index 354d0674..bd7527fd 100644 --- a/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTest.cs +++ b/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTest.cs @@ -48,7 +48,7 @@ public void UpdateStereologue(string path, global::Stereologue.Stereologuer logg AdditionalReferences = { typeof(LogAttribute).Assembly }, - ReferenceAssemblies = ReferenceAssemblies.Net.Net80, + ReferenceAssemblies = ReferenceAssemblies.Net.Net100, Sources = { testString, }, diff --git a/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTestVb.cs b/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTestVb.cs index 70c39b8c..66c2c664 100644 --- a/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTestVb.cs +++ b/codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTestVb.cs @@ -48,7 +48,7 @@ End Class AdditionalReferences = { typeof(LogAttribute).Assembly }, - ReferenceAssemblies = ReferenceAssemblies.Net.Net80, + ReferenceAssemblies = ReferenceAssemblies.Net.Net100, Sources = { testString, }, diff --git a/codehelp/CodeHelpers/StatusCheckGenerator/MethodModel.cs b/codehelp/CodeHelpers/StatusCheckGenerator/MethodModel.cs index 97abf27d..66ccf1cf 100644 --- a/codehelp/CodeHelpers/StatusCheckGenerator/MethodModel.cs +++ b/codehelp/CodeHelpers/StatusCheckGenerator/MethodModel.cs @@ -210,11 +210,15 @@ internal static class MethodModelExtensions { if (named.Key == "StatusCheckMethod") { - if (!named.Value.IsNull) + if (!named.Value.IsNull && named.Value.Value is not null) { - statusCheckMethod = SymbolDisplay.FormatPrimitive(named.Value.Value!, false, false); - found = true; - break; + var formattedStatusCheckMethod = SymbolDisplay.FormatPrimitive(named.Value.Value, false, false); + if (formattedStatusCheckMethod is not null) + { + statusCheckMethod = formattedStatusCheckMethod; + found = true; + break; + } } } } diff --git a/codehelp/CodeHelpers/WPILib.CodeHelpers.csproj b/codehelp/CodeHelpers/WPILib.CodeHelpers.csproj index 27f5f443..9ca8e8ae 100644 --- a/codehelp/CodeHelpers/WPILib.CodeHelpers.csproj +++ b/codehelp/CodeHelpers/WPILib.CodeHelpers.csproj @@ -8,8 +8,9 @@ 12.0 true $(SolutionDir)nupkg - true - true + true + $(NoWarn);RS1038 + true true @@ -20,16 +21,16 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/dev/Directory.Build.props b/dev/Directory.Build.props index f8db5b60..76666c2a 100644 --- a/dev/Directory.Build.props +++ b/dev/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net10.0 false enable Exe diff --git a/dev/vbTest/vbTest.vbproj b/dev/vbTest/vbTest.vbproj index d9134763..ca00bab2 100644 --- a/dev/vbTest/vbTest.vbproj +++ b/dev/vbTest/vbTest.vbproj @@ -3,7 +3,7 @@ Exe vbTest - net8.0 + net10.0 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0adeba98..e1e49092 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net10.0 true 2025.3.2-114-g3681121 true @@ -15,12 +15,12 @@ true Recommended true - 8.0 + 10.0 true - + diff --git a/src/cscore/cscore.csproj b/src/cscore/cscore.csproj index 54b53081..734a2d95 100644 --- a/src/cscore/cscore.csproj +++ b/src/cscore/cscore.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/datalog/datalog.csproj b/src/datalog/datalog.csproj index f57b51ab..f1b431f4 100644 --- a/src/datalog/datalog.csproj +++ b/src/datalog/datalog.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/hal/hal.csproj b/src/hal/hal.csproj index e9b6845b..6e32cf37 100644 --- a/src/hal/hal.csproj +++ b/src/hal/hal.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/ntcore/ntcore.csproj b/src/ntcore/ntcore.csproj index 9488da41..e5c30aa0 100644 --- a/src/ntcore/ntcore.csproj +++ b/src/ntcore/ntcore.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/wpimath/wpimath.csproj b/src/wpimath/wpimath.csproj index b34cf2d2..39c02f86 100644 --- a/src/wpimath/wpimath.csproj +++ b/src/wpimath/wpimath.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/wpinet/wpinet.csproj b/src/wpinet/wpinet.csproj index 1975bd17..3f95a9bd 100644 --- a/src/wpinet/wpinet.csproj +++ b/src/wpinet/wpinet.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/wpiutil/wpiutil.csproj b/src/wpiutil/wpiutil.csproj index b8e5a26d..5a144a99 100644 --- a/src/wpiutil/wpiutil.csproj +++ b/src/wpiutil/wpiutil.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 9afda8b0..59b9d3a9 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net10.0 enable enable true @@ -10,25 +10,25 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/wpilibsharp.test/wpilibsharp.test.csproj b/test/wpilibsharp.test/wpilibsharp.test.csproj index 23434082..cc7f8368 100644 --- a/test/wpilibsharp.test/wpilibsharp.test.csproj +++ b/test/wpilibsharp.test/wpilibsharp.test.csproj @@ -1,7 +1,7 @@ - +