Refactored directory structure.

Author: kekyo

build-runtime.bat

@@ -17,7 +17,7 @@ if "%Configuration%" == "" (
     set Configuration=Debug
 )
 
-cd IL2C.Runtime
+cd src\IL2C.Runtime
 
 if exist build.cmake (
     move build.cmake build.cmake.old

build-runtime.sh

@@ -8,7 +8,7 @@ else
   Configuration=$1
 fi
 
-cd IL2C.Runtime
+cd src/IL2C.Runtime
 
 rm -rf build.cmake
 

il2c.pack.sln

@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29306.81
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C", "IL2C\IL2C.csproj", "{2CBC90EC-5581-452F-8231-086E4553D20E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C", "src\IL2C\IL2C.csproj", "{2CBC90EC-5581-452F-8231-086E4553D20E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5} = {EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5}
 	EndProjectSection
@@ -15,27 +15,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		pack.sh = pack.sh
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core", "IL2C.Core\IL2C.Core.csproj", "{678EFB0E-BC0A-4749-AD48-079F98D9468D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core", "src\IL2C.Core\IL2C.Core.csproj", "{678EFB0E-BC0A-4749-AD48-079F98D9468D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5} = {EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Tasks", "IL2C.Tasks\IL2C.Tasks.csproj", "{A1D40B7C-2F51-43E3-9201-EA8DFFE3B214}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Tasks", "src\IL2C.Tasks\IL2C.Tasks.csproj", "{A1D40B7C-2F51-43E3-9201-EA8DFFE3B214}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5} = {EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IL2C.Runtime", "IL2C.Runtime\IL2C.Runtime.vcxproj", "{182A62A4-47AC-4290-8EA5-250AE8131613}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IL2C.Runtime", "src\IL2C.Runtime\IL2C.Runtime.vcxproj", "{182A62A4-47AC-4290-8EA5-250AE8131613}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5} = {EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Interop", "IL2C.Interop\IL2C.Interop.csproj", "{854E1ABE-0873-4BDC-8ABF-7F9506DD66DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Interop", "src\IL2C.Interop\IL2C.Interop.csproj", "{854E1ABE-0873-4BDC-8ABF-7F9506DD66DB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5} = {EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArtifactCollector", "ArtifactCollector\ArtifactCollector.csproj", "{EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArtifactCollector", "src\ArtifactCollector\ArtifactCollector.csproj", "{EA6C4A63-B6AB-4AAD-98FA-FF102227EAB5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

il2c.sln

@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29306.81
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C", "IL2C\IL2C.csproj", "{2CBC90EC-5581-452F-8231-086E4553D20E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C", "src\IL2C\IL2C.csproj", "{2CBC90EC-5581-452F-8231-086E4553D20E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D105E6CD-626A-4C04-8AF6-0AA34A4E9CF4}"
 	ProjectSection(SolutionItems) = preProject
@@ -19,20 +19,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core", "IL2C.Core\IL2C.Core.csproj", "{678EFB0E-BC0A-4749-AD48-079F98D9468D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core", "src\IL2C.Core\IL2C.Core.csproj", "{678EFB0E-BC0A-4749-AD48-079F98D9468D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5710A57F-57F8-4D50-8C78-82E2DFDCB613}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Tasks", "IL2C.Tasks\IL2C.Tasks.csproj", "{A1D40B7C-2F51-43E3-9201-EA8DFFE3B214}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Tasks", "src\IL2C.Tasks\IL2C.Tasks.csproj", "{A1D40B7C-2F51-43E3-9201-EA8DFFE3B214}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IL2C.Runtime", "IL2C.Runtime\IL2C.Runtime.vcxproj", "{182A62A4-47AC-4290-8EA5-250AE8131613}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IL2C.Runtime", "src\IL2C.Runtime\IL2C.Runtime.vcxproj", "{182A62A4-47AC-4290-8EA5-250AE8131613}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core.Test.Fixture", "tests\IL2C.Core.Test.Fixture\IL2C.Core.Test.Fixture.csproj", "{B0F1010D-8B73-46F7-AF8E-E3C58F68525F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{182A62A4-47AC-4290-8EA5-250AE8131613} = {182A62A4-47AC-4290-8EA5-250AE8131613}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Interop", "IL2C.Interop\IL2C.Interop.csproj", "{854E1ABE-0873-4BDC-8ABF-7F9506DD66DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Interop", "src\IL2C.Interop\IL2C.Interop.csproj", "{854E1ABE-0873-4BDC-8ABF-7F9506DD66DB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{3EBFA913-CF51-4A28-9E4D-73CB5AE27D2F}"
 	ProjectSection(SolutionItems) = preProject
@@ -52,7 +52,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core.Test.ILConverters
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core.Test.RuntimeSystems", "tests\IL2C.Core.Test.RuntimeSystems\IL2C.Core.Test.RuntimeSystems.csproj", "{E397A251-4373-4A8E-AA13-3891282DEDC7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArtifactCollector", "ArtifactCollector\ArtifactCollector.csproj", "{DF4432C4-A285-4163-9F95-3A56A2226C9A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArtifactCollector", "src\ArtifactCollector\ArtifactCollector.csproj", "{DF4432C4-A285-4163-9F95-3A56A2226C9A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{C26C4683-9840-4307-8774-F1F952E3591B}"
 EndProject

pack.bat

@@ -42,7 +42,7 @@ echo ///////////////////////////////////////////////
 echo // Collects artifacts.
 echo.
 
-ArtifactCollector\ArtifactCollector.exe . .\artifacts "%BuildIdentifier%" IL2C.Interop IL2C.Core IL2C.Tasks IL2C.Runtime
+src\ArtifactCollector\ArtifactCollector.exe . .\artifacts "%BuildIdentifier%" src\IL2C.Interop src\IL2C.Core src\IL2C.Tasks src\IL2C.Runtime
 
 rem =========================================
 

pack.sh

@@ -10,41 +10,41 @@ echo "///////////////////////////////////////////////"
 echo "// Build IL2C.Interop"
 echo ""
 
-dotnet pack --configuration Release --include-symbols -p:VersionPrefix=${VERSION} IL2C.Interop/IL2C.Interop.csproj
-cp IL2C.Interop/bin/Release/IL2C.Interop.${VERSION}.symbols.nupkg artifacts/IL2C.Interop.${VERSION}.nupkg
+dotnet pack --configuration Release --include-symbols -p:VersionPrefix=${VERSION} src/IL2C.Interop/IL2C.Interop.csproj
+cp src/IL2C.Interop/bin/Release/IL2C.Interop.${VERSION}.symbols.nupkg artifacts/IL2C.Interop.${VERSION}.nupkg
 
 echo ""
 echo "///////////////////////////////////////////////"
 echo "// Build IL2C.Core"
 echo ""
 
-dotnet pack --configuration Release --include-symbols -p:VersionPrefix=${VERSION} IL2C.Core/IL2C.Core.csproj
-cp IL2C.Core/bin/Release/IL2C.Core.${VERSION}.symbols.nupkg artifacts/IL2C.Core.${VERSION}.nupkg
+dotnet pack --configuration Release --include-symbols -p:VersionPrefix=${VERSION} src/IL2C.Core/IL2C.Core.csproj
+cp src/IL2C.Core/bin/Release/IL2C.Core.${VERSION}.symbols.nupkg artifacts/IL2C.Core.${VERSION}.nupkg
 
 echo ""
 echo "///////////////////////////////////////////////"
 echo "// Build IL2C.Runtime"
 echo ""
 
-.nuget/nuget pack -Prop version=${VERSION} -OutputDirectory artifacts IL2C.Runtime/IL2C.Runtime.nuspec 
+.nuget/nuget pack -Prop version=${VERSION} -OutputDirectory artifacts src/IL2C.Runtime/IL2C.Runtime.nuspec 
 
 echo ""
 echo "///////////////////////////////////////////////"
 echo "// Build IL2C.Build"
 echo ""
 
-dotnet pack --configuration Release --include-symbols -p:VersionPrefix=${VERSION} IL2C.Tasks/IL2C.Tasks.csproj
-cp IL2C.Tasks/bin/Release/IL2C.Build.${VERSION}.symbols.nupkg artifacts/IL2C.Build.${VERSION}.nupkg
+dotnet pack --configuration Release --include-symbols -p:VersionPrefix=${VERSION} src/IL2C.Tasks/IL2C.Tasks.csproj
+cp src/IL2C.Tasks/bin/Release/IL2C.Build.${VERSION}.symbols.nupkg artifacts/IL2C.Build.${VERSION}.nupkg
 
 echo ""
 echo "///////////////////////////////////////////////"
 echo "// Build Arduino library"
 echo ""
 
 mkdir artifacts/Arduino
-cp /R IL2C.Runtime/include/*.h artifacts/Arduino/src/
-cp /R IL2C.Runtime/src/*.h artifacts/Arduino/src/
-cp /R IL2C.Runtime/src/*.c artifacts/Arduino/src/
+cp -R src/IL2C.Runtime/include/*.h artifacts/Arduino/src/
+cp -R src/IL2C.Runtime/src/*.h artifacts/Arduino/src/
+cp -R src/IL2C.Runtime/src/*.c artifacts/Arduino/src/
 
 sed 's/{version}/${VERSION}/g' Arduino.properties > artifacts/Arduino/library.properties
 

ArtifactCollector/.gitignore renamed to src/ArtifactCollector/.gitignore

@@ -38,7 +38,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\IL2C.Interop\IL2C.Interop.csproj" />
+      <ProjectReference Include="..\..\src\IL2C.Interop\IL2C.Interop.csproj" />
       <ProjectReference Include="..\IL2C.Core.Test.Common\IL2C.Core.Test.Common.csproj" />
     </ItemGroup>
 

ArtifactCollector/Arduino.properties renamed to src/ArtifactCollector/Arduino.properties

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net48;net5.0</TargetFrameworks>
+        <TargetFrameworks>net48;net6.0</TargetFrameworks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
 
         <OutputType>Library</OutputType>
@@ -59,7 +59,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\IL2C.Core\IL2C.Core.csproj" />
+        <ProjectReference Include="..\..\src\IL2C.Core\IL2C.Core.csproj" />
         <ProjectReference Include="..\IL2C.Core.Test.BasicTypes\IL2C.Core.Test.BasicTypes.csproj" />
         <ProjectReference Include="..\IL2C.Core.Test.ILConverters\IL2C.Core.Test.ILConverters.csproj" />
         <ProjectReference Include="..\IL2C.Core.Test.RuntimeSystems\IL2C.Core.Test.RuntimeSystems.csproj" />

ArtifactCollector/ArtifactCollector.csproj renamed to src/ArtifactCollector/ArtifactCollector.csproj

@@ -24,13 +24,11 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-using NUnit.Framework;
-
-using IL2C.Metadata;
 using IL2C.Internal;
+using IL2C.Metadata;
+
+using NUnit.Framework;
 using NUnit.Framework.Internal;
-using NUnit.Framework.Interfaces;
-using ILVerify;
 
 #pragma warning disable CS0436
 
@@ -61,6 +59,7 @@ public static class TestFramework
                     "..",
                     "..",
                     "..",
+                    "src",
                     "IL2C.Runtime"));
 
         private static string GetCLangaugeSafeConversionExpression(

ArtifactCollector/Collectors.cs renamed to src/ArtifactCollector/Collectors.cs

@@ -38,7 +38,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\IL2C.Interop\IL2C.Interop.csproj" />
+      <ProjectReference Include="..\..\src\IL2C.Interop\IL2C.Interop.csproj" />
       <ProjectReference Include="..\IL2C.Core.Test.Common\IL2C.Core.Test.Common.csproj" />
     </ItemGroup>
 

ArtifactCollector/Executor.cs renamed to src/ArtifactCollector/Executor.cs

@@ -38,7 +38,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\IL2C.Interop\IL2C.Interop.csproj" />
+      <ProjectReference Include="..\..\src\IL2C.Interop\IL2C.Interop.csproj" />
       <ProjectReference Include="..\IL2C.Core.Test.Common\IL2C.Core.Test.Common.csproj" />
     </ItemGroup>