update project build tools. cleanup csproj files

mkjeff · Jan 4, 2024 · 4eab0e8 · 4eab0e8
1 parent 4f6bff1
commit 4eab0e8
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 67 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,7 +19,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="PolySharp" Version="1.13.2" Condition="'$(TargetFramework)' != 'net6.0'">
+		<PackageReference Include="PolySharp" Version="1.14.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/samples/DeviceWorkerService/DeviceWorkerService.csproj b/samples/DeviceWorkerService/DeviceWorkerService.csproj
@@ -17,10 +17,4 @@
     <ProjectReference Include="..\..\src\Secs4Net.Sml\Secs4Net.Sml.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="PolySharp" Version="1.14.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>
diff --git a/samples/SecsDevice/SecsDevice.csproj b/samples/SecsDevice/SecsDevice.csproj
@@ -14,10 +14,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-		<PackageReference Update="PolySharp" Version="1.14.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
 	</ItemGroup>
 
 </Project>
diff --git a/samples/WpfVisualizer/WpfVisualizer.csproj b/samples/WpfVisualizer/WpfVisualizer.csproj
@@ -18,11 +18,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="PolySharp" Version="1.14.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Secs4Net.Json/Secs4Net.Json.csproj b/src/Secs4Net.Json/Secs4Net.Json.csproj
@@ -20,11 +20,4 @@
     <ProjectReference Include="..\Secs4Net\Secs4Net.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="PolySharp" Version="1.14.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Secs4Net.Sml/Secs4Net.Sml.csproj b/src/Secs4Net.Sml/Secs4Net.Sml.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
-    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsAotCompatible>
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,11 +17,4 @@
     <ProjectReference Include="..\Secs4Net\Secs4Net.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="PolySharp" Version="1.14.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Secs4Net/Secs4Net.csproj b/src/Secs4Net/Secs4Net.csproj
@@ -4,7 +4,7 @@
 		<TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
-		<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsAotCompatible>
+		<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsAotCompatible>
 		<PackageReadmeFile>README.md</PackageReadmeFile>	
 	</PropertyGroup>
 
@@ -26,10 +26,6 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Update="PolySharp" Version="1.14.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
 		<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
 		<PackageReference Include="PooledAwait" Version="1.0.49" />
 		<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />

diff --git a/test/Benchmarks/Benchmarks.csproj b/test/Benchmarks/Benchmarks.csproj
@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.11" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,7 +28,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!--<Compile Include="..\..\common\Encoding.Extensions.cs" Link="common\Encoding.Extensions.cs" />-->
     <Compile Include="..\..\common\EnumerableExtensions.cs" Link="common\EnumerableExtensions.cs" />
     <Compile Include="..\..\common\Usings.cs" Link="common\Usings.cs" />
   </ItemGroup>

diff --git a/test/Secs4Net.Json.UnitTests/Secs4Net.Json.UnitTests.csproj b/test/Secs4Net.Json.UnitTests/Secs4Net.Json.UnitTests.csproj
@@ -11,8 +11,8 @@
 	<ItemGroup>
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="xunit" Version="2.6.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+		<PackageReference Include="xunit" Version="2.6.4" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
@@ -29,10 +29,4 @@
 		<ProjectReference Include="..\..\src\Secs4Net.Json\Secs4Net.Json.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Update="PolySharp" Version="1.14.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
 </Project>
diff --git a/test/Secs4Net.Sml.UnitTests/Secs4Net.Sml.UnitTests.csproj b/test/Secs4Net.Sml.UnitTests/Secs4Net.Sml.UnitTests.csproj
@@ -11,8 +11,8 @@
 	<ItemGroup>
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="xunit" Version="2.6.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+		<PackageReference Include="xunit" Version="2.6.4" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
@@ -29,11 +29,4 @@
 		<Compile Include="..\..\common\Usings.cs" Link="common\Usings.cs" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Update="PolySharp" Version="1.14.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-
 </Project>
diff --git a/test/Secs4Net.UnitTests/Secs4Net.UnitTests.csproj b/test/Secs4Net.UnitTests/Secs4Net.UnitTests.csproj
@@ -12,8 +12,8 @@
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 		<PackageReference Include="NSubstitute" Version="5.1.0" />
-		<PackageReference Include="xunit" Version="2.6.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+		<PackageReference Include="xunit" Version="2.6.4" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
@@ -32,11 +32,4 @@
 		<Compile Include="..\..\common\RuntimeHelpers.cs" Link="common\RuntimeHelpers.cs" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Update="PolySharp" Version="1.14.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-
 </Project>