Closes #48

M-Zuber · Jan 4, 2015 · 4855f2a · 4855f2a
1 parent fcd154d
commit 4855f2a
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 ## User defined
 #################
 /packages/
-!packages/repositories.config
+!packages/packages.config
 
 #################
 ## Eclipse

diff --git a/BusinessLogic/BusinessLogic.csproj b/BusinessLogic/BusinessLogic.csproj
@@ -72,9 +72,6 @@
       <Name>LocalTypes</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Data/Data.csproj b/Data/Data.csproj
@@ -66,7 +66,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
     <None Include="StaticDataSet.xsc">
       <DependentUpon>StaticDataSet.xsd</DependentUpon>
     </None>

diff --git a/DataAccess/BaseCategoryAccess.cs b/DataAccess/BaseCategoryAccess.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using LocalTypes;
-using MoreLinq;
 
 namespace DataAccess
 {
@@ -36,7 +35,7 @@ public bool Save(BaseCategory categoryToSave)
 
         internal int GetNextId()
         {
-            return this.LoadAll().MaxBy(ct => ct.Id).Id + 1;
+            return this.LoadAll().Max(ct => (int?)ct.Id) ?? 1;
         }
 
         #endregion

diff --git a/DataAccess/DataAccess.csproj b/DataAccess/DataAccess.csproj
@@ -73,9 +73,6 @@
       <Name>LocalTypes</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/DataAccess/ExpenseAccess.cs b/DataAccess/ExpenseAccess.cs
@@ -159,7 +159,7 @@ internal static Expense TranslateFromDataRow(StaticDataSet.t_expensesRow rowTran
 
         internal static int GetNextId()
         {
-            return LoadAll().MaxBy(income => income.ID).ID + 1;
+            return LoadAll().Max(e => (int?)e.ID) ?? 1;
         }
 
         #endregion

diff --git a/DataAccess/IncomeAccess.cs b/DataAccess/IncomeAccess.cs
@@ -158,7 +158,7 @@ internal static Income TranslateFromDataRow(StaticDataSet.t_incomesRow rowTransl
 
         internal static int GetNextId()
         {
-            return LoadAll().MaxBy(income => income.ID).ID + 1;
+            return LoadAll().Max(i => (int?)i.ID) ?? 1;
         }
 
         #endregion

diff --git a/FrameWork/FrameWork.csproj b/FrameWork/FrameWork.csproj
@@ -49,9 +49,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SettingsManager.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/LocalTypes/LocalTypes.csproj b/LocalTypes/LocalTypes.csproj
@@ -52,9 +52,6 @@
     <Compile Include="PaymentMethod.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/UI/MyHome2013.csproj b/UI/MyHome2013.csproj
@@ -43,10 +43,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="MoreLinq, Version=1.0.16006.0, Culture=neutral, PublicKeyToken=384d532d7e88985d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms.DataVisualization" />

diff --git a/UI/packages.config b/UI/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="morelinq" version="1.0.16006" targetFramework="net451" />
   <package id="MySql.Data" version="6.6.5" targetFramework="net40-Client" />
 </packages>
diff --git a/packages/repositories.config b/packages/repositories.config
@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
-  <repository path="..\BL\packages.config" />
-  <repository path="..\BusinessLogic\packages.config" />
-  <repository path="..\DataAccess\packages.config" />
-  <repository path="..\DL\packages.config" />
-  <repository path="..\FrameWork\packages.config" />
-  <repository path="..\LocalTypes\packages.config" />
-  <repository path="..\Old_FrameWork\packages.config" />
   <repository path="..\UI\packages.config" />
 </repositories>