Refactoring

Firebie · Aug 6, 2011 · 056fda7 · 056fda7
1 parent 9f12dd3
commit 056fda7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 201 deletions.
diff --git a/Parser/Parser-VS_2010.nproj b/Parser/Parser-VS_2010.nproj
diff --git a/Parser/Parser.nproj b/Parser/Parser.nproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <NoStdLib>true</NoStdLib>
-    <Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle</Nemerle>
+    <Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle\Net-4.0</Nemerle>
     <Name>Parser</Name>
   </PropertyGroup>
   <PropertyGroup>
@@ -15,7 +15,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Parser</RootNamespace>
     <AssemblyName>Parser</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,11 +37,15 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
-    <Reference Include="Nemerle.Peg, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <Reference Include="Nemerle.Peg, Version=1.0.0.159, Culture=neutral, PublicKeyToken=null">
       <Name>Nemerle.Peg</Name>
       <AssemblyName>Nemerle.Peg.dll</AssemblyName>
       <HintPath>$(Nemerle)\Nemerle.Peg.dll</HintPath>
-      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nemerle.Peg.Macros, Version=1.0.0.159, Culture=neutral, PublicKeyToken=null">
+      <Name>Nemerle.Peg.Macros</Name>
+      <AssemblyName>Nemerle.Peg.Macros.dll</AssemblyName>
+      <HintPath>$(Nemerle)\Nemerle.Peg.Macros.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

diff --git a/TinyAcc.sln b/TinyAcc.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{EDCC3B85-0BAD-11DB-BC1A-00112FDE8B61}") = "Parser-VS_2010", "Parser\Parser-VS_2010.nproj", "{4E951655-3DFF-4737-A348-0779570F48C0}"
+Project("{EDCC3B85-0BAD-11DB-BC1A-00112FDE8B61}") = "Parser", "Parser\Parser.nproj", "{4E951655-3DFF-4737-A348-0779570F48C0}"
 EndProject
-Project("{EDCC3B85-0BAD-11DB-BC1A-00112FDE8B61}") = "TinyAcc-VS_2010", "TinyAcc\TinyAcc-VS_2010.nproj", "{FBDDD4EE-0D10-4DD6-A8AF-213FAC1834EE}"
+Project("{EDCC3B85-0BAD-11DB-BC1A-00112FDE8B61}") = "TinyAcc", "TinyAcc\TinyAcc.nproj", "{FBDDD4EE-0D10-4DD6-A8AF-213FAC1834EE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/TinyAcc/TinyAcc-VS_2010.nproj b/TinyAcc/TinyAcc-VS_2010.nproj
diff --git a/TinyAcc/TinyAcc.nproj b/TinyAcc/TinyAcc.nproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <NoStdLib>true</NoStdLib>
-    <Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle</Nemerle>
+    <Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle\Net-4.0</Nemerle>
     <Name>TinyAcc</Name>
   </PropertyGroup>
   <PropertyGroup>
@@ -15,7 +15,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TinyAcc</RootNamespace>
     <AssemblyName>TinyAcc</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">