Skip to content

Commit 24777a2

Browse files
committed
Update
1 parent d7cf93b commit 24777a2

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

EdmxDesignHost/Entities.Context.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </auto-generated>
88
//------------------------------------------------------------------------------
99

10-
namespace EdmxDotNetCoreApp
10+
namespace EdmxDotNetCoreSample
1111
{
1212
using System;
1313
using System.Data.Entity;

EdmxDesignHost/Entities.edmx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<edmx:Runtime>
55
<!-- SSDL content -->
66
<edmx:StorageModels>
7-
<Schema Namespace="EdmxDotNetCoreApp.Entities.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
7+
<Schema Namespace="EdmxDotNetCoreSample.Entities.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
88
<EntityType Name="Droids">
99
<Key>
1010
<PropertyRef Name="Name" />
@@ -30,7 +30,7 @@
3030
</Dependent>
3131
</ReferentialConstraint>
3232
</Association>
33-
<EntityContainer Name="EdmxDotNetCoreAppEntitiesStoreContainer">
33+
<EntityContainer Name="EdmxDotNetCoreSampleEntitiesStoreContainer">
3434
<EntitySet Name="Droids" EntityType="Self.Droids" Schema="dbo" store:Type="Tables" />
3535
<EntitySet Name="People" EntityType="Self.People" Schema="dbo" store:Type="Tables" />
3636
<AssociationSet Name="FK_dbo_Droids_dbo_People_MasterName" Association="Self.FK_dbo_Droids_dbo_People_MasterName">
@@ -42,7 +42,7 @@
4242
</edmx:StorageModels>
4343
<!-- CSDL content -->
4444
<edmx:ConceptualModels>
45-
<Schema Namespace="EdmxDotNetCoreApp.Entities" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
45+
<Schema Namespace="EdmxDotNetCoreSample.Entities" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
4646
<EntityType Name="Thing">
4747
<Key>
4848
<PropertyRef Name="Name" />
@@ -60,7 +60,7 @@
6060
</EntityType>
6161
<Association Name="FK_dbo_Droids_dbo_People_MasterName">
6262
<End Role="People" Type="Self.Person" Multiplicity="0..1" />
63-
<End Role="Droids" Type="EdmxDotNetCoreApp.Entities.Thing" Multiplicity="*" />
63+
<End Role="Droids" Type="EdmxDotNetCoreSample.Entities.Thing" Multiplicity="*" />
6464
<ReferentialConstraint>
6565
<Principal Role="People">
6666
<PropertyRef Name="Name" />
@@ -71,7 +71,7 @@
7171
</ReferentialConstraint>
7272
</Association>
7373
<EntityContainer Name="Entities" annotation:LazyLoadingEnabled="true">
74-
<EntitySet Name="Things" EntityType="EdmxDotNetCoreApp.Entities.Thing" />
74+
<EntitySet Name="Things" EntityType="EdmxDotNetCoreSample.Entities.Thing" />
7575
<EntitySet Name="People" EntityType="Self.Person" />
7676
<AssociationSet Name="FK_dbo_Droids_dbo_People_MasterName" Association="Self.FK_dbo_Droids_dbo_People_MasterName">
7777
<End Role="People" EntitySet="People" />
@@ -83,17 +83,17 @@
8383
<!-- C-S mapping content -->
8484
<edmx:Mappings>
8585
<Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
86-
<EntityContainerMapping StorageEntityContainer="EdmxDotNetCoreAppEntitiesStoreContainer" CdmEntityContainer="Entities">
86+
<EntityContainerMapping StorageEntityContainer="EdmxDotNetCoreSampleEntitiesStoreContainer" CdmEntityContainer="Entities">
8787
<EntitySetMapping Name="Things">
88-
<EntityTypeMapping TypeName="EdmxDotNetCoreApp.Entities.Thing">
88+
<EntityTypeMapping TypeName="EdmxDotNetCoreSample.Entities.Thing">
8989
<MappingFragment StoreEntitySet="Droids">
9090
<ScalarProperty Name="Name" ColumnName="Name" />
9191
<ScalarProperty Name="OwnerName" ColumnName="MasterName" />
9292
</MappingFragment>
9393
</EntityTypeMapping>
9494
</EntitySetMapping>
9595
<EntitySetMapping Name="People">
96-
<EntityTypeMapping TypeName="EdmxDotNetCoreApp.Entities.Person">
96+
<EntityTypeMapping TypeName="EdmxDotNetCoreSample.Entities.Person">
9797
<MappingFragment StoreEntitySet="People">
9898
<ScalarProperty Name="Name" ColumnName="Name" />
9999
</MappingFragment>

EdmxDesignHost/Entities.edmx.diagram

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<!-- Diagram content (shape and connector positions) -->
66
<edmx:Diagrams>
77
<Diagram DiagramId="bb3c0bc4be4d497b9693c99fa529c4ab" Name="Diagram1">
8-
<EntityTypeShape EntityType="EdmxDotNetCoreApp.Entities.Thing" Width="1.5" PointX="3" PointY="0.875" IsExpanded="true" />
9-
<EntityTypeShape EntityType="EdmxDotNetCoreApp.Entities.Person" Width="1.5" PointX="0.75" PointY="1" IsExpanded="true" />
10-
<AssociationConnector Association="EdmxDotNetCoreApp.Entities.FK_dbo_Droids_dbo_People_MasterName" ManuallyRouted="false" />
8+
<EntityTypeShape EntityType="EdmxDotNetCoreSample.Entities.Thing" Width="1.5" PointX="3" PointY="0.875" IsExpanded="true" />
9+
<EntityTypeShape EntityType="EdmxDotNetCoreSample.Entities.Person" Width="1.5" PointX="0.75" PointY="1" IsExpanded="true" />
10+
<AssociationConnector Association="EdmxDotNetCoreSample.Entities.FK_dbo_Droids_dbo_People_MasterName" ManuallyRouted="false" />
1111
</Diagram>
1212
</edmx:Diagrams>
1313
</edmx:Designer>

EdmxDesignHost/Person.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </auto-generated>
88
//------------------------------------------------------------------------------
99

10-
namespace EdmxDotNetCoreApp
10+
namespace EdmxDotNetCoreSample
1111
{
1212
using System;
1313
using System.Collections.Generic;

EdmxDesignHost/Thing.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </auto-generated>
88
//------------------------------------------------------------------------------
99

10-
namespace EdmxDotNetCoreApp
10+
namespace EdmxDotNetCoreSample
1111
{
1212
using System;
1313
using System.Collections.Generic;

EdmxDotNetCoreApp.sln

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29218.8
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdmxDotNetCoreApp", "EdmxDotNetCoreApp\EdmxDotNetCoreApp.csproj", "{F930C7C8-2C66-4938-AD31-C80CF4C7BF3D}"
7-
EndProject
86
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EdmxDesignHost", "EdmxDesignHost\EdmxDesignHost.csproj", "{35174D51-AF4E-42E3-AE51-23ADFA811065}"
97
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdmxDotNetCoreSample", "EdmxDotNetCoreSample\EdmxDotNetCoreSample.csproj", "{60CFCF24-E2D8-4C68-90EF-DE205FC1659F}"
9+
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
1313
Release|Any CPU = Release|Any CPU
1414
EndGlobalSection
1515
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{F930C7C8-2C66-4938-AD31-C80CF4C7BF3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{F930C7C8-2C66-4938-AD31-C80CF4C7BF3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
18-
{F930C7C8-2C66-4938-AD31-C80CF4C7BF3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
19-
{F930C7C8-2C66-4938-AD31-C80CF4C7BF3D}.Release|Any CPU.Build.0 = Release|Any CPU
2016
{35174D51-AF4E-42E3-AE51-23ADFA811065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2117
{35174D51-AF4E-42E3-AE51-23ADFA811065}.Debug|Any CPU.Build.0 = Debug|Any CPU
2218
{35174D51-AF4E-42E3-AE51-23ADFA811065}.Release|Any CPU.ActiveCfg = Release|Any CPU
2319
{35174D51-AF4E-42E3-AE51-23ADFA811065}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{60CFCF24-E2D8-4C68-90EF-DE205FC1659F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{60CFCF24-E2D8-4C68-90EF-DE205FC1659F}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{60CFCF24-E2D8-4C68-90EF-DE205FC1659F}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{60CFCF24-E2D8-4C68-90EF-DE205FC1659F}.Release|Any CPU.Build.0 = Release|Any CPU
2424
EndGlobalSection
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<connectionStrings>
4-
<add name="Entities" connectionString="metadata=res://*/Model.Entities.csdl|res://*/Model.Entities.ssdl|res://*/Model.Entities.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(localdb)\mssqllocaldb;initial catalog=EdmxDotNetCoreApp.MyContext;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
4+
<add name="Entities" connectionString="metadata=res://*/Model.Entities.csdl|res://*/Model.Entities.ssdl|res://*/Model.Entities.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(localdb)\mssqllocaldb;initial catalog=EdmxDotNetCoreSample.MyContext;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
55
</connectionStrings>
66
</configuration>

EdmxDotNetCoreApp/Program.cs renamed to EdmxDotNetCoreSample/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Linq;
55
using System.Xml;
66

7-
namespace EdmxDotNetCoreApp
7+
namespace EdmxDotNetCoreSample
88
{
99
class Program
1010
{

0 commit comments

Comments
 (0)