From 015971ee2e770f2ad15946118a342bfe80e1f5f8 Mon Sep 17 00:00:00 2001
From: kzrnm <gengesa@gmail.com>
Date: Wed, 25 Oct 2023 18:58:59 +0900
Subject: [PATCH] Add Expand.Test

---
 Directory.Build.props                         |  2 ++
 .../ac-library-csharp.csproj                  |  2 +-
 Test/Expand.Test/Expand.Test.csproj           | 25 +++++++++++++++++++
 Test/Expand.Test/Program.cs                   |  9 +++++++
 .../ac-library-csharp.Test.csproj             |  4 +--
 ac-library-csharp.sln                         | 11 ++++++--
 6 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 Test/Expand.Test/Expand.Test.csproj
 create mode 100644 Test/Expand.Test/Program.cs

diff --git a/Directory.Build.props b/Directory.Build.props
index 7caae28..9e7d998 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,6 +19,8 @@
     <EmbeddingSource>true</EmbeddingSource>
     <DefineConstants Condition="'$(EmbeddingSource)'=='true'">$(DefineConstants);EMBEDDING</DefineConstants>
 
+    <SourceExpanderVersion>5.5.1</SourceExpanderVersion>
+
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
diff --git a/Source/ac-library-csharp/ac-library-csharp.csproj b/Source/ac-library-csharp/ac-library-csharp.csproj
index 24adf93..bf3f059 100644
--- a/Source/ac-library-csharp/ac-library-csharp.csproj
+++ b/Source/ac-library-csharp/ac-library-csharp.csproj
@@ -41,7 +41,7 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Analyzer</OutputItemType>
     </ProjectReference>
-    <PackageReference Include="SourceExpander.Embedder" Version="5.3.1" Condition="'$(EmbeddingSource)'=='true'">
+    <PackageReference Include="SourceExpander.Embedder" Version="$(SourceExpanderVersion)" Condition="'$(EmbeddingSource)'=='true'">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Test/Expand.Test/Expand.Test.csproj b/Test/Expand.Test/Expand.Test.csproj
new file mode 100644
index 0000000..11c0340
--- /dev/null
+++ b/Test/Expand.Test/Expand.Test.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net7.0;netcoreapp3.1</TargetFrameworks>
+    <Nullable>annotations</Nullable>
+
+    <LangVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1'">8</LangVersion>
+    <LangVersion Condition="'$(TargetFramework)' == 'net7.0'">11</LangVersion>
+
+    <NoWarn>$(NoWarn);CS0436;CS8981;CS0649</NoWarn>
+    <SourceExpander_Generator_ExpandingAll>true</SourceExpander_Generator_ExpandingAll>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SourceExpander.Generator" Version="$(SourceExpanderVersion)">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Source\ac-library-csharp\ac-library-csharp.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/Test/Expand.Test/Program.cs b/Test/Expand.Test/Program.cs
new file mode 100644
index 0000000..e13fff9
--- /dev/null
+++ b/Test/Expand.Test/Program.cs
@@ -0,0 +1,9 @@
+partial class Program
+{
+    static void Main()
+    {
+#if EMBEDDING
+        System.Console.WriteLine(SourceExpander.Testing.AtCoder.MathLib.PowMod(255, 1L << 52, 12));
+#endif
+    }
+}
diff --git a/Test/ac-library-csharp.Test/ac-library-csharp.Test.csproj b/Test/ac-library-csharp.Test/ac-library-csharp.Test.csproj
index e6cc545..1ace234 100644
--- a/Test/ac-library-csharp.Test/ac-library-csharp.Test.csproj
+++ b/Test/ac-library-csharp.Test/ac-library-csharp.Test.csproj
@@ -44,11 +44,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SourceExpander.Core" Version="5.3.1" />
+    <PackageReference Include="SourceExpander.Core" Version="$(SourceExpanderVersion)" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="MersenneTwister" Version="1.0.6" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="SourceExpander.Embedder.Testing" Version="5.3.1" />
+    <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">
diff --git a/ac-library-csharp.sln b/ac-library-csharp.sln
index e00a91f..4173343 100644
--- a/ac-library-csharp.sln
+++ b/ac-library-csharp.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30413.136
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34031.279
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ac-library-csharp", "Source\ac-library-csharp\ac-library-csharp.csproj", "{7915FF27-0322-4460-A94E-FA7B86D5E25C}"
 EndProject
@@ -24,6 +24,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AtCoderAnalyzer.Test", "Tes
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ac-library-csharp.LibraryChecker", "Test\ac-library-csharp.LibraryChecker\ac-library-csharp.LibraryChecker.csproj", "{D61D3584-B86E-4C1F-BB8A-A1747A60E834}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Expand.Test", "Test\Expand.Test\Expand.Test.csproj", "{5121294D-76A4-44D4-8C2C-36B29FC162E4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -50,6 +52,10 @@ Global
 		{D61D3584-B86E-4C1F-BB8A-A1747A60E834}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D61D3584-B86E-4C1F-BB8A-A1747A60E834}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D61D3584-B86E-4C1F-BB8A-A1747A60E834}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5121294D-76A4-44D4-8C2C-36B29FC162E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5121294D-76A4-44D4-8C2C-36B29FC162E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5121294D-76A4-44D4-8C2C-36B29FC162E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5121294D-76A4-44D4-8C2C-36B29FC162E4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -58,6 +64,7 @@ Global
 		{D0662927-8142-43D2-ABA9-C1977107F0ED} = {573A3DC6-BEB2-4E3A-8EB3-E4CB88F3C8F1}
 		{522A1037-5060-4CBA-A4A3-99624FAD732E} = {573A3DC6-BEB2-4E3A-8EB3-E4CB88F3C8F1}
 		{D61D3584-B86E-4C1F-BB8A-A1747A60E834} = {573A3DC6-BEB2-4E3A-8EB3-E4CB88F3C8F1}
+		{5121294D-76A4-44D4-8C2C-36B29FC162E4} = {573A3DC6-BEB2-4E3A-8EB3-E4CB88F3C8F1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3DF2A5DC-C174-486C-A24B-1F08FAA0D4F5}