Merge branch 'develop'

TrackableEntities · Mar 2, 2015 · dc10f54 · dc10f54
2 parents b7abe09 + 9c68251
commit dc10f54
Show file tree

Hide file tree

Showing 264 changed files with 140 additions and 1,371 deletions.
diff --git a/Build/Scripts/TrackableEntities.Client.cmd b/Build/Scripts/TrackableEntities.Client.cmd
@@ -14,6 +14,9 @@ set output=Build\Output\%name%
 set target-portable=portable-net45+wp80+win8+wpa81
 set target-sl5=sl5
 set target-net45=net45
+set src-portable=TrackableEntities.Client
+set src-sl5=TrackableEntities.Client.Sl5
+set src-net45=TrackableEntities.Client.Net45
 
 REM Restore:
 if "%debug%"=="1" pause
@@ -39,10 +42,10 @@ xcopy "%source%\bin\%config%\%name%.dll" "%output%\lib\%target-portable%\" /y
 xcopy "%source%\bin\%config%\%name%.xml" "%output%\lib\%target-portable%\" /y
 xcopy "%source%\bin\%config%\%name%.pdb" "%output%\lib\%target-portable%\" /y
 
-mkdir "%output%\src\%target-portable%\Properties"
-xcopy "Source\AssemblyVersion.cs" "%output%\src\%target-portable%\Properties\" /y
-xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%target-portable%\Properties\" /y
-xcopy "%source%\*.cs" "%output%\src\%target-portable%\" /y
+mkdir "%output%\src\%src-portable%\Properties"
+xcopy "Source\AssemblyVersion.cs" "%output%\src\%src-portable%\Properties\" /y
+xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%src-portable%\Properties\" /y
+xcopy "%source%\*.cs" "%output%\src\%src-portable%\" /y
 if "%debug%"=="1" pause
 if not "%errorlevel%"=="0" exit
 
@@ -53,10 +56,10 @@ xcopy "%source%\bin\%config%\%name%.dll" "%output%\lib\%target-sl5%\" /y
 xcopy "%source%\bin\%config%\%name%.xml" "%output%\lib\%target-sl5%\" /y
 xcopy "%source%\bin\%config%\%name%.pdb" "%output%\lib\%target-sl5%\" /y
 
-mkdir "%output%\src\%target-sl5%\Properties"
-xcopy "Source\AssemblyVersion.cs" "%output%\src\%target-sl5%\Properties\" /y
-xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%target-sl5%\Properties\" /y
-xcopy "%source%\*.cs" "%output%\src\%target-sl5%\" /y
+mkdir "%output%\src\%src-sl5%\Properties"
+xcopy "Source\AssemblyVersion.cs" "%output%\src\%src-sl5%\Properties\" /y
+xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%src-sl5%\Properties\" /y
+xcopy "%source%\*.cs" "%output%\src\%src-sl5%\" /y
 if "%debug%"=="1" pause
 if not "%errorlevel%"=="0" exit
 
@@ -67,12 +70,12 @@ xcopy "%source%.Net45\bin\%config%\%name%.dll" "%output%\lib\%target-net45%\" /y
 xcopy "%source%.Net45\bin\%config%\%name%.xml" "%output%\lib\%target-net45%\" /y
 xcopy "%source%.Net45\bin\%config%\%name%.pdb" "%output%\lib\%target-net45%\" /y
 
-mkdir "%output%\src\%target-net45%\Properties"
-xcopy "Source\AssemblyVersion.cs" "%output%\src\%target-net45%\Properties\" /y
-xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%target-net45%\Properties\" /y
-xcopy "%source%\*.cs" "%output%\src\%target-net45%\" /y
-del "%output%\src\%target-net45%\EntityBasePortable.cs"
-xcopy "%source%.Net45\*.cs" "%output%\src\%target-net45%\" /y
+mkdir "%output%\src\%src-net45%\Properties"
+xcopy "Source\AssemblyVersion.cs" "%output%\src\%src-net45%\Properties\" /y
+xcopy "%source%\Properties\AssemblyInfo.cs" "%output%\src\%src-net45%\Properties\" /y
+xcopy "%source%\*.cs" "%output%\src\%src-net45%\" /y
+del "%output%\src\%src-net45%\EntityBasePortable.cs"
+xcopy "%source%.Net45\*.cs" "%output%\src\%src-net45%\" /y
 if "%debug%"=="1" pause
 if not "%errorlevel%"=="0" exit
 

diff --git a/...Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWcfService.zip b/...Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWcfService.zip
diff --git a/...013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApi.zip b/...013/Deploy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApi.zip
diff --git a/...oy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApiPatterns.zip b/...oy/TrackableEntities.VS2013.Deploy/ProjectTemplates/Trackable/TrackableWebApiPatterns.zip
diff --git a/...Entities/Entities.Client.Net45/App.config → ...fService/Entities.Client.Net45/App.config b/...Entities/Entities.Client.Net45/App.config → ...fService/Entities.Client.Net45/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...nt.Net45/Entities.Client.Net45.vstemplate → ...nt.Net45/Entities.Client.Net45.vstemplate b/...nt.Net45/Entities.Client.Net45.vstemplate → ...nt.Net45/Entities.Client.Net45.vstemplate
diff --git a/...s.Client.Net45/Properties/AssemblyInfo.cs → ...s.Client.Net45/Properties/AssemblyInfo.cs b/...s.Client.Net45/Properties/AssemblyInfo.cs → ...s.Client.Net45/Properties/AssemblyInfo.cs
diff --git a/.../TrackableClientEntities.Net45.ReadMe.txt → .../TrackableClientEntities.Net45.ReadMe.txt b/.../TrackableClientEntities.Net45.ReadMe.txt → .../TrackableClientEntities.Net45.ReadMe.txt
diff --git a/...kableEntities.ClientTemplate.Net45.csproj → ...kableEntities.ClientTemplate.Net45.csproj b/...kableEntities.ClientTemplate.Net45.csproj → ...kableEntities.ClientTemplate.Net45.csproj
diff --git a/.../Entities.Client.Net45/__PreviewImage.png → .../Entities.Client.Net45/__PreviewImage.png b/.../Entities.Client.Net45/__PreviewImage.png → .../Entities.Client.Net45/__PreviewImage.png
diff --git a/.../Entities.Client.Net45/__TemplateIcon.png → .../Entities.Client.Net45/__TemplateIcon.png b/.../Entities.Client.Net45/__TemplateIcon.png → .../Entities.Client.Net45/__TemplateIcon.png
diff --git a/...ies/Entities.Client.Net45/packages.config → ...ice/Entities.Client.Net45/packages.config b/...ies/Entities.Client.Net45/packages.config → ...ice/Entities.Client.Net45/packages.config
diff --git a/...ities/Entities.Client.Portable/App.config → ...rvice/Entities.Client.Portable/App.config b/...ities/Entities.Client.Portable/App.config → ...rvice/Entities.Client.Portable/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...table/Entities.Client.Portable.vstemplate → ...table/Entities.Client.Portable.vstemplate b/...table/Entities.Client.Portable.vstemplate → ...table/Entities.Client.Portable.vstemplate
diff --git a/...lient.Portable/Properties/AssemblyInfo.cs → ...lient.Portable/Properties/AssemblyInfo.cs b/...lient.Portable/Properties/AssemblyInfo.cs → ...lient.Portable/Properties/AssemblyInfo.cs
diff --git a/...rtable/TrackableClientEntities.ReadMe.txt → ...rtable/TrackableClientEntities.ReadMe.txt b/...rtable/TrackableClientEntities.ReadMe.txt → ...rtable/TrackableClientEntities.ReadMe.txt
diff --git a/...e/TrackableEntities.ClientTemplate.csproj → ...e/TrackableEntities.ClientTemplate.csproj b/...e/TrackableEntities.ClientTemplate.csproj → ...e/TrackableEntities.ClientTemplate.csproj
diff --git a/...tities.Client.Portable/__PreviewImage.png → ...tities.Client.Portable/__PreviewImage.png b/...tities.Client.Portable/__PreviewImage.png → ...tities.Client.Portable/__PreviewImage.png
diff --git a/...tities.Client.Portable/__TemplateIcon.png → ...tities.Client.Portable/__TemplateIcon.png b/...tities.Client.Portable/__TemplateIcon.png → ...tities.Client.Portable/__TemplateIcon.png
diff --git a/.../Entities.Client.Portable/packages.config → .../Entities.Client.Portable/packages.config b/.../Entities.Client.Portable/packages.config → .../Entities.Client.Portable/packages.config
diff --git a/...ntities/Entities.Service.Net45/App.config → ...Service/Entities.Service.Net45/App.config b/...ntities/Entities.Service.Net45/App.config → ...Service/Entities.Service.Net45/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt b/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt b/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/...e.Net45/Entities.Service.Net45.vstemplate → ...e.Net45/Entities.Service.Net45.vstemplate b/...e.Net45/Entities.Service.Net45.vstemplate → ...e.Net45/Entities.Service.Net45.vstemplate
diff --git a/....Service.Net45/Properties/AssemblyInfo.cs → ....Service.Net45/Properties/AssemblyInfo.cs b/....Service.Net45/Properties/AssemblyInfo.cs → ....Service.Net45/Properties/AssemblyInfo.cs
diff --git a/...ce.Net45/TrackableService.Entities.csproj → ...ce.Net45/TrackableService.Entities.csproj b/...ce.Net45/TrackableService.Entities.csproj → ...ce.Net45/TrackableService.Entities.csproj
diff --git a/...Net45/TrackableServiceEntities.ReadMe.txt → ...Net45/TrackableServiceEntities.ReadMe.txt b/...Net45/TrackableServiceEntities.ReadMe.txt → ...Net45/TrackableServiceEntities.ReadMe.txt
diff --git a/...Entities.Service.Net45/__PreviewImage.png → ...Entities.Service.Net45/__PreviewImage.png b/...Entities.Service.Net45/__PreviewImage.png → ...Entities.Service.Net45/__PreviewImage.png
diff --git a/...Entities.Service.Net45/__TemplateIcon.png → ...Entities.Service.Net45/__TemplateIcon.png b/...Entities.Service.Net45/__TemplateIcon.png → ...Entities.Service.Net45/__TemplateIcon.png
diff --git a/...es/Entities.Service.Net45/packages.config → ...ce/Entities.Service.Net45/packages.config b/...es/Entities.Service.Net45/packages.config → ...ce/Entities.Service.Net45/packages.config
diff --git a/...Entities/Entities.Shared.Net45/App.config → ...fService/Entities.Shared.Net45/App.config b/...Entities/Entities.Shared.Net45/App.config → ...fService/Entities.Shared.Net45/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt b/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt b/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/...ed.Net45/Entities.Shared.Net45.vstemplate → ...ed.Net45/Entities.Shared.Net45.vstemplate b/...ed.Net45/Entities.Shared.Net45.vstemplate → ...ed.Net45/Entities.Shared.Net45.vstemplate
diff --git a/...s.Shared.Net45/Properties/AssemblyInfo.cs → ...s.Shared.Net45/Properties/AssemblyInfo.cs b/...s.Shared.Net45/Properties/AssemblyInfo.cs → ...s.Shared.Net45/Properties/AssemblyInfo.cs
diff --git a/...t45/TrackableShared.Entities.Net45.csproj → ...t45/TrackableShared.Entities.Net45.csproj b/...t45/TrackableShared.Entities.Net45.csproj → ...t45/TrackableShared.Entities.Net45.csproj
diff --git a/.../TrackableSharedEntities.Net45.ReadMe.txt → .../TrackableSharedEntities.Net45.ReadMe.txt b/.../TrackableSharedEntities.Net45.ReadMe.txt → .../TrackableSharedEntities.Net45.ReadMe.txt
diff --git a/.../Entities.Shared.Net45/__PreviewImage.png → .../Entities.Shared.Net45/__PreviewImage.png b/.../Entities.Shared.Net45/__PreviewImage.png → .../Entities.Shared.Net45/__PreviewImage.png
diff --git a/.../Entities.Shared.Net45/__TemplateIcon.png → .../Entities.Shared.Net45/__TemplateIcon.png b/.../Entities.Shared.Net45/__TemplateIcon.png → .../Entities.Shared.Net45/__TemplateIcon.png
diff --git a/...ies/Entities.Shared.Net45/packages.config → ...ice/Entities.Shared.Net45/packages.config b/...ies/Entities.Shared.Net45/packages.config → ...ice/Entities.Shared.Net45/packages.config
diff --git a/.../Entities.Shared.Portable.Data/App.config → .../Entities.Shared.Portable.Data/App.config b/.../Entities.Shared.Portable.Data/App.config → .../Entities.Shared.Portable.Data/App.config
diff --git a/.../Entities.Shared.Portable.Data.vstemplate → .../Entities.Shared.Portable.Data.vstemplate b/.../Entities.Shared.Portable.Data.vstemplate → .../Entities.Shared.Portable.Data.vstemplate
diff --git a/....Portable.Data/Properties/AssemblyInfo.cs → ....Portable.Data/Properties/AssemblyInfo.cs b/....Portable.Data/Properties/AssemblyInfo.cs → ....Portable.Data/Properties/AssemblyInfo.cs
diff --git a/...ties.Shared.Entities.Portable.Data.csproj → ...ties.Shared.Entities.Portable.Data.csproj b/...ties.Shared.Entities.Portable.Data.csproj → ...ties.Shared.Entities.Portable.Data.csproj
diff --git a/...leSharedEntities.Portable.Data.ReadMe.txt → ...leSharedEntities.Portable.Data.ReadMe.txt b/...leSharedEntities.Portable.Data.ReadMe.txt → ...leSharedEntities.Portable.Data.ReadMe.txt
diff --git a/...s.Shared.Portable.Data/__PreviewImage.png → ...s.Shared.Portable.Data/__PreviewImage.png b/...s.Shared.Portable.Data/__PreviewImage.png → ...s.Shared.Portable.Data/__PreviewImage.png
diff --git a/...s.Shared.Portable.Data/__TemplateIcon.png → ...s.Shared.Portable.Data/__TemplateIcon.png b/...s.Shared.Portable.Data/__TemplateIcon.png → ...s.Shared.Portable.Data/__TemplateIcon.png
diff --git a/...ties.Shared.Portable.Data/packages.config → ...ties.Shared.Portable.Data/packages.config b/...ties.Shared.Portable.Data/packages.config → ...ties.Shared.Portable.Data/packages.config
diff --git a/...ities/Entities.Shared.Portable/App.config → ...rvice/Entities.Shared.Portable/App.config b/...ities/Entities.Shared.Portable/App.config → ...rvice/Entities.Shared.Portable/App.config
diff --git a/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt b/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt b/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/...table/Entities.Shared.Portable.vstemplate → ...table/Entities.Shared.Portable.vstemplate b/...table/Entities.Shared.Portable.vstemplate → ...table/Entities.Shared.Portable.vstemplate
diff --git a/...hared.Portable/Properties/AssemblyInfo.cs → ...hared.Portable/Properties/AssemblyInfo.cs b/...hared.Portable/Properties/AssemblyInfo.cs → ...hared.Portable/Properties/AssemblyInfo.cs
diff --git a/...eEntities.Shared.Entities.Portable.csproj → ...eEntities.Shared.Entities.Portable.csproj b/...eEntities.Shared.Entities.Portable.csproj → ...eEntities.Shared.Entities.Portable.csproj
diff --git a/...ackableSharedEntities.Portable.ReadMe.txt → ...ackableSharedEntities.Portable.ReadMe.txt b/...ackableSharedEntities.Portable.ReadMe.txt → ...ackableSharedEntities.Portable.ReadMe.txt
diff --git a/...tities.Shared.Portable/__PreviewImage.png → ...tities.Shared.Portable/__PreviewImage.png b/...tities.Shared.Portable/__PreviewImage.png → ...tities.Shared.Portable/__PreviewImage.png
diff --git a/...tities.Shared.Portable/__TemplateIcon.png → ...tities.Shared.Portable/__TemplateIcon.png b/...tities.Shared.Portable/__TemplateIcon.png → ...tities.Shared.Portable/__TemplateIcon.png
diff --git a/.../Entities.Shared.Portable/packages.config → .../Entities.Shared.Portable/packages.config b/.../Entities.Shared.Portable/packages.config → .../Entities.Shared.Portable/packages.config
diff --git a/...VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/TrackableWcfService.vstemplate b/...VS2013/Output/Extract/ProjectTemplates/TrackableWcfService/TrackableWcfService.vstemplate
@@ -28,22 +28,22 @@
         ConsoleClient\ConsoleClient.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Net45">
-        Entities\Entities.Client.Net45\Entities.Client.Net45.vstemplate
+        Entities.Client.Net45\Entities.Client.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Portable">
-        Entities\Entities.Client.Portable\Entities.Client.Portable.vstemplate
+        Entities.Client.Portable\Entities.Client.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Service.Net45">
-        Entities\Entities.Service.Net45\Entities.Service.Net45.vstemplate
+        Entities.Service.Net45\Entities.Service.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Net45">
-        Entities\Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
+        Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Portable">
-        Entities\Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
+        Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Service.Data">
-        Entities\Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
+        Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
       </ProjectTemplateLink>
     </ProjectCollection>
   </TemplateContent>

diff --git a/...Entities/Entities.Client.Net45/App.config → ...leWebApi/Entities.Client.Net45/App.config b/...Entities/Entities.Client.Net45/App.config → ...leWebApi/Entities.Client.Net45/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...nt.Net45/Entities.Client.Net45.vstemplate → ...nt.Net45/Entities.Client.Net45.vstemplate b/...nt.Net45/Entities.Client.Net45.vstemplate → ...nt.Net45/Entities.Client.Net45.vstemplate
diff --git a/...s.Client.Net45/Properties/AssemblyInfo.cs → ...s.Client.Net45/Properties/AssemblyInfo.cs b/...s.Client.Net45/Properties/AssemblyInfo.cs → ...s.Client.Net45/Properties/AssemblyInfo.cs
diff --git a/.../TrackableClientEntities.Net45.ReadMe.txt → .../TrackableClientEntities.Net45.ReadMe.txt b/.../TrackableClientEntities.Net45.ReadMe.txt → .../TrackableClientEntities.Net45.ReadMe.txt
diff --git a/...kableEntities.ClientTemplate.Net45.csproj → ...kableEntities.ClientTemplate.Net45.csproj b/...kableEntities.ClientTemplate.Net45.csproj → ...kableEntities.ClientTemplate.Net45.csproj
diff --git a/.../Entities.Client.Net45/__PreviewImage.png → .../Entities.Client.Net45/__PreviewImage.png b/.../Entities.Client.Net45/__PreviewImage.png → .../Entities.Client.Net45/__PreviewImage.png
diff --git a/.../Entities.Client.Net45/__TemplateIcon.png → .../Entities.Client.Net45/__TemplateIcon.png b/.../Entities.Client.Net45/__TemplateIcon.png → .../Entities.Client.Net45/__TemplateIcon.png
diff --git a/...ies/Entities.Client.Net45/packages.config → ...Api/Entities.Client.Net45/packages.config b/...ies/Entities.Client.Net45/packages.config → ...Api/Entities.Client.Net45/packages.config
diff --git a/...ities/Entities.Client.Portable/App.config → ...ebApi/Entities.Client.Portable/App.config b/...ities/Entities.Client.Portable/App.config → ...ebApi/Entities.Client.Portable/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...table/Entities.Client.Portable.vstemplate → ...table/Entities.Client.Portable.vstemplate b/...table/Entities.Client.Portable.vstemplate → ...table/Entities.Client.Portable.vstemplate
diff --git a/...lient.Portable/Properties/AssemblyInfo.cs → ...lient.Portable/Properties/AssemblyInfo.cs b/...lient.Portable/Properties/AssemblyInfo.cs → ...lient.Portable/Properties/AssemblyInfo.cs
diff --git a/...rtable/TrackableClientEntities.ReadMe.txt → ...rtable/TrackableClientEntities.ReadMe.txt b/...rtable/TrackableClientEntities.ReadMe.txt → ...rtable/TrackableClientEntities.ReadMe.txt
diff --git a/...e/TrackableEntities.ClientTemplate.csproj → ...e/TrackableEntities.ClientTemplate.csproj b/...e/TrackableEntities.ClientTemplate.csproj → ...e/TrackableEntities.ClientTemplate.csproj
diff --git a/...tities.Client.Portable/__PreviewImage.png → ...tities.Client.Portable/__PreviewImage.png b/...tities.Client.Portable/__PreviewImage.png → ...tities.Client.Portable/__PreviewImage.png
diff --git a/...tities.Client.Portable/__TemplateIcon.png → ...tities.Client.Portable/__TemplateIcon.png b/...tities.Client.Portable/__TemplateIcon.png → ...tities.Client.Portable/__TemplateIcon.png
diff --git a/.../Entities.Client.Portable/packages.config → .../Entities.Client.Portable/packages.config b/.../Entities.Client.Portable/packages.config → .../Entities.Client.Portable/packages.config
diff --git a/...ntities/Entities.Service.Net45/App.config → ...eWebApi/Entities.Service.Net45/App.config b/...ntities/Entities.Service.Net45/App.config → ...eWebApi/Entities.Service.Net45/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt b/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt b/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/...e.Net45/Entities.Service.Net45.vstemplate → ...e.Net45/Entities.Service.Net45.vstemplate b/...e.Net45/Entities.Service.Net45.vstemplate → ...e.Net45/Entities.Service.Net45.vstemplate
diff --git a/....Service.Net45/Properties/AssemblyInfo.cs → ....Service.Net45/Properties/AssemblyInfo.cs b/....Service.Net45/Properties/AssemblyInfo.cs → ....Service.Net45/Properties/AssemblyInfo.cs
diff --git a/...ce.Net45/TrackableService.Entities.csproj → ...ce.Net45/TrackableService.Entities.csproj b/...ce.Net45/TrackableService.Entities.csproj → ...ce.Net45/TrackableService.Entities.csproj
diff --git a/...Net45/TrackableServiceEntities.ReadMe.txt → ...Net45/TrackableServiceEntities.ReadMe.txt b/...Net45/TrackableServiceEntities.ReadMe.txt → ...Net45/TrackableServiceEntities.ReadMe.txt
diff --git a/...Entities.Service.Net45/__PreviewImage.png → ...Entities.Service.Net45/__PreviewImage.png b/...Entities.Service.Net45/__PreviewImage.png → ...Entities.Service.Net45/__PreviewImage.png
diff --git a/...Entities.Service.Net45/__TemplateIcon.png → ...Entities.Service.Net45/__TemplateIcon.png b/...Entities.Service.Net45/__TemplateIcon.png → ...Entities.Service.Net45/__TemplateIcon.png
diff --git a/...es/Entities.Service.Net45/packages.config → ...pi/Entities.Service.Net45/packages.config b/...es/Entities.Service.Net45/packages.config → ...pi/Entities.Service.Net45/packages.config
diff --git a/...Entities/Entities.Shared.Net45/App.config → ...leWebApi/Entities.Shared.Net45/App.config b/...Entities/Entities.Shared.Net45/App.config → ...leWebApi/Entities.Shared.Net45/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt b/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt b/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/...ed.Net45/Entities.Shared.Net45.vstemplate → ...ed.Net45/Entities.Shared.Net45.vstemplate b/...ed.Net45/Entities.Shared.Net45.vstemplate → ...ed.Net45/Entities.Shared.Net45.vstemplate
diff --git a/...s.Shared.Net45/Properties/AssemblyInfo.cs → ...s.Shared.Net45/Properties/AssemblyInfo.cs b/...s.Shared.Net45/Properties/AssemblyInfo.cs → ...s.Shared.Net45/Properties/AssemblyInfo.cs
diff --git a/...t45/TrackableShared.Entities.Net45.csproj → ...t45/TrackableShared.Entities.Net45.csproj b/...t45/TrackableShared.Entities.Net45.csproj → ...t45/TrackableShared.Entities.Net45.csproj
diff --git a/.../TrackableSharedEntities.Net45.ReadMe.txt → .../TrackableSharedEntities.Net45.ReadMe.txt b/.../TrackableSharedEntities.Net45.ReadMe.txt → .../TrackableSharedEntities.Net45.ReadMe.txt
diff --git a/.../Entities.Shared.Net45/__PreviewImage.png → .../Entities.Shared.Net45/__PreviewImage.png b/.../Entities.Shared.Net45/__PreviewImage.png → .../Entities.Shared.Net45/__PreviewImage.png
diff --git a/.../Entities.Shared.Net45/__TemplateIcon.png → .../Entities.Shared.Net45/__TemplateIcon.png b/.../Entities.Shared.Net45/__TemplateIcon.png → .../Entities.Shared.Net45/__TemplateIcon.png
diff --git a/...ies/Entities.Shared.Net45/packages.config → ...Api/Entities.Shared.Net45/packages.config b/...ies/Entities.Shared.Net45/packages.config → ...Api/Entities.Shared.Net45/packages.config
diff --git a/.../Entities.Shared.Portable.Data/App.config → .../Entities.Shared.Portable.Data/App.config b/.../Entities.Shared.Portable.Data/App.config → .../Entities.Shared.Portable.Data/App.config
diff --git a/.../Entities.Shared.Portable.Data.vstemplate → .../Entities.Shared.Portable.Data.vstemplate b/.../Entities.Shared.Portable.Data.vstemplate → .../Entities.Shared.Portable.Data.vstemplate
diff --git a/....Portable.Data/Properties/AssemblyInfo.cs → ....Portable.Data/Properties/AssemblyInfo.cs b/....Portable.Data/Properties/AssemblyInfo.cs → ....Portable.Data/Properties/AssemblyInfo.cs
diff --git a/...ties.Shared.Entities.Portable.Data.csproj → ...ties.Shared.Entities.Portable.Data.csproj b/...ties.Shared.Entities.Portable.Data.csproj → ...ties.Shared.Entities.Portable.Data.csproj
diff --git a/...leSharedEntities.Portable.Data.ReadMe.txt → ...leSharedEntities.Portable.Data.ReadMe.txt b/...leSharedEntities.Portable.Data.ReadMe.txt → ...leSharedEntities.Portable.Data.ReadMe.txt
diff --git a/...s.Shared.Portable.Data/__PreviewImage.png → ...s.Shared.Portable.Data/__PreviewImage.png b/...s.Shared.Portable.Data/__PreviewImage.png → ...s.Shared.Portable.Data/__PreviewImage.png
diff --git a/...s.Shared.Portable.Data/__TemplateIcon.png → ...s.Shared.Portable.Data/__TemplateIcon.png b/...s.Shared.Portable.Data/__TemplateIcon.png → ...s.Shared.Portable.Data/__TemplateIcon.png
diff --git a/...ties.Shared.Portable.Data/packages.config → ...ties.Shared.Portable.Data/packages.config b/...ties.Shared.Portable.Data/packages.config → ...ties.Shared.Portable.Data/packages.config
diff --git a/...ities/Entities.Shared.Portable/App.config → ...ebApi/Entities.Shared.Portable/App.config b/...ities/Entities.Shared.Portable/App.config → ...ebApi/Entities.Shared.Portable/App.config
diff --git a/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt b/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt b/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/...table/Entities.Shared.Portable.vstemplate → ...table/Entities.Shared.Portable.vstemplate b/...table/Entities.Shared.Portable.vstemplate → ...table/Entities.Shared.Portable.vstemplate
diff --git a/...hared.Portable/Properties/AssemblyInfo.cs → ...hared.Portable/Properties/AssemblyInfo.cs b/...hared.Portable/Properties/AssemblyInfo.cs → ...hared.Portable/Properties/AssemblyInfo.cs
diff --git a/...eEntities.Shared.Entities.Portable.csproj → ...eEntities.Shared.Entities.Portable.csproj b/...eEntities.Shared.Entities.Portable.csproj → ...eEntities.Shared.Entities.Portable.csproj
diff --git a/...ackableSharedEntities.Portable.ReadMe.txt → ...ackableSharedEntities.Portable.ReadMe.txt b/...ackableSharedEntities.Portable.ReadMe.txt → ...ackableSharedEntities.Portable.ReadMe.txt
diff --git a/...tities.Shared.Portable/__PreviewImage.png → ...tities.Shared.Portable/__PreviewImage.png b/...tities.Shared.Portable/__PreviewImage.png → ...tities.Shared.Portable/__PreviewImage.png
diff --git a/...tities.Shared.Portable/__TemplateIcon.png → ...tities.Shared.Portable/__TemplateIcon.png b/...tities.Shared.Portable/__TemplateIcon.png → ...tities.Shared.Portable/__TemplateIcon.png
diff --git a/.../Entities.Shared.Portable/packages.config → .../Entities.Shared.Portable/packages.config b/.../Entities.Shared.Portable/packages.config → .../Entities.Shared.Portable/packages.config
diff --git a/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/TrackableWebApi.vstemplate b/Extensions/VS2013/Output/Extract/ProjectTemplates/TrackableWebApi/TrackableWebApi.vstemplate
@@ -25,22 +25,22 @@
         ConsoleClient\ConsoleClient.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Net45">
-        Entities\Entities.Client.Net45\Entities.Client.Net45.vstemplate
+        Entities.Client.Net45\Entities.Client.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Portable">
-        Entities\Entities.Client.Portable\Entities.Client.Portable.vstemplate
+        Entities.Client.Portable\Entities.Client.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Service.Net45">
-        Entities\Entities.Service.Net45\Entities.Service.Net45.vstemplate
+        Entities.Service.Net45\Entities.Service.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Net45">
-        Entities\Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
+        Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Portable">
-        Entities\Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
+        Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Service.Data">
-        Entities\Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
+        Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
       </ProjectTemplateLink>
     </ProjectCollection>
   </TemplateContent>

diff --git a/...Entities/Entities.Client.Net45/App.config → ...Patterns/Entities.Client.Net45/App.config b/...Entities/Entities.Client.Net45/App.config → ...Patterns/Entities.Client.Net45/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...nt.Net45/Entities.Client.Net45.vstemplate → ...nt.Net45/Entities.Client.Net45.vstemplate b/...nt.Net45/Entities.Client.Net45.vstemplate → ...nt.Net45/Entities.Client.Net45.vstemplate
diff --git a/...s.Client.Net45/Properties/AssemblyInfo.cs → ...s.Client.Net45/Properties/AssemblyInfo.cs b/...s.Client.Net45/Properties/AssemblyInfo.cs → ...s.Client.Net45/Properties/AssemblyInfo.cs
diff --git a/.../TrackableClientEntities.Net45.ReadMe.txt → .../TrackableClientEntities.Net45.ReadMe.txt b/.../TrackableClientEntities.Net45.ReadMe.txt → .../TrackableClientEntities.Net45.ReadMe.txt
diff --git a/...kableEntities.ClientTemplate.Net45.csproj → ...kableEntities.ClientTemplate.Net45.csproj b/...kableEntities.ClientTemplate.Net45.csproj → ...kableEntities.ClientTemplate.Net45.csproj
diff --git a/.../Entities.Client.Net45/__PreviewImage.png → .../Entities.Client.Net45/__PreviewImage.png b/.../Entities.Client.Net45/__PreviewImage.png → .../Entities.Client.Net45/__PreviewImage.png
diff --git a/.../Entities.Client.Net45/__TemplateIcon.png → .../Entities.Client.Net45/__TemplateIcon.png b/.../Entities.Client.Net45/__TemplateIcon.png → .../Entities.Client.Net45/__TemplateIcon.png
diff --git a/...ies/Entities.Client.Net45/packages.config → ...rns/Entities.Client.Net45/packages.config b/...ies/Entities.Client.Net45/packages.config → ...rns/Entities.Client.Net45/packages.config
diff --git a/...ities/Entities.Client.Portable/App.config → ...terns/Entities.Client.Portable/App.config b/...ities/Entities.Client.Portable/App.config → ...terns/Entities.Client.Portable/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...table/Entities.Client.Portable.vstemplate → ...table/Entities.Client.Portable.vstemplate b/...table/Entities.Client.Portable.vstemplate → ...table/Entities.Client.Portable.vstemplate
diff --git a/...lient.Portable/Properties/AssemblyInfo.cs → ...lient.Portable/Properties/AssemblyInfo.cs b/...lient.Portable/Properties/AssemblyInfo.cs → ...lient.Portable/Properties/AssemblyInfo.cs
diff --git a/...rtable/TrackableClientEntities.ReadMe.txt → ...rtable/TrackableClientEntities.ReadMe.txt b/...rtable/TrackableClientEntities.ReadMe.txt → ...rtable/TrackableClientEntities.ReadMe.txt
diff --git a/...e/TrackableEntities.ClientTemplate.csproj → ...e/TrackableEntities.ClientTemplate.csproj b/...e/TrackableEntities.ClientTemplate.csproj → ...e/TrackableEntities.ClientTemplate.csproj
diff --git a/...tities.Client.Portable/__PreviewImage.png → ...tities.Client.Portable/__PreviewImage.png b/...tities.Client.Portable/__PreviewImage.png → ...tities.Client.Portable/__PreviewImage.png
diff --git a/...tities.Client.Portable/__TemplateIcon.png → ...tities.Client.Portable/__TemplateIcon.png b/...tities.Client.Portable/__TemplateIcon.png → ...tities.Client.Portable/__TemplateIcon.png
diff --git a/.../Entities.Client.Portable/packages.config → .../Entities.Client.Portable/packages.config b/.../Entities.Client.Portable/packages.config → .../Entities.Client.Portable/packages.config
diff --git a/...ntities/Entities.Service.Net45/App.config → ...atterns/Entities.Service.Net45/App.config b/...ntities/Entities.Service.Net45/App.config → ...atterns/Entities.Service.Net45/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt b/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt b/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/...e.Net45/Entities.Service.Net45.vstemplate → ...e.Net45/Entities.Service.Net45.vstemplate b/...e.Net45/Entities.Service.Net45.vstemplate → ...e.Net45/Entities.Service.Net45.vstemplate
diff --git a/....Service.Net45/Properties/AssemblyInfo.cs → ....Service.Net45/Properties/AssemblyInfo.cs b/....Service.Net45/Properties/AssemblyInfo.cs → ....Service.Net45/Properties/AssemblyInfo.cs
diff --git a/...ce.Net45/TrackableService.Entities.csproj → ...ce.Net45/TrackableService.Entities.csproj b/...ce.Net45/TrackableService.Entities.csproj → ...ce.Net45/TrackableService.Entities.csproj
diff --git a/...Net45/TrackableServiceEntities.ReadMe.txt → ...Net45/TrackableServiceEntities.ReadMe.txt b/...Net45/TrackableServiceEntities.ReadMe.txt → ...Net45/TrackableServiceEntities.ReadMe.txt
diff --git a/...Entities.Service.Net45/__PreviewImage.png → ...Entities.Service.Net45/__PreviewImage.png b/...Entities.Service.Net45/__PreviewImage.png → ...Entities.Service.Net45/__PreviewImage.png
diff --git a/...Entities.Service.Net45/__TemplateIcon.png → ...Entities.Service.Net45/__TemplateIcon.png b/...Entities.Service.Net45/__TemplateIcon.png → ...Entities.Service.Net45/__TemplateIcon.png
diff --git a/...es/Entities.Service.Net45/packages.config → ...ns/Entities.Service.Net45/packages.config b/...es/Entities.Service.Net45/packages.config → ...ns/Entities.Service.Net45/packages.config
diff --git a/...Entities/Entities.Shared.Net45/App.config → ...Patterns/Entities.Shared.Net45/App.config b/...Entities/Entities.Shared.Net45/App.config → ...Patterns/Entities.Shared.Net45/App.config
diff --git a/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4 b/...mplates/EFModelFromDatabase/Context.cs.t4 → ...mplates/EFModelFromDatabase/Context.cs.t4
diff --git a/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4 b/...ates/EFModelFromDatabase/EntityType.cs.t4 → ...ates/EFModelFromDatabase/EntityType.cs.t4
diff --git a/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt b/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt b/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/...ed.Net45/Entities.Shared.Net45.vstemplate → ...ed.Net45/Entities.Shared.Net45.vstemplate b/...ed.Net45/Entities.Shared.Net45.vstemplate → ...ed.Net45/Entities.Shared.Net45.vstemplate
diff --git a/...s.Shared.Net45/Properties/AssemblyInfo.cs → ...s.Shared.Net45/Properties/AssemblyInfo.cs b/...s.Shared.Net45/Properties/AssemblyInfo.cs → ...s.Shared.Net45/Properties/AssemblyInfo.cs
diff --git a/...t45/TrackableShared.Entities.Net45.csproj → ...t45/TrackableShared.Entities.Net45.csproj b/...t45/TrackableShared.Entities.Net45.csproj → ...t45/TrackableShared.Entities.Net45.csproj
diff --git a/.../TrackableSharedEntities.Net45.ReadMe.txt → .../TrackableSharedEntities.Net45.ReadMe.txt b/.../TrackableSharedEntities.Net45.ReadMe.txt → .../TrackableSharedEntities.Net45.ReadMe.txt
diff --git a/.../Entities.Shared.Net45/__PreviewImage.png → .../Entities.Shared.Net45/__PreviewImage.png b/.../Entities.Shared.Net45/__PreviewImage.png → .../Entities.Shared.Net45/__PreviewImage.png
diff --git a/.../Entities.Shared.Net45/__TemplateIcon.png → .../Entities.Shared.Net45/__TemplateIcon.png b/.../Entities.Shared.Net45/__TemplateIcon.png → .../Entities.Shared.Net45/__TemplateIcon.png
diff --git a/...ies/Entities.Shared.Net45/packages.config → ...rns/Entities.Shared.Net45/packages.config b/...ies/Entities.Shared.Net45/packages.config → ...rns/Entities.Shared.Net45/packages.config
diff --git a/.../Entities.Shared.Portable.Data/App.config → .../Entities.Shared.Portable.Data/App.config b/.../Entities.Shared.Portable.Data/App.config → .../Entities.Shared.Portable.Data/App.config
diff --git a/.../Entities.Shared.Portable.Data.vstemplate → .../Entities.Shared.Portable.Data.vstemplate b/.../Entities.Shared.Portable.Data.vstemplate → .../Entities.Shared.Portable.Data.vstemplate
diff --git a/....Portable.Data/Properties/AssemblyInfo.cs → ....Portable.Data/Properties/AssemblyInfo.cs b/....Portable.Data/Properties/AssemblyInfo.cs → ....Portable.Data/Properties/AssemblyInfo.cs
diff --git a/...ties.Shared.Entities.Portable.Data.csproj → ...ties.Shared.Entities.Portable.Data.csproj b/...ties.Shared.Entities.Portable.Data.csproj → ...ties.Shared.Entities.Portable.Data.csproj
diff --git a/...leSharedEntities.Portable.Data.ReadMe.txt → ...leSharedEntities.Portable.Data.ReadMe.txt b/...leSharedEntities.Portable.Data.ReadMe.txt → ...leSharedEntities.Portable.Data.ReadMe.txt
diff --git a/...s.Shared.Portable.Data/__PreviewImage.png → ...s.Shared.Portable.Data/__PreviewImage.png b/...s.Shared.Portable.Data/__PreviewImage.png → ...s.Shared.Portable.Data/__PreviewImage.png
diff --git a/...s.Shared.Portable.Data/__TemplateIcon.png → ...s.Shared.Portable.Data/__TemplateIcon.png b/...s.Shared.Portable.Data/__TemplateIcon.png → ...s.Shared.Portable.Data/__TemplateIcon.png
diff --git a/...ties.Shared.Portable.Data/packages.config → ...ties.Shared.Portable.Data/packages.config b/...ties.Shared.Portable.Data/packages.config → ...ties.Shared.Portable.Data/packages.config
diff --git a/...ities/Entities.Shared.Portable/App.config → ...terns/Entities.Shared.Portable/App.config b/...ities/Entities.Shared.Portable/App.config → ...terns/Entities.Shared.Portable/App.config
diff --git a/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt b/...lates/ReverseEngineerCodeFirst/Context.tt → ...lates/ReverseEngineerCodeFirst/Context.tt
diff --git a/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt b/...plates/ReverseEngineerCodeFirst/Entity.tt → ...plates/ReverseEngineerCodeFirst/Entity.tt
diff --git a/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt b/...lates/ReverseEngineerCodeFirst/Mapping.tt → ...lates/ReverseEngineerCodeFirst/Mapping.tt
diff --git a/...table/Entities.Shared.Portable.vstemplate → ...table/Entities.Shared.Portable.vstemplate b/...table/Entities.Shared.Portable.vstemplate → ...table/Entities.Shared.Portable.vstemplate
diff --git a/...hared.Portable/Properties/AssemblyInfo.cs → ...hared.Portable/Properties/AssemblyInfo.cs b/...hared.Portable/Properties/AssemblyInfo.cs → ...hared.Portable/Properties/AssemblyInfo.cs
diff --git a/...eEntities.Shared.Entities.Portable.csproj → ...eEntities.Shared.Entities.Portable.csproj b/...eEntities.Shared.Entities.Portable.csproj → ...eEntities.Shared.Entities.Portable.csproj
diff --git a/...ackableSharedEntities.Portable.ReadMe.txt → ...ackableSharedEntities.Portable.ReadMe.txt b/...ackableSharedEntities.Portable.ReadMe.txt → ...ackableSharedEntities.Portable.ReadMe.txt
diff --git a/...tities.Shared.Portable/__PreviewImage.png → ...tities.Shared.Portable/__PreviewImage.png b/...tities.Shared.Portable/__PreviewImage.png → ...tities.Shared.Portable/__PreviewImage.png
diff --git a/...tities.Shared.Portable/__TemplateIcon.png → ...tities.Shared.Portable/__TemplateIcon.png b/...tities.Shared.Portable/__TemplateIcon.png → ...tities.Shared.Portable/__TemplateIcon.png
diff --git a/.../Entities.Shared.Portable/packages.config → .../Entities.Shared.Portable/packages.config b/.../Entities.Shared.Portable/packages.config → .../Entities.Shared.Portable/packages.config
diff --git a/...utput/Extract/ProjectTemplates/TrackableWebApiPatterns/TrackableWebApiPatterns.vstemplate b/...utput/Extract/ProjectTemplates/TrackableWebApiPatterns/TrackableWebApiPatterns.vstemplate
@@ -31,22 +31,22 @@
         ConsoleClient\ConsoleClient.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Net45">
-        Entities\Entities.Client.Net45\Entities.Client.Net45.vstemplate
+        Entities.Client.Net45\Entities.Client.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Client.Portable">
-        Entities\Entities.Client.Portable\Entities.Client.Portable.vstemplate
+        Entities.Client.Portable\Entities.Client.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Service.Net45">
-        Entities\Entities.Service.Net45\Entities.Service.Net45.vstemplate
+        Entities.Service.Net45\Entities.Service.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Net45">
-        Entities\Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
+        Entities.Shared.Net45\Entities.Shared.Net45.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Entities.Shared.Portable">
-        Entities\Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
+        Entities.Shared.Portable\Entities.Shared.Portable.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Service.Data">
-        Entities\Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
+        Entities.Shared.Portable.Data\Entities.Shared.Portable.Data.vstemplate
       </ProjectTemplateLink>
     </ProjectCollection>
   </TemplateContent>

diff --git a/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWcfService.zip b/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWcfService.zip
diff --git a/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApi.zip b/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApi.zip
diff --git a/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApiPatterns.zip b/Extensions/VS2013/Output/Zip/ProjectTemplates/TrackableWebApiPatterns.zip
diff --git a/.../VSIX/TrackableEntities.VS2013-2.2.5.vsix → .../VSIX/TrackableEntities.VS2013-2.5.0.vsix b/.../VSIX/TrackableEntities.VS2013-2.2.5.vsix → .../VSIX/TrackableEntities.VS2013-2.5.0.vsix
diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.0.nupkg b/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.0.nupkg
diff --git a/.../Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.0.symbols.nupkg b/.../Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.2.5.0.symbols.nupkg
diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.nuspec b/NuGet/Packages/TrackableEntities.Client.Net4/TrackableEntities.Client.Net4.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>TrackableEntities.Client.Net4</id>
-    	<version>2.1.1.0-beta1</version>
+    	<version>2.5.0</version>
         <title>Trackable Entities Client for .NET 4.0</title>
         <authors>Tony Sneed</authors>
         <owners>Tony Sneed</owners>
@@ -15,8 +15,8 @@
         <tags>change-tracking entity-framework n-tier wcf web-api</tags>
         <dependencies>
             <group targetFramework="net40">
-                <dependency id="Newtonsoft.Json" version="6.0.3" />
-                <dependency id="TrackableEntities.Common" version="2.1.0.0" />
+                <dependency id="Newtonsoft.Json" version="6.0.8" />
+                <dependency id="TrackableEntities.Common" version="2.5.0" />
             </group>
         </dependencies>
     </metadata>

diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.dll b/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.dll
diff --git a/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.pdb b/NuGet/Packages/TrackableEntities.Client.Net4/lib/net40/TrackableEntities.Client.pdb