Unify versions

ThadHouse · ThadHouse · commit 408ec9491283 · 2025-05-03T14:47:09.000-07:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <IsPackable>true</IsPackable>
+    <Version>2025.3.2-114-g3681121</Version>
     <IsAotCompatible>true</IsAotCompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ImplicitUsings>true</ImplicitUsings>
@@ -10,9 +11,12 @@
     <PackageOutputPath>$(SolutionDir)nupkg</PackageOutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>1701;1702;1591;</NoWarn>
+    <NoWarn>1701;1702;1591;CA1401;1570</NoWarn>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <AnalysisMode>Recommended</AnalysisMode>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisLevel>8.0</AnalysisLevel>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/cscore/cscore.csproj b/src/cscore/cscore.csproj
@@ -4,9 +4,6 @@
     <RootNamespace>CsCore</RootNamespace>
     <AssemblyName>FRC.CsCore</AssemblyName>
     <NoWarn>1591;CA1401;1570</NoWarn>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>8.0</AnalysisLevel>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FRC.CsCore.runtime" Version="2025.3.2-114-g3681121" />
+    <PackageReference Include="FRC.CsCore.runtime" Version="$(Version)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/datalog/datalog.csproj b/src/datalog/datalog.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FRC.DataLog.runtime" Version="2025.3.2-114-g3681121" />
+    <PackageReference Include="FRC.DataLog.runtime" Version="$(Version)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/hal/hal.csproj b/src/hal/hal.csproj
@@ -3,10 +3,6 @@
   <PropertyGroup>
     <RootNamespace>WPIHal</RootNamespace>
     <AssemblyName>FRC.WPIHal</AssemblyName>
-    <NoWarn>1591;CA1401;1570</NoWarn>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>8.0</AnalysisLevel>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FRC.WPIHal.runtime" Version="2025.3.2-114-g3681121" />
+    <PackageReference Include="FRC.WPIHal.runtime" Version="$(Version)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/newcommands/newcommands.csproj b/src/newcommands/newcommands.csproj
@@ -3,10 +3,6 @@
   <PropertyGroup>
     <AssemblyName>WPILibNewCommands</AssemblyName>
     <RootNamespace>WPILib</RootNamespace>
-    <NoWarn>1591;CA1401</NoWarn>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>8.0</AnalysisLevel>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ntcore/ntcore.csproj b/src/ntcore/ntcore.csproj
@@ -3,10 +3,6 @@
   <PropertyGroup>
     <RootNamespace>NetworkTables</RootNamespace>
     <AssemblyName>FRC.NetworkTables</AssemblyName>
-    <NoWarn>1591;CA1401;1570</NoWarn>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>8.0</AnalysisLevel>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FRC.NetworkTables.runtime" Version="2025.3.2-114-g3681121" />
+    <PackageReference Include="FRC.NetworkTables.runtime" Version="$(Version)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/stereologue/stereologue.csproj b/src/stereologue/stereologue.csproj
@@ -3,10 +3,6 @@
   <PropertyGroup>
     <RootNamespace>Stereologue</RootNamespace>
     <AssemblyName>FRC.Stereologue</AssemblyName>
-    <NoWarn>1591;CA1401;1570</NoWarn>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>8.0</AnalysisLevel>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/wpilibsharp/wpilibsharp.csproj b/src/wpilibsharp/wpilibsharp.csproj
@@ -3,10 +3,6 @@
   <PropertyGroup>
     <AssemblyName>WPILibSharp</AssemblyName>
     <RootNamespace>WPILib</RootNamespace>
-    <NoWarn>1591;CA1401</NoWarn>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>8.0</AnalysisLevel>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/wpimath/wpimath.csproj b/src/wpimath/wpimath.csproj
@@ -4,9 +4,6 @@
     <RootNamespace>WPIMath</RootNamespace>
     <AssemblyName>FRC.WPIMath</AssemblyName>
     <NoWarn>1591;CA1401</NoWarn>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>8.0</AnalysisLevel>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/wpinet/wpinet.csproj b/src/wpinet/wpinet.csproj
@@ -4,17 +4,14 @@
     <RootNamespace>WPINet</RootNamespace>
     <AssemblyName>FRC.WPINet</AssemblyName>
     <NoWarn>1591;CA1401</NoWarn>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>8.0</AnalysisLevel>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\wpiutil\wpiutil.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FRC.WPINet.runtime" Version="2025.3.2-114-g3681121" />
+    <PackageReference Include="FRC.WPINet.runtime" Version="$(Version)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/wpiutil/wpiutil.csproj b/src/wpiutil/wpiutil.csproj
@@ -4,14 +4,11 @@
     <RootNamespace>WPIUtil</RootNamespace>
     <AssemblyName>FRC.WPIUtil</AssemblyName>
     <NoWarn>1591;CA1401</NoWarn>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>8.0</AnalysisLevel>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
-    <PackageReference Include="FRC.WPIUtil.runtime" Version="2025.3.2-114-g3681121" />
+    <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" />
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -21,4 +21,16 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="coverlet.collector" Version="6.0.2">
+      <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">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/test/datalog.test/datalog.test.csproj b/test/datalog.test/datalog.test.csproj
@@ -4,16 +4,4 @@
     <ProjectReference Include="..\..\src\datalog\datalog.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="coverlet.collector" Version="6.0.2">
-      <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">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>
diff --git a/test/hal.test/hal.test.csproj b/test/hal.test/hal.test.csproj
@@ -4,16 +4,4 @@
     <ProjectReference Include="..\..\src\wpiutil\wpiutil.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="coverlet.collector" Version="6.0.2">
-      <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">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>
diff --git a/test/ntcore.test/ntcore.test.csproj b/test/ntcore.test/ntcore.test.csproj
@@ -6,7 +6,4 @@
     <ProjectReference Include="..\..\src\wpiutil\wpiutil.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-  </ItemGroup>
-
 </Project>
diff --git a/test/wpilibsharp.test/wpilibsharp.test.csproj b/test/wpilibsharp.test/wpilibsharp.test.csproj
@@ -10,17 +10,4 @@
     <ProjectReference Include="..\..\src\wpilibsharp\wpilibsharp.csproj" />
     <ProjectReference Include="..\..\src\wpiutil\wpiutil.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="coverlet.collector" Version="6.0.2">
-      <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">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>
diff --git a/test/wpimath.test/wpimath.test.csproj b/test/wpimath.test/wpimath.test.csproj
@@ -5,7 +5,4 @@
     <ProjectReference Include="..\..\src\wpiutil\wpiutil.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-  </ItemGroup>
-
 </Project>
diff --git a/test/wpinet.test/wpinet.test.csproj b/test/wpinet.test/wpinet.test.csproj
@@ -4,16 +4,4 @@
     <ProjectReference Include="..\..\src\wpinet\wpinet.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="coverlet.collector" Version="6.0.2">
-      <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">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>
diff --git a/test/wpiutil.test/wpiutil.test.csproj b/test/wpiutil.test/wpiutil.test.csproj
@@ -4,16 +4,4 @@
     <ProjectReference Include="..\..\src\wpiutil\wpiutil.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="coverlet.collector" Version="6.0.2">
-      <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">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>
