diff --git a/Excavator.BinaryFile/App.config b/Excavator.BinaryFile/App.config
deleted file mode 100644
index a528a84..0000000
--- a/Excavator.BinaryFile/App.config
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Excavator.BinaryFile/Excavator.BinaryFile.csproj b/Excavator.BinaryFile/Excavator.BinaryFile.csproj
index 8c0209e..2e0416e 100644
--- a/Excavator.BinaryFile/Excavator.BinaryFile.csproj
+++ b/Excavator.BinaryFile/Excavator.BinaryFile.csproj
@@ -41,13 +41,15 @@
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll
+ False
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll
+ False
..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
- True
+ False
..\packages\Rock\Rock.dll
@@ -77,6 +79,7 @@
{42dc1a5d-0637-4595-90f6-fa97dac69e95}
Excavator.Utility
+ False
{6c4100b7-6b6b-40d7-a150-deba50512c95}
@@ -85,7 +88,6 @@
-
diff --git a/Excavator.CSV/App.config b/Excavator.CSV/App.config
deleted file mode 100644
index a528a84..0000000
--- a/Excavator.CSV/App.config
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Excavator.CSV/CSVComponent.cs b/Excavator.CSV/CSVComponent.cs
index 89a9ddd..a7bf427 100644
--- a/Excavator.CSV/CSVComponent.cs
+++ b/Excavator.CSV/CSVComponent.cs
@@ -357,7 +357,7 @@ private static string GetFileRootName( string fileName )
///
private static bool FileTypeMatches( CSVInstance.RockDataType filetype, string name )
{
- if ( name.ToUpper().StartsWith( filetype.ToString() ) )
+ if ( name.ToUpper().StartsWith( filetype.ToString() ) || name.ToUpper().EndsWith( filetype.ToString() ) )
{
return true;
}
diff --git a/Excavator.CSV/Excavator.CSV.csproj b/Excavator.CSV/Excavator.CSV.csproj
index 12f5c0b..fdb2e39 100644
--- a/Excavator.CSV/Excavator.CSV.csproj
+++ b/Excavator.CSV/Excavator.CSV.csproj
@@ -41,16 +41,19 @@
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll
+ False
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll
+ False
..\packages\LumenWorksCsvReader.3.9.1\lib\net20\LumenWorks.Framework.IO.dll
+ False
..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
- True
+ False
..\packages\Rock\Rock.dll
@@ -80,6 +83,7 @@
{42dc1a5d-0637-4595-90f6-fa97dac69e95}
Excavator.Utility
+ False
{6c4100b7-6b6b-40d7-a150-deba50512c95}
@@ -88,7 +92,6 @@
-
diff --git a/Excavator.CSV/Maps/Family.cs b/Excavator.CSV/Maps/Family.cs
index 9851ad4..0bacaf5 100644
--- a/Excavator.CSV/Maps/Family.cs
+++ b/Excavator.CSV/Maps/Family.cs
@@ -52,18 +52,19 @@ private int LoadFamily( CSVInstance csvData )
{
ForeignKey = rowFamilyKey,
ForeignId = rowFamilyId,
- Name = row[FamilyName],
CreatedByPersonAliasId = ImportPersonAliasId,
GroupTypeId = FamilyGroupTypeId
};
newFamilyList.Add( currentFamilyGroup );
}
- else
+ else if ( !lookupContext.ChangeTracker.Entries().Any( g => g.Entity.ForeignId == rowFamilyId || g.Entity.ForeignKey == rowFamilyKey ) )
{
- currentFamilyGroup.Name = row[FamilyName];
+ // track changes if not currently tracking
lookupContext.Groups.Attach( currentFamilyGroup );
}
+ currentFamilyGroup.Name = row[FamilyName];
+
// Set the family campus
var campusName = row[Campus];
if ( !string.IsNullOrWhiteSpace( campusName ) )
@@ -146,6 +147,7 @@ private int LoadFamily( CSVInstance csvData )
// Reset lookup context
lookupContext.SaveChanges();
+ lookupContext.Dispose();
lookupContext = new RockContext();
locationService = new LocationService( lookupContext );
newFamilyList.Clear();
diff --git a/Excavator.Example/Excavator.Example.csproj b/Excavator.Example/Excavator.Example.csproj
index 076265d..c2ba7b0 100644
--- a/Excavator.Example/Excavator.Example.csproj
+++ b/Excavator.Example/Excavator.Example.csproj
@@ -41,21 +41,25 @@
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll
+ False
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll
+ False
..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
- True
+ False
False
..\packages\Rock\OrcaMDF.Core.dll
+ False
False
..\packages\Rock\OrcaMDF.Framework.dll
+ False
..\packages\Rock\Rock.dll
@@ -79,6 +83,7 @@
{42dc1a5d-0637-4595-90f6-fa97dac69e95}
Excavator.Utility
+ False
{6c4100b7-6b6b-40d7-a150-deba50512c95}
diff --git a/Excavator.FellowshipOne/App.config b/Excavator.FellowshipOne/App.config
deleted file mode 100644
index 26ebd90..0000000
--- a/Excavator.FellowshipOne/App.config
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Excavator.FellowshipOne/Excavator.F1.csproj b/Excavator.FellowshipOne/Excavator.F1.csproj
index 25e7404..7ccb56c 100644
--- a/Excavator.FellowshipOne/Excavator.F1.csproj
+++ b/Excavator.FellowshipOne/Excavator.F1.csproj
@@ -42,16 +42,19 @@
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll
+ False
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll
+ False
..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
- True
+ False
..\packages\Rock\OrcaMDF.Core.dll
+ False
..\packages\Rock\Rock.dll
@@ -111,6 +114,7 @@
{42dc1a5d-0637-4595-90f6-fa97dac69e95}
Excavator.Utility
+ False
{6c4100b7-6b6b-40d7-a150-deba50512c95}
@@ -119,7 +123,6 @@
-
diff --git a/Excavator.Utility/Excavator.Utility.csproj b/Excavator.Utility/Excavator.Utility.csproj
index 9804507..85e1d57 100644
--- a/Excavator.Utility/Excavator.Utility.csproj
+++ b/Excavator.Utility/Excavator.Utility.csproj
@@ -32,15 +32,19 @@
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll
+ False
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll
+ False
..\packages\Rock\OrcaMDF.Core.dll
+ False
..\packages\Rock\Rock.dll
+ False
diff --git a/Excavator.zip b/Excavator.zip
index df1f716..ac42009 100644
Binary files a/Excavator.zip and b/Excavator.zip differ
diff --git a/Excavator/Excavator.csproj b/Excavator/Excavator.csproj
index 53bc1f7..237af7f 100644
--- a/Excavator/Excavator.csproj
+++ b/Excavator/Excavator.csproj
@@ -62,18 +62,25 @@
Resources\rock.ico
+
+ ..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll
+ True
+
- False
..\packages\Rock\DotLiquid.dll
+ True
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll
+ True
..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll
+ True
..\packages\Rock\Humanizer.dll
+ True
..\packages\LumenWorksCsvReader.3.9.1\lib\net20\LumenWorks.Framework.IO.dll
@@ -140,9 +147,11 @@
..\packages\Rock\OrcaMDF.Core.dll
+ True
..\packages\Rock\OrcaMDF.Framework.dll
+ True
False
@@ -155,6 +164,7 @@
..\packages\Rock\StackExchange.Redis.dll
+ True
@@ -307,7 +317,9 @@
-
+
+ Designer
+
@@ -351,10 +363,15 @@ foreach (var item in filesToCleanup)
This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
+
-
+
+
+
+
+
@@ -120,4 +120,4 @@
-
\ No newline at end of file
+
diff --git a/Excavator/Views/MainWindow.xaml b/Excavator/Views/MainWindow.xaml
index 7478205..0c4175a 100644
--- a/Excavator/Views/MainWindow.xaml
+++ b/Excavator/Views/MainWindow.xaml
@@ -3,11 +3,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Icon="..\Resources\rock.ico"
Title="Rock Excavator"
- Height="500" Width="750"
+ Height="600" Width="800"
MinHeight="450" MinWidth="600"
Background="{StaticResource windowBackground}"
ShowsNavigationUI="False"
Source=".\ConnectPage.xaml"
FontFamily="Resources/#Open Sans Regular" FontSize="14"
WindowStartupLocation="CenterScreen">
-
\ No newline at end of file
+
diff --git a/Excavator/packages.config b/Excavator/packages.config
index 87b35fc..b9daab8 100644
--- a/Excavator/packages.config
+++ b/Excavator/packages.config
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/packages/Rock/Rock.dll b/packages/Rock/Rock.dll
index 5f1a0f1..cc6ad65 100644
Binary files a/packages/Rock/Rock.dll and b/packages/Rock/Rock.dll differ