Rename to EntityFramework.Design

CTGControls · Jul 9, 2014 · 7850de8 · 7850de8
1 parent 865db82
commit 7850de8
Show file tree

Hide file tree

Showing 25 changed files with 137 additions and 138 deletions.
diff --git a/EntityFramework-2014.sln b/EntityFramework-2014.sln
@@ -15,7 +15,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Migrations"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Relational", "src\EntityFramework.Relational\EntityFramework.Relational.kproj", "{AD2D13EB-AA07-45FB-B946-1F61CCC0D9F7}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Migrations.Design", "src\EntityFramework.Migrations.Design\EntityFramework.Migrations.Design.kproj", "{3D1C73AF-11B3-4B33-81C9-E833DD9C5107}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Design", "src\EntityFramework.Design\EntityFramework.Design.kproj", "{3D1C73AF-11B3-4B33-81C9-E833DD9C5107}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.SQLite", "src\EntityFramework.SQLite\EntityFramework.SQLite.kproj", "{42D24BAF-FB0F-4C85-B39F-F42BD81FE681}"
 EndProject
@@ -29,7 +29,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.FunctionalT
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.InMemory.Tests", "test\EntityFramework.InMemory.Tests\EntityFramework.InMemory.Tests.kproj", "{02C7760F-E138-4D54-AEDE-59CB17B503D9}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Migrations.Design.Tests", "test\EntityFramework.Migrations.Design.Tests\EntityFramework.Migrations.Design.Tests.kproj", "{0BD27265-9890-45FD-97F0-6E05933CDD47}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Design.Tests", "test\EntityFramework.Design.Tests\EntityFramework.Design.Tests.kproj", "{0BD27265-9890-45FD-97F0-6E05933CDD47}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Migrations.Tests", "test\EntityFramework.Migrations.Tests\EntityFramework.Migrations.Tests.kproj", "{110BC752-F3FA-46E0-880B-15DCFBF378E2}"
 EndProject

diff --git a/EntityFramework.sln b/EntityFramework.sln
@@ -37,9 +37,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.InMemory.Fu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.SQLite.Tests", "test\EntityFramework.SQLite.Tests\EntityFramework.SQLite.Tests.csproj", "{1F060759-25F6-47FB-AEBB-3D88195F3DF7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Migrations.Design", "src\EntityFramework.Migrations.Design\EntityFramework.Migrations.Design.csproj", "{10CA97EB-E724-4F08-86AF-F301F2B0BFFF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Design", "src\EntityFramework.Design\EntityFramework.Design.csproj", "{10CA97EB-E724-4F08-86AF-F301F2B0BFFF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Migrations.Design.Tests", "test\EntityFramework.Migrations.Design.Tests\EntityFramework.Migrations.Design.Tests.csproj", "{38F9AD16-B3B4-48A5-B814-77660CF409AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Design.Tests", "test\EntityFramework.Design.Tests\EntityFramework.Design.Tests.csproj", "{38F9AD16-B3B4-48A5-B814-77660CF409AE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.SQLite.FunctionalTests", "test\EntityFramework.SQLite.FunctionalTests\EntityFramework.SQLite.FunctionalTests.csproj", "{A4604758-4D80-4C71-A972-5655FFF38089}"
 EndProject

diff --git a/...ns.Design/CSharpMigrationCodeGenerator.cs → ...rk.Design/CSharpMigrationCodeGenerator.cs b/...ns.Design/CSharpMigrationCodeGenerator.cs → ...rk.Design/CSharpMigrationCodeGenerator.cs
@@ -7,14 +7,15 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using JetBrains.Annotations;
+using Microsoft.Data.Entity.Design.Utilities;
 using Microsoft.Data.Entity.Metadata;
-using Microsoft.Data.Entity.Migrations.Design.Utilities;
+using Microsoft.Data.Entity.Migrations;
 using Microsoft.Data.Entity.Migrations.Infrastructure;
 using Microsoft.Data.Entity.Migrations.Model;
 using Microsoft.Data.Entity.Relational.Model;
 using Microsoft.Data.Entity.Utilities;
 
-namespace Microsoft.Data.Entity.Migrations.Design
+namespace Microsoft.Data.Entity.Design
 {
     public class CSharpMigrationCodeGenerator : MigrationCodeGenerator
     {

diff --git a/...ations.Design/CSharpModelCodeGenerator.cs → ...mework.Design/CSharpModelCodeGenerator.cs b/...ations.Design/CSharpModelCodeGenerator.cs → ...mework.Design/CSharpModelCodeGenerator.cs
@@ -4,11 +4,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
+using Microsoft.Data.Entity.Design.Utilities;
 using Microsoft.Data.Entity.Metadata;
-using Microsoft.Data.Entity.Migrations.Design.Utilities;
+using Microsoft.Data.Entity.Migrations;
 using Microsoft.Data.Entity.Utilities;
 
-namespace Microsoft.Data.Entity.Migrations.Design
+namespace Microsoft.Data.Entity.Design
 {
     public class CSharpModelCodeGenerator : ModelCodeGenerator
     {

diff --git a/.../EntityFramework.Migrations.Design.csproj → ...work.Design/EntityFramework.Design.csproj b/.../EntityFramework.Migrations.Design.csproj → ...work.Design/EntityFramework.Design.csproj
@@ -3,19 +3,15 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <Import Project="..\..\tools\EntityFramework.props" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{10CA97EB-E724-4F08-86AF-F301F2B0BFFF}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Data.Entity.Migrations.Design</RootNamespace>
-    <AssemblyName>EntityFramework.Migrations.Design</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <RootNamespace>Microsoft.Data.Entity.Design</RootNamespace>
+    <AssemblyName>EntityFramework.Design</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile44</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,7 +33,8 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Data.Common" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\packages\KoreBuild\build\Resources.cs">
@@ -60,12 +57,12 @@
     <Compile Include="Utilities\DbContextConfigurationExtensions.cs" />
     <Compile Include="Utilities\EnumerableExtensions.cs" />
     <EmbeddedResource Include="Properties\Strings.resx">
-      <LogicalName>EntityFramework.Migrations.Design.Strings.resources</LogicalName>
+      <LogicalName>EntityFramework.Design.Strings.resources</LogicalName>
     </EmbeddedResource>
     <None Include="..\..\packages\KoreBuild\build\Resources.tt">
       <Link>Properties\Resources.tt</Link>
       <Generator>TextTemplatingFileGenerator</Generator>
-      <CustomToolNamespace>Microsoft.Data.Entity.Migrations.Design</CustomToolNamespace>
+      <CustomToolNamespace>Microsoft.Data.Entity.Design</CustomToolNamespace>
       <LastGenOutput>Resources.cs</LastGenOutput>
     </None>
     <None Include="project.json" />
@@ -87,7 +84,7 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/...n/EntityFramework.Migrations.Design.kproj → ...ework.Design/EntityFramework.Design.kproj b/...n/EntityFramework.Migrations.Design.kproj → ...ework.Design/EntityFramework.Design.kproj
diff --git a/....Migrations.Design/MigrationScaffolder.cs → ...tyFramework.Design/MigrationScaffolder.cs b/....Migrations.Design/MigrationScaffolder.cs → ...tyFramework.Design/MigrationScaffolder.cs
@@ -6,14 +6,15 @@
 using System.Globalization;
 using System.Linq;
 using JetBrains.Annotations;
+using Microsoft.Data.Entity.Design.Utilities;
 using Microsoft.Data.Entity.Infrastructure;
 using Microsoft.Data.Entity.Metadata;
-using Microsoft.Data.Entity.Migrations.Design.Utilities;
+using Microsoft.Data.Entity.Migrations;
 using Microsoft.Data.Entity.Migrations.Infrastructure;
 using Microsoft.Data.Entity.Migrations.Model;
 using Microsoft.Data.Entity.Utilities;
 
-namespace Microsoft.Data.Entity.Migrations.Design
+namespace Microsoft.Data.Entity.Design
 {
     public abstract class MigrationScaffolder
     {

diff --git a/...rations.Design/Properties/AssemblyInfo.cs → ...amework.Design/Properties/AssemblyInfo.cs b/...rations.Design/Properties/AssemblyInfo.cs → ...amework.Design/Properties/AssemblyInfo.cs
diff --git a/...s.Design/Properties/InternalsVisibleTo.cs → ...k.Design/Properties/InternalsVisibleTo.cs b/...s.Design/Properties/InternalsVisibleTo.cs → ...k.Design/Properties/InternalsVisibleTo.cs
@@ -5,7 +5,7 @@
 
 #if !INTERNALS_INVISIBLE
 
-[assembly: InternalsVisibleTo("EntityFramework.Migrations.Design.Tests")]
+[assembly: InternalsVisibleTo("EntityFramework.Design.Tests")]
 
 // for Moq
 

diff --git a/...ons.Design/Properties/Strings.Designer.cs → ...ork.Design/Properties/Strings.Designer.cs b/...ons.Design/Properties/Strings.Designer.cs → ...ork.Design/Properties/Strings.Designer.cs
diff --git a/...Migrations.Design/Properties/Strings.resx → ...yFramework.Design/Properties/Strings.resx b/...Migrations.Design/Properties/Strings.resx → ...yFramework.Design/Properties/Strings.resx
diff --git a/...grations.Design/Utilities/CSharpHelper.cs → ...ramework.Design/Utilities/CSharpHelper.cs b/...grations.Design/Utilities/CSharpHelper.cs → ...ramework.Design/Utilities/CSharpHelper.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.Data.Entity.Migrations.Design.Utilities
+namespace Microsoft.Data.Entity.Design.Utilities
 {
     internal static class CSharpHelper
     {

diff --git a/...work.Migrations.Design/Utilities/Check.cs → ...EntityFramework.Design/Utilities/Check.cs b/...work.Migrations.Design/Utilities/Check.cs → ...EntityFramework.Design/Utilities/Check.cs
@@ -5,7 +5,7 @@
 using System.Diagnostics;
 using JetBrains.Annotations;
 
-namespace Microsoft.Data.Entity.Migrations.Design.Utilities
+namespace Microsoft.Data.Entity.Design.Utilities
 {
     [DebuggerStepThrough]
     internal static class Check

diff --git a/...ities/DbContextConfigurationExtensions.cs → ...ities/DbContextConfigurationExtensions.cs b/...ities/DbContextConfigurationExtensions.cs → ...ities/DbContextConfigurationExtensions.cs
@@ -4,7 +4,7 @@
 using Microsoft.Data.Entity.Infrastructure;
 using Microsoft.Data.Entity.Relational;
 
-namespace Microsoft.Data.Entity.Migrations.Design.Utilities
+namespace Microsoft.Data.Entity.Design.Utilities
 {
     internal static class DbContextConfigurationExtensions
     {

diff --git a/....Design/Utilities/EnumerableExtensions.cs → ....Design/Utilities/EnumerableExtensions.cs b/....Design/Utilities/EnumerableExtensions.cs → ....Design/Utilities/EnumerableExtensions.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace Microsoft.Data.Entity.Migrations.Design.Utilities
+namespace Microsoft.Data.Entity.Design.Utilities
 {
     [DebuggerStepThrough]
     internal static class EnumerableExtensions

diff --git a/src/EntityFramework.Design/project.json b/src/EntityFramework.Design/project.json
@@ -0,0 +1,13 @@
+{
+    "version": "7.0.0-*",
+    "compilationOptions": {
+        "warningsAsErrors": true
+    },
+    "dependencies": {
+        "EntityFramework.Migrations": ""
+    },
+    "code": [ "**\\*.cs", "..\\Shared\\*.cs" ],
+    "configurations": {
+        "net451": { }
+    }
+}
diff --git a/src/EntityFramework.Migrations.Design/project.json b/src/EntityFramework.Migrations.Design/project.json
diff --git a/...ations.Design.Tests/ApiConsistencyTest.cs → ...mework.Design.Tests/ApiConsistencyTest.cs b/...ations.Design.Tests/ApiConsistencyTest.cs → ...mework.Design.Tests/ApiConsistencyTest.cs
@@ -5,7 +5,7 @@
 using Microsoft.Data.Entity.Migrations.Model;
 using Microsoft.Data.Entity.Tests;
 
-namespace Microsoft.Data.Entity.Migrations.Design.Tests
+namespace Microsoft.Data.Entity.Design.Tests
 {
     public class ApiConsistencyTest : ApiConsistencyTestBase
     {

diff --git a/...Tests/CSharpMigrationCodeGeneratorTest.cs → ...Tests/CSharpMigrationCodeGeneratorTest.cs b/...Tests/CSharpMigrationCodeGeneratorTest.cs → ...Tests/CSharpMigrationCodeGeneratorTest.cs
@@ -8,7 +8,7 @@
 using Microsoft.Data.Entity.Utilities;
 using Xunit;
 
-namespace Microsoft.Data.Entity.Migrations.Design.Tests
+namespace Microsoft.Data.Entity.Design.Tests
 {
     public class CSharpMigrationCodeGeneratorTest
     {