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 Dec 5, 2015
2 parents 6541f0b + 543eccc commit 8daca06
Show file tree
Hide file tree
Showing 919 changed files with 155,380 additions and 9,194 deletions.
521 changes: 139 additions & 382 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 @@ -40,12 +40,12 @@
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework">
<HintPath>..\..\..\VS2013\Deploy\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<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>
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand All @@ -59,7 +59,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<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>
<HintPath>..\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
Expand Up @@ -32,16 +32,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework">
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework.SqlServer">
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand All @@ -52,11 +53,13 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="TrackableEntities.Common">
<Reference Include="TrackableEntities.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b10b51e7b9be6a2e, processorArchitecture=MSIL">
<HintPath>..\packages\TrackableEntities.Common.2.0.0.0\lib\portable-net40+sl5+win8+windowsphone8\TrackableEntities.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="TrackableEntities.EF.6">
<Reference Include="TrackableEntities.EF.6, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b10b51e7b9be6a2e, processorArchitecture=MSIL">
<HintPath>..\packages\TrackableEntities.EF.6.2.0.0.0\lib\net45\TrackableEntities.EF.6.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Extensions/Common/Wizards/TemplateWizardHarness/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="TrackableEntities.Common" publicKeyToken="b10b51e7b9be6a2e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.5.0.0" newVersion="2.5.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
</PropertyGroup>
<ItemGroup>
<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>
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<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>
<HintPath>..\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 @@ -72,7 +72,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<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>
<HintPath>..\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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,36 +47,33 @@ public void RunStarted(object automationObject,

public void BeforeOpeningFile(ProjectItem projectItem)
{
Wizard.BeforeOpeningFile(projectItem);
}

public void ProjectFinishedGenerating(Project project)
{
MoveGeneratedProject(ref project);
Wizard.ProjectFinishedGenerating(project);
PostProjectFinishedGenerating(project);
}

public void ProjectItemFinishedGenerating(ProjectItem projectItem)
{
Wizard.ProjectItemFinishedGenerating(projectItem);
}

public void RunFinished()
{
Wizard.RunFinished();
}

public bool ShouldAddProjectItem(string filePath)
{
return Wizard.ShouldAddProjectItem(filePath);
return true;
}

protected virtual void ProcessEntitiesTemplate(
Dictionary<string, string> replacementsDictionary, string templateName)
{
}

protected virtual void PostProjectFinishedGenerating(Project project)
protected virtual void MoveGeneratedProject(ref Project project)
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,24 @@ protected override void ProcessEntitiesTemplate(
}
}

// Store destination directory info
string solutionPath = replacementsDictionary[Constants.DictionaryEntries.SolutionDirectory];
string projectName = replacementsDictionary[Constants.DictionaryEntries.SafeProjectName];
var destDirectory = new DirectoryInfo(Path.Combine(solutionPath, projectName));
// Set root dictionary values
var projectName = replacementsDictionary[Constants.DictionaryEntries.SafeProjectName];
EntitiesWizard.RootDictionary[Constants.DictionaryEntries.SafeProjectName] = projectName;
EntitiesWizard.RootDictionary[Constants.DictionaryEntries.OriginalDestinationDirectory] =
replacementsDictionary[Constants.DictionaryEntries.DestinationDirectory];
EntitiesWizard.RootDictionary[Constants.DictionaryEntries.DestinationDirectory] = destDirectory.FullName;

// Set $destinationdirectory$ in replacements dictionary
replacementsDictionary[Constants.DictionaryEntries.DestinationDirectory] = destDirectory.FullName;
// Set destination directory
var directoryInfo = new DirectoryInfo(replacementsDictionary
[Constants.DictionaryEntries.DestinationDirectory]).Parent;
if (directoryInfo != null && directoryInfo.Parent != null)
{
string destDirectory = Path.Combine(directoryInfo.Parent.FullName, projectName);
EntitiesWizard.RootDictionary[Constants.DictionaryEntries.DestinationDirectory] = destDirectory;
replacementsDictionary[Constants.DictionaryEntries.DestinationDirectory] = destDirectory;
}
}

protected override void PostProjectFinishedGenerating(Project project)
protected override void MoveGeneratedProject(ref Project project)
{
// Return if parent is root wizard
if (RootWizard.RootDictionary[Constants.DictionaryEntries.ParentWizardName] ==
Expand All @@ -72,6 +76,8 @@ protected override void PostProjectFinishedGenerating(Project project)
Directory.Move(origDestDirectory, newDestDirectory);
string newDestProject = Path.Combine(newDestDirectory, projectName + ".csproj");
Dte2.Solution.AddFromFile(newDestProject);
project = Dte2.Solution.Projects.Cast<Project>()
.Single(p => p.Name == projectName);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TrackableTemplateWizard")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TrackableTemplateWizard")]
[assembly: AssemblyCopyright("Copyright © 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("6fbb1a5e-d865-4d6b-8ac3-578a1b34b51d")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public bool ShouldAddProjectItem(string filePath)

private Project GetProject(string extension)
{
string projectName = RootDictionary["$saferootprojectname$"] + extension;
string projectName = RootDictionary[Constants.DictionaryEntries.SafeRootProjectName] + extension;
foreach (Project project in _dte2.Solution.Projects)
{
if (Path.GetFileNameWithoutExtension(project.FullName).Equals(projectName))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C9646BE1-E999-47BD-8A9D-083017E6269A}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TrackableEntities.TemplateWizard</RootNamespace>
<AssemblyName>TrackableEntities.TemplateWizard</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Common\Wizards\lib\Microsoft.VisualStudio.ComponentModelHost.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Common\Wizards\lib\Microsoft.VisualStudio.Shell.11.0.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TemplateWizardInterface, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="NuGet.VisualStudio, Version=2.8.60717.93, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86">
<HintPath>..\packages\NuGet.VisualStudio.2.8.6\lib\net45\NuGet.VisualStudio.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Include="EntitiesChildWizard.cs" />
<Compile Include="ChildWizard.cs" />
<Compile Include="Constants.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="EntitiesWizard.cs" />
<Compile Include="RootWizard.cs" />
</ItemGroup>
<ItemGroup>
<None Include="key.snk" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EntitiesSelectionWizard\EntitiesSelectionWizard.csproj">
<Project>{a1dc5d35-b381-4a89-9922-e83923d4ad2f}</Project>
<Name>EntitiesSelectionWizard</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NuGet.VisualStudio" version="2.8.6" targetFramework="net451" />
</packages>
20 changes: 19 additions & 1 deletion Extensions/Common/Wizards/TrackableItemTemplateWizard.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TemplateWizard.Service.Entities", "TemplateWizard.Service.Entities\TemplateWizard.Service.Entities.csproj", "{8556C7C8-72A6-4857-BAFD-489E42A2A453}"
EndProject
Expand All @@ -18,6 +18,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackableEntities.ItemWizar
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ItemTemplateParametersWizard", "ItemTemplateParametersWizard\ItemTemplateParametersWizard.csproj", "{046940FE-CC75-43E2-9C41-346AEBBBB03B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackableEntities.TemplateWizard", "TrackableEntities.TemplateWizard\TrackableEntities.TemplateWizard.csproj", "{C9646BE1-E999-47BD-8A9D-083017E6269A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntitiesSelectionWizard", "EntitiesSelectionWizard\EntitiesSelectionWizard.csproj", "{A1DC5D35-B381-4A89-9922-E83923D4AD2F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntitiesSelectionHarness", "EntitiesSelectionHarness\EntitiesSelectionHarness.csproj", "{A784F6D4-D974-4E5C-9DE1-FA571C9214C9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -40,6 +46,18 @@ Global
{046940FE-CC75-43E2-9C41-346AEBBBB03B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{046940FE-CC75-43E2-9C41-346AEBBBB03B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{046940FE-CC75-43E2-9C41-346AEBBBB03B}.Release|Any CPU.Build.0 = Release|Any CPU
{C9646BE1-E999-47BD-8A9D-083017E6269A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9646BE1-E999-47BD-8A9D-083017E6269A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9646BE1-E999-47BD-8A9D-083017E6269A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9646BE1-E999-47BD-8A9D-083017E6269A}.Release|Any CPU.Build.0 = Release|Any CPU
{A1DC5D35-B381-4A89-9922-E83923D4AD2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1DC5D35-B381-4A89-9922-E83923D4AD2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1DC5D35-B381-4A89-9922-E83923D4AD2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1DC5D35-B381-4A89-9922-E83923D4AD2F}.Release|Any CPU.Build.0 = Release|Any CPU
{A784F6D4-D974-4E5C-9DE1-FA571C9214C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A784F6D4-D974-4E5C-9DE1-FA571C9214C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A784F6D4-D974-4E5C-9DE1-FA571C9214C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A784F6D4-D974-4E5C-9DE1-FA571C9214C9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file not shown.
Loading

0 comments on commit 8daca06

Please sign in to comment.