Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Anthony Sneed committed May 15, 2015
2 parents f93b85f + 4fc454c commit 6541f0b
Show file tree
Hide file tree
Showing 312 changed files with 1,344 additions and 4,665 deletions.
85 changes: 64 additions & 21 deletions Extensions/Common/Misc/ReleaseNotes-v2.5.rtf

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<DefaultName>TrackableWcfService.cs</DefaultName>
<Name>Trackable WCF Service Type</Name>
<Description>WCF service with read-write operations using Trackable Entities and Entity Framework. Created by Tony Sneed. For more information visit http://trackable.codeplex.com.</Description>
<Description>WCF service with read-write operations using Trackable Entities and Entity Framework.</Description>
<ProjectType>CSharp</ProjectType>
<SortOrder>10</SortOrder>
<Icon>__TemplateIcon.png</Icon>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework">
<HintPath>..\..\..\VS2013\Deploy\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
<HintPath>..\..\..\VS2013\Deploy\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework.SqlServer">
<HintPath>..\..\..\VS2013\Deploy\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\..\..\VS2013\Deploy\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand All @@ -58,8 +58,8 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="TrackableEntities.Common">
<HintPath>..\..\..\VS2013\Deploy\packages\TrackableEntities.Common.2.5.0\lib\portable-net40+sl50+win+wpa81+wp80\TrackableEntities.Common.dll</HintPath>
<Reference Include="TrackableEntities.Common, Version=2.5.0.0, Culture=neutral, PublicKeyToken=b10b51e7b9be6a2e, processorArchitecture=MSIL">
<HintPath>..\..\..\VS2013\Deploy\packages\TrackableEntities.Common.2.5.2.1\lib\portable-net40+sl50+win+wpa81+wp80\TrackableEntities.Common.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.2" targetFramework="net45" />
<package id="TrackableEntities.Common" version="2.5.0" targetFramework="net45" />
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
<package id="TrackableEntities.Common" version="2.5.2.1" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework">
<HintPath>..\..\..\VS2013\Deploy\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\..\..\VS2013\Deploy\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework.SqlServer">
<HintPath>..\..\..\VS2013\Deploy\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\..\..\VS2013\Deploy\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
Expand All @@ -70,8 +71,9 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="TrackableEntities.Common">
<HintPath>..\..\..\VS2013\Deploy\packages\TrackableEntities.Common.2.5.0\lib\portable-net40+sl50+win+wpa81+wp80\TrackableEntities.Common.dll</HintPath>
<Reference Include="TrackableEntities.Common, Version=2.5.0.0, Culture=neutral, PublicKeyToken=b10b51e7b9be6a2e, processorArchitecture=MSIL">
<HintPath>..\..\..\VS2013\Deploy\packages\TrackableEntities.Common.2.5.2.1\lib\portable-net40+sl50+win+wpa81+wp80\TrackableEntities.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.2" targetFramework="net45" />
<package id="TrackableEntities.Common" version="2.5.0" targetFramework="net45" />
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
<package id="TrackableEntities.Common" version="2.5.2.1" targetFramework="net45" />
</packages>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -218,65 +218,65 @@
<Content Include="Packages\WcfSerializationHelper.1.0.0.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\EntityFramework.6.1.2.nupkg">
<Content Include="Packages\Newtonsoft.Json.6.0.8.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\Newtonsoft.Json.6.0.8.nupkg">
<Content Include="Packages\TrackableEntities.CodeTemplates.Client.Net45.2.5.0.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.Client.2.5.0.nupkg">
<Content Include="Packages\TrackableEntities.CodeTemplates.Client.Portable.2.5.0.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.Client.Net4.2.5.0.nupkg">
<Content Include="Packages\TrackableEntities.CodeTemplates.Service.Net45.2.5.0.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.Common.2.5.0.nupkg">
<Content Include="Packages\TrackableEntities.CodeTemplates.Shared.Net45.2.5.0.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.EF.5.2.5.0.nupkg">
<Content Include="Packages\TrackableEntities.CodeTemplates.Shared.Portable.2.5.0.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.EF.6.2.5.0.nupkg">
<Content Include="ProjectTemplates\Trackable\TrackableEntities.zip">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.Patterns.2.5.0.nupkg">
<Content Include="ItemTemplates\Trackable\Data\CSharpDbContext.Shared.zip">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Packages\TrackableEntities.Patterns.EF.6.2.5.0.nupkg">
<Content Include="Packages\WebActivator.1.4.4.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.CodeTemplates.Client.Net45.2.5.0.nupkg">
<Content Include="Packages\EntityFramework.6.1.3.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.CodeTemplates.Client.Portable.2.5.0.nupkg">
<Content Include="Packages\SimpleInjector.2.7.3.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.CodeTemplates.Service.Net45.2.5.0.nupkg">
<Content Include="Packages\SimpleInjector.Extensions.ExecutionContextScoping.2.7.3.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.CodeTemplates.Shared.Net45.2.5.0.nupkg">
<Content Include="Packages\SimpleInjector.Integration.WebApi.2.7.3.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\TrackableEntities.CodeTemplates.Shared.Portable.2.5.0.nupkg">
<Content Include="Packages\TrackableEntities.Client.2.5.2.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="ProjectTemplates\Trackable\TrackableEntities.zip">
<Content Include="Packages\TrackableEntities.Client.Net4.2.5.2.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="ItemTemplates\Trackable\Data\CSharpDbContext.Shared.zip">
<Content Include="Packages\TrackableEntities.EF.5.2.5.2.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Packages\SimpleInjector.2.7.2.nupkg">
<Content Include="Packages\TrackableEntities.EF.6.2.5.2.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\SimpleInjector.Extensions.ExecutionContextScoping.2.7.2.nupkg">
<Content Include="Packages\TrackableEntities.Patterns.2.5.2.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\SimpleInjector.Integration.WebApi.2.7.2.nupkg">
<Content Include="Packages\TrackableEntities.Patterns.EF.6.2.5.2.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\WebActivator.1.4.4.nupkg">
<Content Include="Packages\TrackableEntities.Common.2.5.2.1.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="source.extension.vsixmanifest">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="TrackableEntities.VS2013..ce1f4a31-3d64-4a4a-a8d4-f84a44a753e7" Version="2.5.0" Language="en-US" Publisher="Tony Sneed" />
<Identity Id="TrackableEntities.VS2013..ce1f4a31-3d64-4a4a-a8d4-f84a44a753e7" Version="2.5.2" Language="en-US" Publisher="Tony Sneed" />
<DisplayName>Trackable Entities for Visual Studio 2013</DisplayName>
<Description xml:space="preserve">N-Tier support for Entity Framework with Visual Studio project and item templates for quickly building n-tier applications using entities that are change-tracked on the client and persisted on the server via WCF or ASP.NET Web API.</Description>
<MoreInfo>http://trackable.codeplex.com</MoreInfo>
<MoreInfo>http://tonysneed.github.io/trackable-entities</MoreInfo>
<License>License.txt</License>
<ReleaseNotes>ReleaseNotes-v2.5.rtf</ReleaseNotes>
<Icon>tracking-small.png</Icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<DefaultName>EntityController.cs</DefaultName>
<Name>Entity Web API Controller (Patterns)</Name>
<Description>Entity Web API Controller for Patterns WebApi project. Created by Tony Sneed. For more information visit http://trackable.codeplex.com.</Description>
<Description>Entity Web API Controller for Patterns WebApi project.</Description>
<ProjectType>CSharp</ProjectType>
<SortOrder>10</SortOrder>
<Icon>__TemplateIcon.png</Icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<DefaultName>EntityRepository.cs</DefaultName>
<Name>Entity Repository Class (Patterns)</Name>
<Description>Entity Repository Class for Patterns EF project. Created by Tony Sneed. For more information visit http://trackable.codeplex.com.</Description>
<Description>Entity Repository Class for Patterns EF project.</Description>
<ProjectType>CSharp</ProjectType>
<SortOrder>10</SortOrder>
<Icon>__TemplateIcon.png</Icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<DefaultName>ExampleUnitOfWork.cs</DefaultName>
<Name>Example Unit of Work Class (Patterns)</Name>
<Description>Example Unit of Work Class for Patterns EF project. Created by Tony Sneed. For more information visit http://trackable.codeplex.com.</Description>
<Description>Example Unit of Work Class for Patterns EF project.</Description>
<ProjectType>CSharp</ProjectType>
<SortOrder>10</SortOrder>
<Icon>__TemplateIcon.png</Icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<DefaultName>IDatabaseContext.cs</DefaultName>
<Name>Database Context Interface (Patterns)</Name>
<Description>Database Context Interface for Patterns EF project. Created by Tony Sneed. For more information visit http://trackable.codeplex.com.</Description>
<Description>Database Context Interface for Patterns EF project.</Description>
<ProjectType>CSharp</ProjectType>
<SortOrder>10</SortOrder>
<Icon>__TemplateIcon.png</Icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<DefaultName>IEntityRepository.cs</DefaultName>
<Name>Entity Repository Interface (Patterns)</Name>
<Description>Entity Repository Interface for Patterns Persistence project. Created by Tony Sneed. For more information visit http://trackable.codeplex.com.</Description>
<Description>Entity Repository Interface for Patterns Persistence project.</Description>
<ProjectType>CSharp</ProjectType>
<SortOrder>10</SortOrder>
<Icon>__TemplateIcon.png</Icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<DefaultName>IExampleUnitOfWork.cs</DefaultName>
<Name>Example Unit of Work Interface (Patterns)</Name>
<Description>Example Unit of Work Interface for Patterns Persistence project. Created by Tony Sneed. For more information visit http://trackable.codeplex.com.</Description>
<Description>Example Unit of Work Interface for Patterns Persistence project.</Description>
<ProjectType>CSharp</ProjectType>
<SortOrder>10</SortOrder>
<Icon>__TemplateIcon.png</Icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<DefaultName>WebApiController.cs</DefaultName>
<Name>Entity Web API Controller</Name>
<Description>Entity Web API Controller for WebApi project. Created by Tony Sneed. For more information visit http://trackable.codeplex.com.</Description>
<Description>Entity Web API Controller for WebApi project.</Description>
<ProjectType>CSharp</ProjectType>
<SortOrder>10</SortOrder>
<Icon>__TemplateIcon.png</Icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<packages repository="extension"
repositoryId="TrackableEntities.VS2013..ce1f4a31-3d64-4a4a-a8d4-f84a44a753e7">
<package id="Newtonsoft.Json" version="6.0.8" />
<package id="TrackableEntities.Common" version="2.5.0" />
<package id="TrackableEntities.Common" version="2.5.2.1" />
<package id="TrackableEntities.CodeTemplates.Client.Net45" version="2.5.0" />
<package id="TrackableEntities.Client" version="2.5.0" />
<package id="TrackableEntities.Client" version="2.5.2" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
<Reference Include="System.Xml" />
<Reference Include="TrackableEntities.Client, Version=2.5.0.0, Culture=neutral, PublicKeyToken=b10b51e7b9be6a2e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\TrackableEntities.Client.2.5.0\lib\net45\TrackableEntities.Client.dll</HintPath>
<HintPath>..\packages\TrackableEntities.Client.2.5.2\lib\net45\TrackableEntities.Client.dll</HintPath>
</Reference>
<Reference Include="TrackableEntities.Common, Version=2.5.0.0, Culture=neutral, PublicKeyToken=b10b51e7b9be6a2e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\TrackableEntities.Common.2.5.0\lib\portable-net40+sl50+win+wpa81+wp80\TrackableEntities.Common.dll</HintPath>
<HintPath>..\packages\TrackableEntities.Common.2.5.2.1\lib\portable-net40+sl50+win+wpa81+wp80\TrackableEntities.Common.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
<package id="TrackableEntities.Client" version="2.5.0" targetFramework="net451" />
<package id="TrackableEntities.Client" version="2.5.2" targetFramework="net451" />
<package id="TrackableEntities.CodeTemplates.Client.Net45" version="2.5.0" targetFramework="net451" />
<package id="TrackableEntities.Common" version="2.5.0" targetFramework="net451" />
<package id="TrackableEntities.Common" version="2.5.2.1" targetFramework="net451" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<packages repository="extension"
repositoryId="TrackableEntities.VS2013..ce1f4a31-3d64-4a4a-a8d4-f84a44a753e7">
<package id="Newtonsoft.Json" version="6.0.8" />
<package id="TrackableEntities.Common" version="2.5.0" />
<package id="TrackableEntities.Common" version="2.5.2.1" />
<package id="TrackableEntities.CodeTemplates.Client.Portable" version="2.5.0" />
<package id="TrackableEntities.Client" version="2.5.0" />
<package id="TrackableEntities.Client" version="2.5.2" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\portable-net45+wp80+win8+wpa81+aspnetcore50\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="TrackableEntities.Client">
<HintPath>..\packages\TrackableEntities.Client.2.5.0\lib\portable-net45+wp80+win8+wpa81\TrackableEntities.Client.dll</HintPath>
<HintPath>..\packages\TrackableEntities.Client.2.5.2\lib\portable-net45+wp80+win8+wpa81\TrackableEntities.Client.dll</HintPath>
</Reference>
<Reference Include="TrackableEntities.Common">
<HintPath>..\packages\TrackableEntities.Common.2.5.0\lib\portable-net40+sl50+win+wpa81+wp80\TrackableEntities.Common.dll</HintPath>
<HintPath>..\packages\TrackableEntities.Common.2.5.2.1\lib\portable-net40+sl50+win+wpa81+wp80\TrackableEntities.Common.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="portable-net45+win+wpa81+wp80" />
<package id="TrackableEntities.Client" version="2.5.0" targetFramework="portable-net45+win+wpa81+wp80" />
<package id="TrackableEntities.Client" version="2.5.2" targetFramework="portable-net45+win+wpa81+wp80" />
<package id="TrackableEntities.CodeTemplates.Client.Portable" version="2.5.0" targetFramework="portable-net45+win+wpa81+wp80" />
<package id="TrackableEntities.Common" version="2.5.0" targetFramework="portable-net45+win+wpa81+wp80" />
<package id="TrackableEntities.Common" version="2.5.2.1" targetFramework="portable-net45+win+wpa81+wp80" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
<packages repository="extension"
repositoryId="TrackableEntities.VS2013..ce1f4a31-3d64-4a4a-a8d4-f84a44a753e7">
<package id="Newtonsoft.Json" version="6.0.8" />
<package id="EntityFramework" version="6.1.2" />
<package id="EntityFramework" version="6.1.3" />
<package id="TrackableEntities.CodeTemplates.Service.Net45" version="2.5.0" />
<package id="TrackableEntities.Common" version="2.5.0" />
<package id="TrackableEntities.EF.6" version="2.5.0" />
<package id="TrackableEntities.Common" version="2.5.2.1" />
<package id="TrackableEntities.EF.6" version="2.5.2" />
</packages>
</WizardData>
</VSTemplate>
Loading

0 comments on commit 6541f0b

Please sign in to comment.