Update libs

kzrnm · Dec 27, 2024 · a651f0e · a651f0e
1 parent a50edce
commit a651f0e
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 33 deletions.
diff --git a/.github/workflows/build-release-publish.yml b/.github/workflows/build-release-publish.yml
@@ -29,6 +29,7 @@ jobs:
         3.0.x
         3.1.x
         7.0.x
+        9.0.x
   test:
     uses: kzrnm/dotnet-actions/.github/workflows/unittest.yml@v2
     with:
@@ -38,6 +39,7 @@ jobs:
         3.0.x
         3.1.x
         7.0.x
+        9.0.x
 
   build-verify:
     needs: get-version

diff --git a/.github/workflows/reusable_verify.yml b/.github/workflows/reusable_verify.yml
@@ -26,6 +26,7 @@ jobs:
             3.0.x
             3.1.x
             7.0.x
+            9.0.x
       - uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
@@ -109,6 +110,7 @@ jobs:
             3.0.x
             3.1.x
             7.0.x
+            9.0.x
       - name: Download binaries
         uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -17,7 +17,7 @@ jobs:
     uses: kzrnm/dotnet-actions/.github/workflows/format.yml@v2
     with:
       target: ac-library-csharp.sln
-      dotnet-version: 7.0.x
+      dotnet-version: 9.0.x
   test:
     uses: kzrnm/dotnet-actions/.github/workflows/unittest.yml@v2
     with:
@@ -27,5 +27,6 @@ jobs:
         3.0.x
         3.1.x
         7.0.x
+        9.0.x
   verify:
     uses: ./.github/workflows/reusable_verify.yml
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,7 +19,7 @@
     <EmbeddingSource>true</EmbeddingSource>
     <DefineConstants Condition="'$(EmbeddingSource)'=='true'">$(DefineConstants);EMBEDDING</DefineConstants>
 
-    <SourceExpanderVersion>5.5.1</SourceExpanderVersion>
+    <SourceExpanderVersion>7.0.0</SourceExpanderVersion>
 
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>

diff --git a/Source/AtCoderAnalyzer/AtCoderAnalyzer.csproj b/Source/AtCoderAnalyzer/AtCoderAnalyzer.csproj
@@ -59,6 +59,13 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <Target Name="PackBuildOutputs" DependsOnTargets="SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup">
     <ItemGroup>
       <TfmSpecificPackageFile Include="$(TargetDir)\*.dll" PackagePath="analyzers\dotnet\cs" />

diff --git a/Source/ac-library-csharp/ac-library-csharp.csproj b/Source/ac-library-csharp/ac-library-csharp.csproj
@@ -1,13 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net9.0;net7.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
     <RootNamespace>AtCoder</RootNamespace>
     <OutputType>Library</OutputType>
 
     <LangVersion Condition="'$(TargetFramework)' == 'netstandard2.1'">7.3</LangVersion>
     <LangVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1'">8</LangVersion>
     <LangVersion Condition="'$(TargetFramework)' == 'net7.0'">11</LangVersion>
+    <LangVersion Condition="'$(TargetFramework)' == 'net9.0'">13</LangVersion>
 
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
 
@@ -17,7 +18,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
 
-    <NoWarn>$(NoWarn);CS1574;CA1034;CS1591;CS1734;IDE0039;IDE0057</NoWarn>
+    <NoWarn>$(NoWarn);CS1574;CA1034;CS1591;CS1734;IDE0039;IDE0057;IDE0130</NoWarn>
 
     <PackageLicenseExpression></PackageLicenseExpression>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -66,4 +67,11 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/Test/AtCoderAnalyzer.Test/AtCoderAnalyzer.Test.csproj b/Test/AtCoderAnalyzer.Test/AtCoderAnalyzer.Test.csproj
@@ -11,19 +11,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime;build;native;contentfiles;analyzers;buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime;build;native;contentfiles;analyzers;buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis" Version="4.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.1" />
@@ -34,4 +34,11 @@
     <ProjectReference Include="..\..\Source\AtCoderAnalyzer\AtCoderAnalyzer.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/Test/Expand.Test/Expand.Test.csproj b/Test/Expand.Test/Expand.Test.csproj
@@ -22,4 +22,11 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Source\ac-library-csharp\ac-library-csharp.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/Test/ac-library-csharp.LibraryChecker/ac-library-csharp.LibraryChecker.csproj b/Test/ac-library-csharp.LibraryChecker/ac-library-csharp.LibraryChecker.csproj
@@ -1,20 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net7.0;netcoreapp3.1</TargetFrameworks>
     <RootNamespace>AtCoder</RootNamespace>
 
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Competitive.IO" Version="1.0.1" />
-    <PackageReference Include="CompetitiveVerifierProblem" Version="1.5.0" />
+    <PackageReference Include="Competitive.IO" Version="2.1.0" />
+    <PackageReference Include="CompetitiveVerifierProblem" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\Source\ac-library-csharp\ac-library-csharp.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/Test/ac-library-csharp.Test/DataStructure/FenwickTreeDebugViewTest.cs b/Test/ac-library-csharp.Test/DataStructure/FenwickTreeDebugViewTest.cs
@@ -17,7 +17,7 @@ public WrapperView(FenwickTree<T, TOp> fw)
             {
                 var type = typeof(FenwickTree<T, TOp>).GetNestedType("DebugView", BindingFlags.NonPublic)
                     .MakeGenericType(typeof(T), typeof(TOp));
-                debugView = type.GetConstructor(new[] { fw.GetType() }).Invoke(new object[] { fw });
+                debugView = type.GetConstructor([fw.GetType()]).Invoke([fw]);
                 itemsProperty = debugView.GetType().GetProperty("Items");
             }
             public FenwickTree<T, TOp>.DebugItem[] GetItems()
@@ -36,7 +36,7 @@ public void Empty()
             view.GetItems().Should().BeEmpty();
         }
 
-        public static TheoryData Simple_Data = new TheoryData<int, LongFenwickTree.DebugItem[]>
+        public static TheoryData Simple_Data => new TheoryData<int, LongFenwickTree.DebugItem[]>
         {
             {
                 1,

diff --git a/Test/ac-library-csharp.Test/DataStructure/LazySegtreeDebugViewTest.cs b/Test/ac-library-csharp.Test/DataStructure/LazySegtreeDebugViewTest.cs
@@ -44,7 +44,7 @@ public void Empty()
             view.GetItems().Should().BeEmpty();
         }
 
-        public static TheoryData Simple_Data = new TheoryData<int, LazySegtree<int, int, MaxOp>.DebugItem[]>
+        public static TheoryData Simple_Data() => new TheoryData<int, LazySegtree<int, int, MaxOp>.DebugItem[]>
         {
             {
                 1,

diff --git a/Test/ac-library-csharp.Test/SourceExpanderTest.cs b/Test/ac-library-csharp.Test/SourceExpanderTest.cs
@@ -32,10 +32,14 @@ class EmbeddingGenericMathFact : EmbeddingFact
         const bool useIntrinsics = true;
         const bool genericMath = false;
         const string languageVersion = "8.0";
-#else
+#elif NET7_0
         const bool useIntrinsics = true;
         const bool genericMath = true;
         const string languageVersion = "11.0";
+#else
+        const bool useIntrinsics = true;
+        const bool genericMath = true;
+        const string languageVersion = "13.0";
 #endif
 
         [Fact]

diff --git a/Test/ac-library-csharp.Test/ac-library-csharp.Test.csproj b/Test/ac-library-csharp.Test/ac-library-csharp.Test.csproj
@@ -1,16 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net9.0;net7.0;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <RootNamespace>AtCoder</RootNamespace>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <NoWarn>$(NoWarn);IDE0044;NETSDK1138</NoWarn>
+    <NoWarn>$(NoWarn);IDE0044;IDE0130;NETSDK1138;xUnit1037</NoWarn>
 
     <LangVersion>latest</LangVersion>
 
     <GenericMath Condition="'$(TargetFramework)'!='netcoreapp3.0' And '$(TargetFramework)'!='netcoreapp3.1'">true</GenericMath>
     <DefineConstants Condition="'$(GenericMath)'=='true'">$(DefineConstants);GENERIC_MATH</DefineConstants>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(CI)' == 'true'">
@@ -36,28 +37,27 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CompetitiveVerifierResolverTestLogger" Version="1.5.0">
+    <PackageReference Include="CompetitiveVerifierResolverTestLogger" Version="2.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="SourceExpander.Core" Version="$(SourceExpanderVersion)" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="FluentAssertions" Version="7.0.0" />
     <PackageReference Include="MersenneTwister" Version="1.0.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="SourceExpander.Embedder.Testing" Version="$(SourceExpanderVersion)" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime;build;native;contentfiles;analyzers;buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime;build;native;contentfiles;analyzers;buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
@@ -73,4 +73,11 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ jobs: @@
 .0.x
 .1.x
 .0.x
+.0.x
       test:
         uses: kzrnm/dotnet-actions/.github/workflows/unittest.yml@v2
         with:
@@ Expand All / @@ -38,6 +39,7 @@ jobs: @@
 .0.x
 .1.x
 .0.x
+.0.x
       build-verify:
         needs: get-version
@@ Expand Down @@