Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

strategy:
matrix:
dotnet-version: [ '8.x' ]
dotnet-version: [ '10.x' ]
target:
- dotnet: win-x64
os: windows-2025
Expand All @@ -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 }}
Expand Down
35 changes: 35 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.4.2" />
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.4.2" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="2.0.2" />
<PackageVersion Include="FRC.CsCore.runtime" Version="$(Version)" />
<PackageVersion Include="FRC.DataLog.runtime" Version="$(Version)" />
<PackageVersion Include="FRC.NetworkTables.runtime" Version="$(Version)" />
<PackageVersion Include="FRC.WPIHal.runtime" Version="$(Version)" />
<PackageVersion Include="FRC.WPINet.runtime" Version="$(Version)" />
<PackageVersion Include="FRC.WPIUtil.runtime" Version="$(Version)" />
<PackageVersion Include="Google.Protobuf" Version="3.35.0" />
<PackageVersion Include="MathNet.Numerics" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageVersion Include="Moq" Version="4.16.0" />
<PackageVersion Include="PolySharp" Version="1.16.0" />
<PackageVersion Include="System.Numerics.Tensors" Version="10.0.8" />
<PackageVersion Include="UnitsNet" Version="5.75.0" />
<PackageVersion Include="UnitsNet.NumberExtensions" Version="5.75.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
</Project>
11 changes: 10 additions & 1 deletion NuGet.Config
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="Package source 1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="WPILib" value="https://wpilib.jfrog.io/artifactory/api/nuget/wpilib-nuget-development-local/" />
</packageSources>

<packageSourceMapping>
<packageSource key="WPILib">
<package pattern="FRC.*" />
</packageSource>
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
30 changes: 14 additions & 16 deletions codehelp/CodeHelpers.Test/CodeHelpers.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -10,23 +10,21 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" Version="1.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing" Version="1.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing" Version="1.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageReference Include="coverlet.collector" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<ProjectReference Include="..\CodeHelpers\WPILib.CodeHelpers.csproj" />
<ProjectReference Include="..\..\src\stereologue\stereologue.csproj" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
</ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" />
<PackageReference Include="Microsoft.CodeAnalysis" />
</ItemGroup>

<ItemGroup>
<Using Include="Xunit" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public partial class MyNewClass
AdditionalReferences = {
typeof(LogAttribute).Assembly
},
ReferenceAssemblies = ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferenceAssemblies.Net.Net100,
Sources = {
testString,
},
Expand Down
2 changes: 1 addition & 1 deletion codehelp/CodeHelpers.Test/LogGenerator/LogGeneratorTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ End Class
AdditionalReferences = {
typeof(LogAttribute).Assembly
},
ReferenceAssemblies = ReferenceAssemblies.Net.Net80,
ReferenceAssemblies = ReferenceAssemblies.Net.Net100,
Sources = {
testString,
},
Expand Down
12 changes: 8 additions & 4 deletions codehelp/CodeHelpers/StatusCheckGenerator/MethodModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
}
Expand Down
13 changes: 7 additions & 6 deletions codehelp/CodeHelpers/WPILib.CodeHelpers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
<LangVersion>12.0</LangVersion>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<PackageOutputPath>$(SolutionDir)nupkg</PackageOutputPath>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);RS1038</NoWarn>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

Expand All @@ -20,16 +21,16 @@

<ItemGroup>
<!-- Include enums used in attributes -->
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" PrivateAssets="all" />
<PackageReference Include="PolySharp" Version="1.14.1">
<PackageReference Include="Microsoft.CodeAnalysis.Common" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis" PrivateAssets="all" />
<PackageReference Include="PolySharp">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25" PrivateAssets="All" />
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
</ItemGroup>

<!-- This ensures the library will be packaged as a source generator when we use `dotnet pack` -->
Expand Down
2 changes: 1 addition & 1 deletion dev/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion dev/vbTest/vbTest.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>vbTest</RootNamespace>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

</Project>
6 changes: 3 additions & 3 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>true</IsPackable>
<Version>2025.3.2-114-g3681121</Version>
<IsAotCompatible>true</IsAotCompatible>
Expand All @@ -15,12 +15,12 @@
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<AnalysisMode>Recommended</AnalysisMode>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AnalysisLevel>8.0</AnalysisLevel>
<AnalysisLevel>10.0</AnalysisLevel>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25" PrivateAssets="All"/>
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All"/>
<ProjectReference Include="..\..\codehelp\CodeHelpers\WPILib.CodeHelpers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/cscore/cscore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FRC.CsCore.runtime" Version="$(Version)" />
<PackageReference Include="FRC.CsCore.runtime" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/datalog/datalog.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FRC.DataLog.runtime" Version="$(Version)" />
<PackageReference Include="FRC.DataLog.runtime" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/hal/hal.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FRC.WPIHal.runtime" Version="$(Version)" />
<PackageReference Include="FRC.WPIHal.runtime" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/ntcore/ntcore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FRC.NetworkTables.runtime" Version="$(Version)" />
<PackageReference Include="FRC.NetworkTables.runtime" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/wpimath/wpimath.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
<PackageReference Include="System.Numerics.Tensors" Version="8.0.0" />
<PackageReference Include="CommunityToolkit.HighPerformance" />
<PackageReference Include="MathNet.Numerics" />
<PackageReference Include="System.Numerics.Tensors" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/wpinet/wpinet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FRC.WPINet.runtime" Version="$(Version)" />
<PackageReference Include="FRC.WPINet.runtime" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions src/wpiutil/wpiutil.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
<PackageReference Include="FRC.WPIUtil.runtime" Version="$(Version)" />
<PackageReference Include="Google.Protobuf" Version="3.21.12" />
<PackageReference Include="UnitsNet" Version="5.42.0" />
<PackageReference Include="UnitsNet.NumberExtensions" Version="5.42.0" />
<PackageReference Include="CommunityToolkit.Diagnostics" />
<PackageReference Include="FRC.WPIUtil.runtime" />
<PackageReference Include="Google.Protobuf" />
<PackageReference Include="UnitsNet" />
<PackageReference Include="UnitsNet.NumberExtensions" />
</ItemGroup>

</Project>
16 changes: 8 additions & 8 deletions test/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -10,25 +10,25 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Update="coverlet.collector" Version="6.0.2">
<PackageReference Update="coverlet.collector">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Update="Microsoft.NET.Test.Sdk" />
<PackageReference Update="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion test/wpilibsharp.test/wpilibsharp.test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="Moq" Version="4.16.0" />
<PackageReference Include="Moq" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading