Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename EF.SqlServer => EF.MicrosoftSqlServer #3331

Merged
merged 1 commit into from
Oct 6, 2015
Merged

Rename EF.SqlServer => EF.MicrosoftSqlServer #3331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions EntityFramework-dnx.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Relational"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Commands", "src\EntityFramework.Commands\EntityFramework.Commands.xproj", "{3D1C73AF-11B3-4B33-81C9-E833DD9C5107}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.SqlServer", "src\EntityFramework.SqlServer\EntityFramework.SqlServer.xproj", "{1ACE01A3-97E2-41A7-A315-4AE53E53794E}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.MicrosoftSqlServer", "src\EntityFramework.MicrosoftSqlServer\EntityFramework.MicrosoftSqlServer.xproj", "{1ACE01A3-97E2-41A7-A315-4AE53E53794E}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.SqlServer.FunctionalTests", "test\EntityFramework.SqlServer.FunctionalTests\EntityFramework.SqlServer.FunctionalTests.xproj", "{C19FFA42-BA18-45A4-88E7-24279CEB9BF2}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.MicrosoftSqlServer.FunctionalTests", "test\EntityFramework.MicrosoftSqlServer.FunctionalTests\EntityFramework.MicrosoftSqlServer.FunctionalTests.xproj", "{C19FFA42-BA18-45A4-88E7-24279CEB9BF2}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.InMemory.FunctionalTests", "test\EntityFramework.InMemory.FunctionalTests\EntityFramework.InMemory.FunctionalTests.xproj", "{91CB662D-A9BE-4FE7-AF2A-DCCFBFC29EC1}"
EndProject
Expand All @@ -29,7 +29,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Commands.Te
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Relational.Tests", "test\EntityFramework.Relational.Tests\EntityFramework.Relational.Tests.xproj", "{D5B43360-EF76-4029-928F-358FFDA05E5A}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.SqlServer.Tests", "test\EntityFramework.SqlServer.Tests\EntityFramework.SqlServer.Tests.xproj", "{9A520B14-4E04-4D20-8821-C1C085B64EBA}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.MicrosoftSqlServer.Tests", "test\EntityFramework.MicrosoftSqlServer.Tests\EntityFramework.MicrosoftSqlServer.Tests.xproj", "{9A520B14-4E04-4D20-8821-C1C085B64EBA}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Core.Tests", "test\EntityFramework.Core.Tests\EntityFramework.Core.Tests.xproj", "{E7FDBBB3-9D5F-4FAB-8515-B02B688F81A1}"
EndProject
Expand All @@ -43,13 +43,13 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Microbenchm
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Microbenchmarks.EF6", "test\EntityFramework.Microbenchmarks.EF6\EntityFramework.Microbenchmarks.EF6.xproj", "{0D7C4100-30B5-435F-BA25-BCAA4B5B32F8}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.SqlServer.Design", "src\EntityFramework.SqlServer.Design\EntityFramework.SqlServer.Design.xproj", "{F62DFDA6-2281-4FDA-A36D-AB83C05A3B51}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.MicrosoftSqlServer.Design", "src\EntityFramework.MicrosoftSqlServer.Design\EntityFramework.MicrosoftSqlServer.Design.xproj", "{F62DFDA6-2281-4FDA-A36D-AB83C05A3B51}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Relational.Design", "src\EntityFramework.Relational.Design\EntityFramework.Relational.Design.xproj", "{5CAE6E4C-73F2-466B-8592-30491FFC97CA}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Relational.Design.Tests", "test\EntityFramework.Relational.Design.Tests\EntityFramework.Relational.Design.Tests.xproj", "{237F08AA-B121-47F3-9E91-0AC259BBB6B3}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.SqlServer.Design.Tests", "test\EntityFramework.SqlServer.Design.Tests\EntityFramework.SqlServer.Design.Tests.xproj", "{CEAC19C5-68D3-4AB6-957A-D380344008E7}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.MicrosoftSqlServer.Design.Tests", "test\EntityFramework.MicrosoftSqlServer.Design.Tests\EntityFramework.MicrosoftSqlServer.Design.Tests.xproj", "{CEAC19C5-68D3-4AB6-957A-D380344008E7}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.CrossStore.FunctionalTests", "test\EntityFramework.CrossStore.FunctionalTests\EntityFramework.CrossStore.FunctionalTests.xproj", "{1F85EAF4-16C7-428D-BDF9-8F0250C24B06}"
EndProject
Expand All @@ -59,7 +59,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Sqlite", "s
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Sqlite.Tests", "test\EntityFramework.Sqlite.Tests\EntityFramework.Sqlite.Tests.xproj", "{6A37E28F-00CB-4608-BE6E-9082D9DE2208}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.SqlServer.Design.FunctionalTests", "test\EntityFramework.SqlServer.Design.FunctionalTests\EntityFramework.SqlServer.Design.FunctionalTests.xproj", "{06E77A73-3B5B-46F0-B366-E4B3F32AC60C}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.MicrosoftSqlServer.Design.FunctionalTests", "test\EntityFramework.MicrosoftSqlServer.Design.FunctionalTests\EntityFramework.MicrosoftSqlServer.Design.FunctionalTests.xproj", "{06E77A73-3B5B-46F0-B366-E4B3F32AC60C}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EntityFramework.Relational.Design.FunctionalTests", "test\EntityFramework.Relational.Design.FunctionalTests\EntityFramework.Relational.Design.FunctionalTests.xproj", "{6B2440FD-F40A-4EEA-B0CE-43E852133EDB}"
EndProject
Expand Down
12 changes: 6 additions & 6 deletions EntityFramework.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.InMemory",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Relational", "src\EntityFramework.Relational\EntityFramework.Relational.csproj", "{75C5A774-A3F3-43EB-97D3-DBE0CF2825D8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.SqlServer", "src\EntityFramework.SqlServer\EntityFramework.SqlServer.csproj", "{04E6620B-5B41-45FE-981A-F40EB7686B0E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.MicrosoftSqlServer", "src\EntityFramework.MicrosoftSqlServer\EntityFramework.MicrosoftSqlServer.csproj", "{04E6620B-5B41-45FE-981A-F40EB7686B0E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Core.Tests", "test\EntityFramework.Core.Tests\EntityFramework.Core.Tests.csproj", "{EF361118-7D0D-453E-ADA4-2F24FBEE196C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.SqlServer.Tests", "test\EntityFramework.SqlServer.Tests\EntityFramework.SqlServer.Tests.csproj", "{3159FABC-0C89-41FF-A279-48665CC068DC}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.MicrosoftSqlServer.Tests", "test\EntityFramework.MicrosoftSqlServer.Tests\EntityFramework.MicrosoftSqlServer.Tests.csproj", "{3159FABC-0C89-41FF-A279-48665CC068DC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Relational.Tests", "test\EntityFramework.Relational.Tests\EntityFramework.Relational.Tests.csproj", "{001005B3-D16F-4399-9265-A67D619652BD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.InMemory.Tests", "test\EntityFramework.InMemory.Tests\EntityFramework.InMemory.Tests.csproj", "{81EF720B-EC6D-456F-9FA6-71DA7D4ED3BF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Core.FunctionalTests", "test\EntityFramework.Core.FunctionalTests\EntityFramework.Core.FunctionalTests.csproj", "{6AB933C7-DE2A-45F2-BDC6-E71A01EF7756}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.SqlServer.FunctionalTests", "test\EntityFramework.SqlServer.FunctionalTests\EntityFramework.SqlServer.FunctionalTests.csproj", "{FA789ED6-2AAC-4BAA-A4FB-B600BE2DA956}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.MicrosoftSqlServer.FunctionalTests", "test\EntityFramework.MicrosoftSqlServer.FunctionalTests\EntityFramework.MicrosoftSqlServer.FunctionalTests.csproj", "{FA789ED6-2AAC-4BAA-A4FB-B600BE2DA956}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.InMemory.FunctionalTests", "test\EntityFramework.InMemory.FunctionalTests\EntityFramework.InMemory.FunctionalTests.csproj", "{7E1A1A1B-6D0B-4C66-8026-326EFC0B4625}"
EndProject
Expand All @@ -47,19 +47,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Microbenchm
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Relational.Design", "src\EntityFramework.Relational.Design\EntityFramework.Relational.Design.csproj", "{7028A7E3-0AD8-4606-A922-8189C8A704E0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.SqlServer.Design", "src\EntityFramework.SqlServer.Design\EntityFramework.SqlServer.Design.csproj", "{9AFDF1FA-1710-48E3-9802-7AB9DAC91B35}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.MicrosoftSqlServer.Design", "src\EntityFramework.MicrosoftSqlServer.Design\EntityFramework.MicrosoftSqlServer.Design.csproj", "{9AFDF1FA-1710-48E3-9802-7AB9DAC91B35}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Relational.Design.Tests", "test\EntityFramework.Relational.Design.Tests\EntityFramework.Relational.Design.Tests.csproj", "{A8B8291A-2E63-48DC-A19E-41AF9E50F22D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.SqlServer.Design.Tests", "test\EntityFramework.SqlServer.Design.Tests\EntityFramework.SqlServer.Design.Tests.csproj", "{AC579BD1-6646-4A68-8C49-60E36EFF20A1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.MicrosoftSqlServer.Design.Tests", "test\EntityFramework.MicrosoftSqlServer.Design.Tests\EntityFramework.MicrosoftSqlServer.Design.Tests.csproj", "{AC579BD1-6646-4A68-8C49-60E36EFF20A1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Sqlite", "src\EntityFramework.Sqlite\EntityFramework.Sqlite.csproj", "{E340807B-ECBB-41DF-A164-23FE833C76DE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Sqlite.Tests", "test\EntityFramework.Sqlite.Tests\EntityFramework.Sqlite.Tests.csproj", "{4E8D7833-A710-41A9-BD77-DF985D41857C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Sqlite.FunctionalTests", "test\EntityFramework.Sqlite.FunctionalTests\EntityFramework.Sqlite.FunctionalTests.csproj", "{664B4D75-6CB7-4D90-A8E1-2A201500C859}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.SqlServer.Design.FunctionalTests", "test\EntityFramework.SqlServer.Design.FunctionalTests\EntityFramework.SqlServer.Design.FunctionalTests.csproj", "{6A05786F-C047-402E-A3A3-76898B644538}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.MicrosoftSqlServer.Design.FunctionalTests", "test\EntityFramework.MicrosoftSqlServer.Design.FunctionalTests\EntityFramework.MicrosoftSqlServer.Design.FunctionalTests.csproj", "{6A05786F-C047-402E-A3A3-76898B644538}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.Sqlite.Design", "src\EntityFramework.Sqlite.Design\EntityFramework.Sqlite.Design.csproj", "{2FA76686-11EB-4A4C-B3E2-1FDAF29E4A62}"
EndProject
Expand Down
6 changes: 3 additions & 3 deletions NuGetPackageVerifier.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"EntityFramework.Core": { },
"EntityFramework.Core.FunctionalTests": { },
"EntityFramework.InMemory": { },
"EntityFramework.MicrosoftSqlServer": { },
"EntityFramework.MicrosoftSqlServer.Design": { },
"EntityFramework.Relational": { },
"EntityFramework.Relational.Design": { },
"EntityFramework.Relational.Design.FunctionalTests": { },
"EntityFramework.Relational.FunctionalTests": { },
"EntityFramework.Sqlite": { },
"EntityFramework.Sqlite.Design": { },
"EntityFramework.SqlServer": { },
"EntityFramework.SqlServer.Design": { }
"EntityFramework.Sqlite.Design": { }
}
},
"Default": { // Rules to run for packages not listed in any other set.
Expand Down
2 changes: 1 addition & 1 deletion src/EntityFramework.Commands/Commands/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public virtual int Main([NotNull] string[] args)
"The connection string of the database");
var provider = scaffold.Argument(
"[provider]",
"The provider to use. For example, EntityFramework.SqlServer");
"The provider to use. For example, EntityFramework.MicrosoftSqlServer");
var dbContextClassName = scaffold.Option(
"-c|--context-class-name <name>",
"Name of the generated DbContext class.");
Expand Down
2 changes: 1 addition & 1 deletion src/EntityFramework.Commands/tools/EntityFramework.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ Register-TabExpansion Scaffold-DbContext @{
Specifies the connection string of the database.

.PARAMETER Provider
Specifies the provider to use. For example, EntityFramework.SqlServer.
Specifies the provider to use. For example, EntityFramework.MicrosoftSqlServer.

.PARAMETER OutputDirectory
Specifies the directory to use to output the classes. If omitted, the top-level project directory is used.
Expand Down
2 changes: 1 addition & 1 deletion src/EntityFramework.Core/EntityFrameworkServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static class EntityFrameworkServiceCollectionExtensions
/// <para>
/// The database you are using will also define extension methods that can be called on the returned
/// <see cref="EntityFrameworkServicesBuilder" /> to register the services for the database. For example,
/// when using EntityFramework.SqlServer you would call
/// when using EntityFramework.MicrosoftSqlServer you would call
/// <c>collection.AddEntityFramework().UseSqlServer(connectionString)</c>.
/// </para>
/// <para>
Expand Down
2 changes: 1 addition & 1 deletion src/EntityFramework.Core/Properties/InternalsVisibleTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("EntityFramework.Core.Tests")]
[assembly: InternalsVisibleTo("EntityFramework.SqlServer.Tests")]
[assembly: InternalsVisibleTo("EntityFramework.MicrosoftSqlServer.Tests")]

// for Moq

Expand Down
8 changes: 4 additions & 4 deletions ...n/EntityFramework.SqlServer.Design.csproj → ...ramework.MicrosoftSqlServer.Design.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Data.Entity.SqlServer.Design</RootNamespace>
<AssemblyName>EntityFramework.SqlServer.Design</AssemblyName>
<AssemblyName>EntityFramework.MicrosoftSqlServer.Design</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
Expand Down Expand Up @@ -68,7 +68,7 @@
<Compile Include="..\Shared\StringBuilderExtensions.cs" />
<Compile Include="..\Shared\SharedTypeExtensions.cs" />
<EmbeddedResource Include="Properties\SqlServerDesignStrings.resx">
<LogicalName>EntityFramework.SqlServer.Design.SqlServerDesignStrings.resources</LogicalName>
<LogicalName>EntityFramework.MicrosoftSqlServer.Design.SqlServerDesignStrings.resources</LogicalName>
<SubType>Designer</SubType>
</EmbeddedResource>
<Content Include="..\..\tools\Resources.tt">
Expand All @@ -88,9 +88,9 @@
<Project>{75c5a774-a3f3-43eb-97d3-dbe0cf2825d8}</Project>
<Name>EntityFramework.Relational</Name>
</ProjectReference>
<ProjectReference Include="..\EntityFramework.SqlServer\EntityFramework.SqlServer.csproj">
<ProjectReference Include="..\EntityFramework.MicrosoftSqlServer\EntityFramework.MicrosoftSqlServer.csproj">
<Project>{04e6620b-5b41-45fe-981a-f40eb7686b0e}</Project>
<Name>EntityFramework.SqlServer</Name>
<Name>EntityFramework.MicrosoftSqlServer</Name>
</ProjectReference>
<ProjectReference Include="..\EntityFramework.Core\EntityFramework.Core.csproj">
<Project>{71415cec-8111-4c73-8751-512d22f10602}</Project>
Expand Down
2 changes: 1 addition & 1 deletion ...gn/EntityFramework.SqlServer.Design.xproj → ...Framework.MicrosoftSqlServer.Design.xproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AssemblyName>EntityFramework.SqlServer.Design</AssemblyName>
<AssemblyName>EntityFramework.MicrosoftSqlServer.Design</AssemblyName>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<RootNamespace>Microsoft.Data.Entity.SqlServer.Design</RootNamespace>
Expand Down
0 ...lServer.Design/Properties/AssemblyInfo.cs → ...lServer.Design/Properties/AssemblyInfo.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...r.Design/Properties/InternalsVisibleTo.cs → ...r.Design/Properties/InternalsVisibleTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("EntityFramework.SqlServer.Design.Tests")]
[assembly: InternalsVisibleTo("EntityFramework.MicrosoftSqlServer.Design.Tests")]

// for Moq

Expand Down
2 changes: 1 addition & 1 deletion ...erties/SqlServerDesignStrings.Designer.cs → ...erties/SqlServerDesignStrings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...gn/Properties/SqlServerDesignStrings.resx → ...gn/Properties/SqlServerDesignStrings.resx
View file
Open in desktop
File renamed without changes.
0 ...figuration/SqlServerModelConfiguration.cs → ...figuration/SqlServerModelConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 ...ineering/Model/ForeignKeyColumnMapping.cs → ...ineering/Model/ForeignKeyColumnMapping.cs
View file
Open in desktop
File renamed without changes.
0 ....Design/ReverseEngineering/Model/Table.cs → ....Design/ReverseEngineering/Model/Table.cs
View file
Open in desktop
File renamed without changes.
0 ...n/ReverseEngineering/Model/TableColumn.cs → ...n/ReverseEngineering/Model/TableColumn.cs
View file
Open in desktop
File renamed without changes.
0 ...ngineering/Model/TableConstraintColumn.cs → ...ngineering/Model/TableConstraintColumn.cs
View file
Open in desktop
File renamed without changes.
0 ...ineering/SqlServerConfigurationFactory.cs → ...ineering/SqlServerConfigurationFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...erverDesignTimeMetadataProviderFactory.cs → ...erverDesignTimeMetadataProviderFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...neering/SqlServerMetadataModelProvider.cs → ...neering/SqlServerMetadataModelProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...gn/Utilities/SqlServerLiteralUtilities.cs → ...gn/Utilities/SqlServerLiteralUtilities.cs
View file
Open in desktop
File renamed without changes.
0 ....Design/Utilities/SqlServerTypeMapping.cs → ....Design/Utilities/SqlServerTypeMapping.cs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...tyFramework.SqlServer.Design/project.json → ...rk.MicrosoftSqlServer.Design/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
},
"dependencies": {
"EntityFramework.Relational.Design": "7.0.0-*",
"EntityFramework.SqlServer": "7.0.0-*"
"EntityFramework.MicrosoftSqlServer": "7.0.0-*"
},
"compile": "..\\Shared\\*.cs",
"namedResource": {
"EntityFramework.SqlServer.Design.SqlServerDesignStrings": "Properties/SqlServerDesignStrings.resx"
"EntityFramework.MicrosoftSqlServer.Design.SqlServerDesignStrings": "Properties/SqlServerDesignStrings.resx"
},
"frameworks": {
"net45": { },
Expand Down
6 changes: 3 additions & 3 deletions ...qlServer/EntityFramework.SqlServer.csproj → ...EntityFramework.MicrosoftSqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Data.Entity</RootNamespace>
<AssemblyName>EntityFramework.SqlServer</AssemblyName>
<AssemblyName>EntityFramework.MicrosoftSqlServer</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
Expand Down Expand Up @@ -140,9 +140,9 @@
<Compile Include="ValueGeneration\Internal\SqlServerSequenceValueGeneratorState.cs" />
<Compile Include="ValueGeneration\Internal\SqlServerValueGeneratorCache.cs" />
<Compile Include="ValueGeneration\Internal\SqlServerValueGeneratorSelector.cs" />
<EmbeddedResource Include="Properties\EntityFramework.SqlServer.rd.xml" />
<EmbeddedResource Include="Properties\EntityFramework.MicrosoftSqlServer.rd.xml" />
<EmbeddedResource Include="Properties\SqlServerStrings.resx">
<LogicalName>EntityFramework.SqlServer.SqlServerStrings.resources</LogicalName>
<LogicalName>EntityFramework.MicrosoftSqlServer.SqlServerStrings.resources</LogicalName>
<SubType>Designer</SubType>
</EmbeddedResource>
<Content Include="..\..\tools\Resources.tt">
Expand Down
2 changes: 1 addition & 1 deletion ...SqlServer/EntityFramework.SqlServer.xproj → .../EntityFramework.MicrosoftSqlServer.xproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AssemblyName>EntityFramework.SqlServer</AssemblyName>
<AssemblyName>EntityFramework.MicrosoftSqlServer</AssemblyName>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<RootNamespace>Microsoft.Data.Entity.SqlServer</RootNamespace>
Expand Down
0 ...ns/SqlServerDbContextOptionsExtensions.cs → ...ns/SqlServerDbContextOptionsExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...tityFrameworkServicesBuilderExtensions.cs → ...tityFrameworkServicesBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...s/SqlServerEntityTypeBuilderExtensions.cs → ...s/SqlServerEntityTypeBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...nsions/SqlServerIndexBuilderExtensions.cs → ...nsions/SqlServerIndexBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...tensions/SqlServerKeyBuilderExtensions.cs → ...tensions/SqlServerKeyBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...Extensions/SqlServerMetadataExtensions.cs → ...Extensions/SqlServerMetadataExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...nsions/SqlServerModelBuilderExtensions.cs → ...nsions/SqlServerModelBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...ons/SqlServerPropertyBuilderExtensions.cs → ...ons/SqlServerPropertyBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...erReferenceCollectionBuilderExtensions.cs → ...erReferenceCollectionBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...verReferenceReferenceBuilderExtensions.cs → ...verReferenceReferenceBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...cture/SqlServerDbContextOptionsBuilder.cs → ...cture/SqlServerDbContextOptionsBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...qlServer/Internal/SqlServerModelSource.cs → ...qlServer/Internal/SqlServerModelSource.cs
View file
Open in desktop
File renamed without changes.
0 ...ver/Internal/SqlServerOptionsExtension.cs → ...ver/Internal/SqlServerOptionsExtension.cs
View file
Open in desktop
File renamed without changes.
0 ...Internal/SqlServerConventionSetBuilder.cs → ...Internal/SqlServerConventionSetBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...erverValueGenerationStrategyConvention.cs → ...erverValueGenerationStrategyConvention.cs
View file
Open in desktop
File renamed without changes.
0 ...er/Metadata/ISqlServerIndexAnnotations.cs → ...er/Metadata/ISqlServerIndexAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...rver/Metadata/ISqlServerKeyAnnotations.cs → ...rver/Metadata/ISqlServerKeyAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...er/Metadata/ISqlServerModelAnnotations.cs → ...er/Metadata/ISqlServerModelAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...Metadata/ISqlServerPropertyAnnotations.cs → ...Metadata/ISqlServerPropertyAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...data/Internal/SqlServerAnnotationNames.cs → ...data/Internal/SqlServerAnnotationNames.cs
View file
Open in desktop
File renamed without changes.
0 ...ernal/SqlServerIndexBuilderAnnotations.cs → ...ernal/SqlServerIndexBuilderAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...erverInternalMetadataBuilderExtensions.cs → ...erverInternalMetadataBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...nternal/SqlServerKeyBuilderAnnotations.cs → ...nternal/SqlServerKeyBuilderAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...ernal/SqlServerModelBuilderAnnotations.cs → ...ernal/SqlServerModelBuilderAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...al/SqlServerPropertyBuilderAnnotations.cs → ...al/SqlServerPropertyBuilderAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...r/Metadata/SqlServerAnnotationProvider.cs → ...r/Metadata/SqlServerAnnotationProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...ver/Metadata/SqlServerIndexAnnotations.cs → ...ver/Metadata/SqlServerIndexAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...erver/Metadata/SqlServerKeyAnnotations.cs → ...erver/Metadata/SqlServerKeyAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...ver/Metadata/SqlServerModelAnnotations.cs → ...ver/Metadata/SqlServerModelAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 .../Metadata/SqlServerPropertyAnnotations.cs → .../Metadata/SqlServerPropertyAnnotations.cs
View file
Open in desktop
File renamed without changes.
0 ...adata/SqlServerValueGenerationStrategy.cs → ...adata/SqlServerValueGenerationStrategy.cs
View file
Open in desktop
File renamed without changes.
0 ...ns/Internal/SqlServerHistoryRepository.cs → ...ns/Internal/SqlServerHistoryRepository.cs
View file
Open in desktop
File renamed without changes.
0 .../SqlServerMigrationsAnnotationProvider.cs → .../SqlServerMigrationsAnnotationProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...tions/SqlServerCreateDatabaseOperation.cs → ...tions/SqlServerCreateDatabaseOperation.cs
View file
Open in desktop
File renamed without changes.
0 ...rations/SqlServerDropDatabaseOperation.cs → ...rations/SqlServerDropDatabaseOperation.cs
View file
Open in desktop
File renamed without changes.
0 ...ations/SqlServerMigrationsSqlGenerator.cs → ...ations/SqlServerMigrationsSqlGenerator.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...work.SqlServer/Properties/AssemblyInfo.cs → ...osoftSqlServer/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
[assembly: AssemblyMetadata("Serviceable", "True")]
[assembly: DesignTimeProviderServices(
typeName: "Microsoft.Data.Entity.SqlServer.Design.ReverseEngineering.SqlServerDesignTimeMetadataProviderFactory",
assemblyName: "EntityFramework.SqlServer.Design")]
assemblyName: "EntityFramework.MicrosoftSqlServer.Design")]
2 changes: 1 addition & 1 deletion ...operties/EntityFramework.SqlServer.rd.xml → ...EntityFramework.MicrosoftSqlServer.rd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
<Library>
<!-- TODO optimize this for types that actually need reflection -->
<Assembly Name="EntityFramework.SqlServer" Activate="All" />
<Assembly Name="EntityFramework.MicrosoftSqlServer" Activate="All" />
</Library>
</Directives>
Loading