Fixed project files.

sys27 · Apr 20, 2014 · 8c153d1 · 8c153d1
1 parent b12a618
commit 8c153d1
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 9 deletions.
diff --git a/build all.bat b/build all.bat
@@ -4,26 +4,26 @@ set t=%1
 if "%1"=="" set t=Build
 echo %t% xFunc for .Net 2.0 ...
 msbuild "xFunc (Libs for .Net 2.0).sln" /nologo /t:%t% /m /clp:ErrorsOnly /p:Configuration=Release
-if errorlevel 0 echo %t% completed!
 if errorlevel 1 goto err
+if errorlevel 0 echo %t% completed!
 pause
 
 echo %t% xFunc for .Net 3.0 ...
 msbuild "xFunc (Libs for .Net 3.0).sln" /nologo /t:%t% /m /clp:ErrorsOnly /p:Configuration=Release
-if errorlevel 0 echo %t% completed! 
 if errorlevel 1 goto err
+if errorlevel 0 echo %t% completed! 
 pause
 
 echo %t% xFunc for .Net 3.5 ...
 msbuild "xFunc (Libs for .Net 3.5).sln" /nologo /t:%t% /m /clp:ErrorsOnly /p:Configuration=Release
-if errorlevel 0 echo %t% completed! 
 if errorlevel 1 goto err
+if errorlevel 0 echo %t% completed! 
 pause
 
 echo %t% xFunc for .Net 4.0 ...
 msbuild "xFunc (Libs for .Net 4.0).sln" /nologo /t:%t% /m /clp:ErrorsOnly /p:Configuration=Release
-if errorlevel 0 echo %t% completed!
 if errorlevel 1 goto err
+if errorlevel 0 echo %t% completed!
 pause
 
 echo %t% xFunc for .Net 4.5 ...
@@ -34,14 +34,14 @@ pause
 
 echo %t% xFunc for .Net 4.5.1 ...
 msbuild "xFunc (Libs for .Net 4.5.1).sln" /nologo /t:%t% /m /clp:ErrorsOnly /p:Configuration=Release
-if errorlevel 0 echo %t% completed! 
 if errorlevel 1 goto err
+if errorlevel 0 echo %t% completed! 
 pause
 
 echo %t% xFunc for Portable ...
 msbuild "xFunc (Libs for Portable).sln" /nologo /t:%t% /m /clp:ErrorsOnly /p:Configuration=Release
-if errorlevel 0 echo %t% completed! 
 if errorlevel 1 goto err
+if errorlevel 0 echo %t% completed! 
 pause
 
 goto end

diff --git a/xFunc.Maths/EnumerableExtention.cs b/xFunc.Maths/EnumerableExtention.cs
@@ -15,9 +15,6 @@ internal class ExtensionAttribute : Attribute { }
 namespace xFunc.Maths
 {
 
-    internal delegate V Func<in T, out V>(T arg);
-    internal delegate V Func<in T1, in T2, out V>(T1 arg1, T2 args2);
-
     internal static class EnumerableExtention
     {
 

diff --git a/xFunc.Maths/Func.cs b/xFunc.Maths/Func.cs
@@ -0,0 +1,9 @@
+#if NET20 || NET30
+namespace System
+{
+
+	public delegate TResult Func<in T, out TResult>(T arg);
+    public delegate TResult Func<in T1, in T2, out TResult>(T1 arg1, T2 arg2);
+
+}
+#endif
diff --git a/xFunc.Maths/xFunc.Maths (.Net 2.0).csproj b/xFunc.Maths/xFunc.Maths (.Net 2.0).csproj
@@ -47,6 +47,8 @@
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Func.cs" />
+    <Compile Include="Expressions\DelegateExpression.cs" />
     <Compile Include="Expressions\DifferentParametersExpression.cs" />
     <Compile Include="Expressions\ExpressionParameters.cs" />
     <Compile Include="IExpressionFactory.cs" />

diff --git a/xFunc.Maths/xFunc.Maths (.Net 3.0).csproj b/xFunc.Maths/xFunc.Maths (.Net 3.0).csproj
@@ -47,6 +47,8 @@
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Func.cs" />
+    <Compile Include="Expressions\DelegateExpression.cs" />
     <Compile Include="Expressions\DifferentParametersExpression.cs" />
     <Compile Include="Expressions\ExpressionParameters.cs" />
     <Compile Include="IExpressionFactory.cs" />

diff --git a/xFunc.Maths/xFunc.Maths (.Net 3.5).csproj b/xFunc.Maths/xFunc.Maths (.Net 3.5).csproj
@@ -49,6 +49,7 @@
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Expressions\DelegateExpression.cs" />
     <Compile Include="Expressions\DifferentParametersExpression.cs" />
     <Compile Include="Expressions\ExpressionParameters.cs" />
     <Compile Include="IExpressionFactory.cs" />

diff --git a/xFunc.Maths/xFunc.Maths (.Net 4.5).csproj b/xFunc.Maths/xFunc.Maths (.Net 4.5).csproj
@@ -52,6 +52,7 @@
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Expressions\DelegateExpression.cs" />
     <Compile Include="Expressions\DifferentParametersExpression.cs" />
     <Compile Include="Expressions\ExpressionParameters.cs" />
     <Compile Include="IExpressionFactory.cs" />

diff --git a/xFunc.Maths/xFunc.Maths (.Net 4.5.1).csproj b/xFunc.Maths/xFunc.Maths (.Net 4.5.1).csproj
@@ -52,6 +52,7 @@
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Expressions\DelegateExpression.cs" />
     <Compile Include="Expressions\DifferentParametersExpression.cs" />
     <Compile Include="Expressions\ExpressionParameters.cs" />
     <Compile Include="IExpressionFactory.cs" />

diff --git a/xFunc.Maths/xFunc.Maths (Portable).csproj b/xFunc.Maths/xFunc.Maths (Portable).csproj
@@ -78,6 +78,7 @@
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Expressions\DelegateExpression.cs" />
     <Compile Include="Expressions\DifferentParametersExpression.cs" />
     <Compile Include="Expressions\ExpressionParameters.cs" />
     <Compile Include="IExpressionFactory.cs" />