has checked that it runs on Windows

hazama-yuinyan · May 28, 2018 · 0dc64df · 0dc64df
1 parent e4c9b16
commit 0dc64df
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 36 deletions.
diff --git a/Expresso/CodeGen/LazyTypeBuilder.cs b/Expresso/CodeGen/LazyTypeBuilder.cs
@@ -4,6 +4,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
 
 namespace Expresso.CodeGen
 {

diff --git a/Expresso/Expresso_Win.csproj b/Expresso/Expresso_Win.csproj
@@ -41,7 +41,8 @@
         <Command>
           <type>BeforeBuild</type>
           <command>./parserCompile.sh</command>
-          <workingdir></workingdir>
+          <workingdir>
+          </workingdir>
         </Command>
         <Command>
           <type>BeforeExecute</type>
@@ -72,7 +73,8 @@
         <Command>
           <type>BeforeBuild</type>
           <command>./parserCompile.sh</command>
-          <workingdir></workingdir>
+          <workingdir>
+          </workingdir>
         </Command>
         <Command>
           <type>BeforeExecute</type>
@@ -215,17 +217,18 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Collections.Immutable.1.5.0-rc1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Dynamic" />
     <Reference Include="System.Numerics" />
     <Reference Include="Microsoft.Experimental.Collections">
       <HintPath>..\packages\Microsoft.Experimental.Collections.1.0.3-alpha\lib\portable-net45+win8+wp8\Microsoft.Experimental.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="System.Collections.Immutable">
-      <HintPath>..\packages\System.Collections.Immutable.1.5.0-preview2-26406-04\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
-    </Reference>
     <Reference Include="System.Reflection.Metadata">
-      <HintPath>..\packages\System.Reflection.Metadata.1.6.0-preview2-26406-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <HintPath>..\packages\System.Reflection.Metadata.1.6.0-rc1\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -242,20 +245,7 @@
     <None Include="Documentation\TODO.txt" />
     <None Include="Ast\Patterns\ValueBindingPattern.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Formatting\" />
-    <Folder Include="OutputVisitor\" />
-    <Folder Include="Ast\Statements\" />
-    <Folder Include="Ast\Expressions\" />
-    <Folder Include="Ast\TypeMembers\" />
-    <Folder Include="Ast\GeneralScope\" />
-    <Folder Include="TypeSystem\" />
-    <Folder Include="Ast\Patterns\" />
-    <Folder Include="Documentation\" />
-    <Folder Include="Analysis\" />
-    <Folder Include="CodeGen\" />
-    <Folder Include="Utilities\" />
-  </ItemGroup>
+  <ItemGroup />
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>

diff --git a/ExpressoConsole_Win.csproj b/ExpressoConsole_Win.csproj
@@ -79,6 +79,10 @@
       <Project>{4E28200A-5808-419F-8A57-F504842991AF}</Project>
       <Name>Expresso_Win</Name>
     </ProjectReference>
+    <ProjectReference Include="Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3b2a5653-ec97-4001-bb9b-d90f1af2c371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

diff --git a/ExpressoTest/ExpressoTest_Win.csproj b/ExpressoTest/ExpressoTest_Win.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
   <PropertyGroup>
@@ -21,6 +21,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>

diff --git a/Expresso_Win.sln b/Expresso_Win.sln
@@ -1,6 +1,7 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2018
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressoConsole_Win", "ExpressoConsole_Win.csproj", "{7429CF14-72B5-4019-94A4-4BA593C6FB4C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Expresso_Win", "Expresso\Expresso_Win.csproj", "{4E28200A-5808-419F-8A57-F504842991AF}"
@@ -15,60 +16,113 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteroperabilityTest", "Int
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
 		net_4_5_Debug|Any CPU = net_4_5_Debug|Any CPU
+		net_4_5_Debug|x86 = net_4_5_Debug|x86
 		net_4_5_Release|Any CPU = net_4_5_Release|Any CPU
+		net_4_5_Release|x86 = net_4_5_Release|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.Debug|x86.ActiveCfg = Debug|x86
 		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.Debug|x86.Build.0 = Debug|x86
-		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.Release|x86.ActiveCfg = Release|x86
-		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.Release|x86.Build.0 = Release|x86
 		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.net_4_5_Debug|Any CPU.ActiveCfg = Debug|x86
 		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.net_4_5_Debug|Any CPU.Build.0 = Debug|x86
+		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.net_4_5_Debug|x86.ActiveCfg = Debug|x86
+		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.net_4_5_Debug|x86.Build.0 = Debug|x86
 		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.net_4_5_Release|Any CPU.ActiveCfg = Debug|x86
 		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.net_4_5_Release|Any CPU.Build.0 = Debug|x86
+		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.net_4_5_Release|x86.ActiveCfg = Release|x86
+		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.net_4_5_Release|x86.Build.0 = Release|x86
+		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.Release|Any CPU.ActiveCfg = Release|x86
+		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.Release|x86.ActiveCfg = Release|x86
+		{7429CF14-72B5-4019-94A4-4BA593C6FB4C}.Release|x86.Build.0 = Release|x86
+		{4E28200A-5808-419F-8A57-F504842991AF}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{4E28200A-5808-419F-8A57-F504842991AF}.Debug|Any CPU.Build.0 = Debug|x86
 		{4E28200A-5808-419F-8A57-F504842991AF}.Debug|x86.ActiveCfg = Debug|x86
 		{4E28200A-5808-419F-8A57-F504842991AF}.Debug|x86.Build.0 = Debug|x86
-		{4E28200A-5808-419F-8A57-F504842991AF}.Release|x86.ActiveCfg = Release|x86
-		{4E28200A-5808-419F-8A57-F504842991AF}.Release|x86.Build.0 = Release|x86
 		{4E28200A-5808-419F-8A57-F504842991AF}.net_4_5_Debug|Any CPU.ActiveCfg = Debug|x86
 		{4E28200A-5808-419F-8A57-F504842991AF}.net_4_5_Debug|Any CPU.Build.0 = Debug|x86
+		{4E28200A-5808-419F-8A57-F504842991AF}.net_4_5_Debug|x86.ActiveCfg = Debug|x86
+		{4E28200A-5808-419F-8A57-F504842991AF}.net_4_5_Debug|x86.Build.0 = Debug|x86
 		{4E28200A-5808-419F-8A57-F504842991AF}.net_4_5_Release|Any CPU.ActiveCfg = Debug|x86
 		{4E28200A-5808-419F-8A57-F504842991AF}.net_4_5_Release|Any CPU.Build.0 = Debug|x86
+		{4E28200A-5808-419F-8A57-F504842991AF}.net_4_5_Release|x86.ActiveCfg = Release|x86
+		{4E28200A-5808-419F-8A57-F504842991AF}.net_4_5_Release|x86.Build.0 = Release|x86
+		{4E28200A-5808-419F-8A57-F504842991AF}.Release|Any CPU.ActiveCfg = Release|x86
+		{4E28200A-5808-419F-8A57-F504842991AF}.Release|x86.ActiveCfg = Release|x86
+		{4E28200A-5808-419F-8A57-F504842991AF}.Release|x86.Build.0 = Release|x86
+		{EB393D0B-8183-45EF-89E8-822BC29F097D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB393D0B-8183-45EF-89E8-822BC29F097D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB393D0B-8183-45EF-89E8-822BC29F097D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{EB393D0B-8183-45EF-89E8-822BC29F097D}.Debug|x86.Build.0 = Debug|Any CPU
-		{EB393D0B-8183-45EF-89E8-822BC29F097D}.Release|x86.ActiveCfg = Release|Any CPU
-		{EB393D0B-8183-45EF-89E8-822BC29F097D}.Release|x86.Build.0 = Release|Any CPU
 		{EB393D0B-8183-45EF-89E8-822BC29F097D}.net_4_5_Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EB393D0B-8183-45EF-89E8-822BC29F097D}.net_4_5_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB393D0B-8183-45EF-89E8-822BC29F097D}.net_4_5_Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB393D0B-8183-45EF-89E8-822BC29F097D}.net_4_5_Debug|x86.Build.0 = Debug|Any CPU
 		{EB393D0B-8183-45EF-89E8-822BC29F097D}.net_4_5_Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{EB393D0B-8183-45EF-89E8-822BC29F097D}.net_4_5_Release|Any CPU.Build.0 = Debug|Any CPU
+		{EB393D0B-8183-45EF-89E8-822BC29F097D}.net_4_5_Release|x86.ActiveCfg = Release|Any CPU
+		{EB393D0B-8183-45EF-89E8-822BC29F097D}.net_4_5_Release|x86.Build.0 = Release|Any CPU
+		{EB393D0B-8183-45EF-89E8-822BC29F097D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB393D0B-8183-45EF-89E8-822BC29F097D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB393D0B-8183-45EF-89E8-822BC29F097D}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB393D0B-8183-45EF-89E8-822BC29F097D}.Release|x86.Build.0 = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|x86.Build.0 = Debug|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.ActiveCfg = Release|Any CPU
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.Build.0 = Release|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|x86.ActiveCfg = net_4_5_Debug|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Debug|x86.Build.0 = net_4_5_Debug|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
 		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|x86.ActiveCfg = net_4_5_Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.net_4_5_Release|x86.Build.0 = net_4_5_Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.ActiveCfg = Release|Any CPU
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.Build.0 = Release|Any CPU
+		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.Debug|x86.Build.0 = Debug|Any CPU
-		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.Release|x86.ActiveCfg = Release|Any CPU
-		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.Release|x86.Build.0 = Release|Any CPU
 		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.net_4_5_Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.net_4_5_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.net_4_5_Debug|x86.ActiveCfg = Debug|Any CPU
+		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.net_4_5_Debug|x86.Build.0 = Debug|Any CPU
 		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.net_4_5_Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.net_4_5_Release|Any CPU.Build.0 = Debug|Any CPU
+		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.net_4_5_Release|x86.ActiveCfg = Release|Any CPU
+		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.net_4_5_Release|x86.Build.0 = Release|Any CPU
+		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.Release|x86.ActiveCfg = Release|Any CPU
+		{D60E49D6-6CBA-4D54-A009-6A0528181C88}.Release|x86.Build.0 = Release|Any CPU
+		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.Debug|x86.ActiveCfg = Debug|x86
 		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.Debug|x86.Build.0 = Debug|x86
-		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.Release|x86.ActiveCfg = Release|x86
-		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.Release|x86.Build.0 = Release|x86
 		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.net_4_5_Debug|Any CPU.ActiveCfg = Debug|x86
 		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.net_4_5_Debug|Any CPU.Build.0 = Debug|x86
+		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.net_4_5_Debug|x86.ActiveCfg = Debug|x86
+		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.net_4_5_Debug|x86.Build.0 = Debug|x86
 		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.net_4_5_Release|Any CPU.ActiveCfg = Debug|x86
 		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.net_4_5_Release|Any CPU.Build.0 = Debug|x86
+		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.net_4_5_Release|x86.ActiveCfg = Release|x86
+		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.net_4_5_Release|x86.Build.0 = Release|x86
+		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.Release|Any CPU.ActiveCfg = Release|x86
+		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.Release|x86.ActiveCfg = Release|x86
+		{640E21A6-660A-4D5C-951D-FA564EBCFA70}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {82DA6821-3067-4727-90D9-285EA4324A5C}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0