Commit 73bb5cf5 authored by Carole Treser's avatar Carole Treser
Browse files

fix(entity): fix conflict and regenerate edmx file

parent e6c2f64e
Pipeline #31935 failed with stages
in 5 seconds
......@@ -2,8 +2,7 @@
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework"
type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
......@@ -74,7 +73,7 @@
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=8.0.19.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data>
<connectionStrings><add name="delmeEntities" connectionString="metadata=res://*/BeeWeatherModel.csdl|res://*/BeeWeatherModel.ssdl|res://*/BeeWeatherModel.msl;provider=MySql.Data.MySqlClient;provider connection string=&quot;server=digitalbeekeeper.de;user id=cnam1;password=Belana2016();persistsecurityinfo=True;database=delme&quot;" providerName="System.Data.EntityClient" /></connectionStrings></configuration>
<connectionStrings><add name="delmeEntities" connectionString="metadata=res://*/BeeWeatherModel.csdl|res://*/BeeWeatherModel.ssdl|res://*/BeeWeatherModel.msl;provider=MySql.Data.MySqlClient;provider connection string=&quot;server=digitalbeekeeper.de;user id=cnam1;password=Belana2016();persistsecurityinfo=True;database=delme&quot;" providerName="System.Data.EntityClient" /><add name="delmeEntities1" connectionString="metadata=res://*/BeesWeatherModel.csdl|res://*/BeesWeatherModel.ssdl|res://*/BeesWeatherModel.msl;provider=MySql.Data.MySqlClient;provider connection string=&quot;server=digitalbeekeeper.de;user id=cnam1;password=Belana2016();persistsecurityinfo=True;database=delme&quot;" providerName="System.Data.EntityClient" /></connectionStrings>
<appSettings>
<!-- ... -->
<add key="CityId" value="2925533" />
......
......@@ -47,6 +47,7 @@
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\WeatherNet.2.1\lib\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
</Reference>
......@@ -150,32 +151,47 @@
<Reference Include="System.Xml" />
<Reference Include="WeatherNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\WeatherNet.2.1\lib\WeatherNet.dll</HintPath>
</Reference>
<Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.19\lib\net452\Ubiety.Dns.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="BeeWeatherModel.Context.cs">
<Compile Include="beehive_poll_forecast.cs">
<DependentUpon>BeesWeatherModel.tt</DependentUpon>
</Compile>
<Compile Include="beehive_weather_forecast.cs">
<DependentUpon>BeesWeatherModel.tt</DependentUpon>
</Compile>
<Compile Include="BeesWeatherModel.Context.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>BeeWeatherModel.Context.tt</DependentUpon>
<DependentUpon>BeesWeatherModel.Context.tt</DependentUpon>
</Compile>
<Compile Include="BeeWeatherModel.Designer.cs">
<Compile Include="BeesWeatherModel.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>BeeWeatherModel.edmx</DependentUpon>
<DependentUpon>BeesWeatherModel.tt</DependentUpon>
</Compile>
<Compile Include="BeesWeatherModel.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>BeesWeatherModel.edmx</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ref_beehive_poll_forecast.cs">
<DependentUpon>BeesWeatherModel.tt</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<EntityDeploy Include="BeeWeatherModel.edmx">
<EntityDeploy Include="BeesWeatherModel.edmx">
<Generator>EntityModelCodeGenerator</Generator>
<LastGenOutput>BeeWeatherModel.Designer.cs</LastGenOutput>
<LastGenOutput>BeesWeatherModel.Designer.cs</LastGenOutput>
</EntityDeploy>
<None Include="BeeWeatherModel.edmx.diagram">
<DependentUpon>BeeWeatherModel.edmx</DependentUpon>
<None Include="BeesWeatherModel.edmx.diagram">
<DependentUpon>BeesWeatherModel.edmx</DependentUpon>
</None>
<None Include="packages.config" />
</ItemGroup>
......@@ -183,13 +199,19 @@
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<ItemGroup>
<Content Include="BeeWeatherModel.Context.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>BeeWeatherModel.Context.cs</LastGenOutput>
</Content>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
<Content Include="BeesWeatherModel.Context.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<DependentUpon>BeesWeatherModel.edmx</DependentUpon>
<LastGenOutput>BeesWeatherModel.Context.cs</LastGenOutput>
</Content>
<Content Include="BeesWeatherModel.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<DependentUpon>BeesWeatherModel.edmx</DependentUpon>
<LastGenOutput>BeesWeatherModel.cs</LastGenOutput>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
......
......@@ -13,10 +13,10 @@ namespace BeeWeatherPollenTracker
using System.Data.Entity;
using System.Data.Entity.Infrastructure;
public partial class delmeEntities : DbContext
public partial class delmeEntities1 : DbContext
{
public delmeEntities()
: base("name=delmeEntities")
public delmeEntities1()
: base("name=delmeEntities1")
{
}
......
......@@ -2,7 +2,7 @@
<#@ include file="EF6.Utility.CS.ttinclude"#><#@
output extension=".cs"#><#
const string inputFile = @"BeeWeatherModel.edmx";
const string inputFile = @"BeesWeatherModel.edmx";
var textTransform = DynamicTextTransformation.Create(this);
var code = new CodeGenerationTools(this);
var ef = new MetadataTools(this);
......
// La génération de code T4 est activée pour le modèle 'C:\CNAM\2A\Darmstadt\BeeWeatherPollenTracker\BeeWeatherPollenTracker\BeeWeatherModel.edmx'.
// La génération de code T4 est activée pour le modèle 'C:\CNAM\2A\Darmstadt\BeeWeatherPollenTracker\BeeWeatherPollenTracker\BeesWeatherModel.edmx'.
// Pour activer la génération de code héritée, définissez la valeur de la propriété
// du concepteur 'Stratégie de génération de code' sur 'ObjectContext hérité'. Cette propriété est disponible dans la fenêtre Propriétés lorsque le modèle
// est ouvert dans le concepteur.
......
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré à partir d'un modèle.
//
// Des modifications manuelles apportées à ce fichier peuvent conduire à un comportement inattendu de votre application.
// Les modifications manuelles apportées à ce fichier sont remplacées si le code est régénéré.
// </auto-generated>
//------------------------------------------------------------------------------
......@@ -175,7 +175,7 @@
</Dependent>
</ReferentialConstraint>
</Association>
<EntityContainer Name="delmeEntities" annotation:LazyLoadingEnabled="true">
<EntityContainer Name="delmeEntities1" annotation:LazyLoadingEnabled="true">
<EntitySet Name="beehive_poll_forecast" EntityType="Self.beehive_poll_forecast" />
<EntitySet Name="beehive_weather_forecast" EntityType="Self.beehive_weather_forecast" />
<EntitySet Name="ref_beehive_poll_forecast" EntityType="Self.ref_beehive_poll_forecast" />
......@@ -197,7 +197,7 @@
<!-- C-S mapping content -->
<edmx:Mappings>
<Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
<EntityContainerMapping StorageEntityContainer="delmeModelStoreContainer" CdmEntityContainer="delmeEntities">
<EntityContainerMapping StorageEntityContainer="delmeModelStoreContainer" CdmEntityContainer="delmeEntities1">
<EntitySetMapping Name="beehive_poll_forecast">
<EntityTypeMapping TypeName="delmeModel.beehive_poll_forecast">
<MappingFragment StoreEntitySet="beehive_poll_forecast">
......
......@@ -4,7 +4,7 @@
<edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
<!-- Diagram content (shape and connector positions) -->
<edmx:Diagrams>
<Diagram DiagramId="586a6ec027264c81b28a3e2a897217f9" Name="Diagram1">
<Diagram DiagramId="a9f5fe2bbdd242e5ac225199ca985c2c" Name="Diagram1">
<EntityTypeShape EntityType="delmeModel.beehive_poll_forecast" Width="1.5" PointX="3" PointY="1" IsExpanded="true" />
<EntityTypeShape EntityType="delmeModel.beehive_weather_forecast" Width="1.5" PointX="5.75" PointY="0.75" IsExpanded="true" />
<EntityTypeShape EntityType="delmeModel.ref_beehive_poll_forecast" Width="1.5" PointX="0.75" PointY="1.625" IsExpanded="true" />
......
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment