it's ok everything works now
wiwiw
This commit is contained in:
parent
8b143780a8
commit
1fcd81d8c8
18 changed files with 355 additions and 1670 deletions
|
|
@ -8,21 +8,21 @@
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
|
||||||
</startup>
|
</startup>
|
||||||
<entityFramework>
|
<entityFramework>
|
||||||
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
|
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework">
|
||||||
<parameters>
|
<parameters>
|
||||||
<parameter value="v13.0" />
|
<parameter value="v13.0" />
|
||||||
</parameters>
|
</parameters>
|
||||||
</defaultConnectionFactory>
|
</defaultConnectionFactory>
|
||||||
<providers>
|
<providers>
|
||||||
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
|
|
||||||
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
|
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
|
||||||
</providers>
|
</providers>
|
||||||
</entityFramework>
|
</entityFramework>
|
||||||
|
<connectionStrings configSource="connectionStrings.config" />
|
||||||
<runtime>
|
<runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
|
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-8.0.8.0" newVersion="8.0.8.0" />
|
<bindingRedirect oldVersion="0.0.0.0-6.9.9.0" newVersion="6.9.9.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||||
|
|
@ -40,7 +40,4 @@
|
||||||
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
|
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
|
||||||
</DbProviderFactories>
|
</DbProviderFactories>
|
||||||
</system.data>
|
</system.data>
|
||||||
<connectionStrings>
|
|
||||||
<add name="ScapeDb" connectionString="metadata=res://*/DAL.ScapeDb.csdl|res://*/DAL.ScapeDb.ssdl|res://*/DAL.ScapeDb.msl;provider=MySql.Data.MySqlClient;provider connection string="server=aroltd.com;user id=alec;persistsecurityinfo=True;database=scape"" providerName="System.Data.EntityClient" />
|
|
||||||
</connectionStrings>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
@ -11,14 +11,14 @@ namespace SockScape.DAL {
|
||||||
public partial class Origin {
|
public partial class Origin {
|
||||||
public long Id { get; set; }
|
public long Id { get; set; }
|
||||||
|
|
||||||
[ForeignKey("User")]
|
[ForeignKey("User"), Index("IX_RawIp_UserId_Unique", 1, IsUnique = true)]
|
||||||
[Index("IX_RawIp_UserId_Unique", 1, IsUnique = true)]
|
[Required]
|
||||||
public long UserId { get; set; }
|
public long UserId { get; set; }
|
||||||
public virtual User User { get; set; }
|
public virtual User User { get; set; }
|
||||||
|
|
||||||
[Index("IX_RawIp_UserId_Unique", 2, IsUnique = true)]
|
[Index("IX_RawIp_UserId_Unique", 2, IsUnique = true)]
|
||||||
[MaxLength(16)]
|
[MaxLength(16), Required]
|
||||||
protected byte[] RawIp { get; set; }
|
public byte[] RawIp { get; set; }
|
||||||
|
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
public IPAddress Ip {
|
public IPAddress Ip {
|
||||||
|
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// This code was generated from a template.
|
|
||||||
//
|
|
||||||
// Manual changes to this file may cause unexpected behavior in your application.
|
|
||||||
// Manual changes to this file will be overwritten if the code is regenerated.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
namespace SockScape.DAL
|
|
||||||
{
|
|
||||||
using System;
|
|
||||||
using System.Data.Entity;
|
|
||||||
using System.Data.Entity.Infrastructure;
|
|
||||||
|
|
||||||
public partial class ScapeDb : DbContext
|
|
||||||
{
|
|
||||||
public ScapeDb()
|
|
||||||
: base("name=ScapeDb")
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnModelCreating(DbModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
throw new UnintentionalCodeFirstException();
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual DbSet<Session> Sessions { get; set; }
|
|
||||||
public virtual DbSet<User> Users { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,636 +0,0 @@
|
||||||
<#@ template language="C#" debug="false" hostspecific="true"#>
|
|
||||||
<#@ include file="EF6.Utility.CS.ttinclude"#><#@
|
|
||||||
output extension=".cs"#><#
|
|
||||||
|
|
||||||
const string inputFile = @"ScapeDb.edmx";
|
|
||||||
var textTransform = DynamicTextTransformation.Create(this);
|
|
||||||
var code = new CodeGenerationTools(this);
|
|
||||||
var ef = new MetadataTools(this);
|
|
||||||
var typeMapper = new TypeMapper(code, ef, textTransform.Errors);
|
|
||||||
var loader = new EdmMetadataLoader(textTransform.Host, textTransform.Errors);
|
|
||||||
var itemCollection = loader.CreateEdmItemCollection(inputFile);
|
|
||||||
var modelNamespace = loader.GetModelNamespace(inputFile);
|
|
||||||
var codeStringGenerator = new CodeStringGenerator(code, typeMapper, ef);
|
|
||||||
|
|
||||||
var container = itemCollection.OfType<EntityContainer>().FirstOrDefault();
|
|
||||||
if (container == null)
|
|
||||||
{
|
|
||||||
return string.Empty;
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1")#>
|
|
||||||
//
|
|
||||||
// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2")#>
|
|
||||||
// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3")#>
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
<#
|
|
||||||
|
|
||||||
var codeNamespace = code.VsNamespaceSuggestion();
|
|
||||||
if (!String.IsNullOrEmpty(codeNamespace))
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
namespace <#=code.EscapeNamespace(codeNamespace)#>
|
|
||||||
{
|
|
||||||
<#
|
|
||||||
PushIndent(" ");
|
|
||||||
}
|
|
||||||
|
|
||||||
#>
|
|
||||||
using System;
|
|
||||||
using System.Data.Entity;
|
|
||||||
using System.Data.Entity.Infrastructure;
|
|
||||||
<#
|
|
||||||
if (container.FunctionImports.Any())
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
using System.Data.Entity.Core.Objects;
|
|
||||||
using System.Linq;
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
|
|
||||||
<#=Accessibility.ForType(container)#> partial class <#=code.Escape(container)#> : DbContext
|
|
||||||
{
|
|
||||||
public <#=code.Escape(container)#>()
|
|
||||||
: base("name=<#=container.Name#>")
|
|
||||||
{
|
|
||||||
<#
|
|
||||||
if (!loader.IsLazyLoadingEnabled(container))
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
this.Configuration.LazyLoadingEnabled = false;
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var entitySet in container.BaseEntitySets.OfType<EntitySet>())
|
|
||||||
{
|
|
||||||
// Note: the DbSet members are defined below such that the getter and
|
|
||||||
// setter always have the same accessibility as the DbSet definition
|
|
||||||
if (Accessibility.ForReadOnlyProperty(entitySet) != "public")
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.DbSetInitializer(entitySet)#>
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnModelCreating(DbModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
throw new UnintentionalCodeFirstException();
|
|
||||||
}
|
|
||||||
|
|
||||||
<#
|
|
||||||
foreach (var entitySet in container.BaseEntitySets.OfType<EntitySet>())
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.DbSet(entitySet)#>
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var edmFunction in container.FunctionImports)
|
|
||||||
{
|
|
||||||
WriteFunctionImport(typeMapper, codeStringGenerator, edmFunction, modelNamespace, includeMergeOption: false);
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
}
|
|
||||||
<#
|
|
||||||
|
|
||||||
if (!String.IsNullOrEmpty(codeNamespace))
|
|
||||||
{
|
|
||||||
PopIndent();
|
|
||||||
#>
|
|
||||||
}
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
<#+
|
|
||||||
|
|
||||||
private void WriteFunctionImport(TypeMapper typeMapper, CodeStringGenerator codeStringGenerator, EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
|
|
||||||
{
|
|
||||||
if (typeMapper.IsComposable(edmFunction))
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
|
|
||||||
[DbFunction("<#=edmFunction.NamespaceName#>", "<#=edmFunction.Name#>")]
|
|
||||||
<#=codeStringGenerator.ComposableFunctionMethod(edmFunction, modelNamespace)#>
|
|
||||||
{
|
|
||||||
<#+
|
|
||||||
codeStringGenerator.WriteFunctionParameters(edmFunction, WriteFunctionParameter);
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.ComposableCreateQuery(edmFunction, modelNamespace)#>
|
|
||||||
}
|
|
||||||
<#+
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
|
|
||||||
<#=codeStringGenerator.FunctionMethod(edmFunction, modelNamespace, includeMergeOption)#>
|
|
||||||
{
|
|
||||||
<#+
|
|
||||||
codeStringGenerator.WriteFunctionParameters(edmFunction, WriteFunctionParameter);
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.ExecuteFunction(edmFunction, modelNamespace, includeMergeOption)#>
|
|
||||||
}
|
|
||||||
<#+
|
|
||||||
if (typeMapper.GenerateMergeOptionFunction(edmFunction, includeMergeOption))
|
|
||||||
{
|
|
||||||
WriteFunctionImport(typeMapper, codeStringGenerator, edmFunction, modelNamespace, includeMergeOption: true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void WriteFunctionParameter(string name, string isNotNull, string notNullInit, string nullInit)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
var <#=name#> = <#=isNotNull#> ?
|
|
||||||
<#=notNullInit#> :
|
|
||||||
<#=nullInit#>;
|
|
||||||
|
|
||||||
<#+
|
|
||||||
}
|
|
||||||
|
|
||||||
public const string TemplateId = "CSharp_DbContext_Context_EF6";
|
|
||||||
|
|
||||||
public class CodeStringGenerator
|
|
||||||
{
|
|
||||||
private readonly CodeGenerationTools _code;
|
|
||||||
private readonly TypeMapper _typeMapper;
|
|
||||||
private readonly MetadataTools _ef;
|
|
||||||
|
|
||||||
public CodeStringGenerator(CodeGenerationTools code, TypeMapper typeMapper, MetadataTools ef)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(code, "code");
|
|
||||||
ArgumentNotNull(typeMapper, "typeMapper");
|
|
||||||
ArgumentNotNull(ef, "ef");
|
|
||||||
|
|
||||||
_code = code;
|
|
||||||
_typeMapper = typeMapper;
|
|
||||||
_ef = ef;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string Property(EdmProperty edmProperty)
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} {1} {2} {{ {3}get; {4}set; }}",
|
|
||||||
Accessibility.ForProperty(edmProperty),
|
|
||||||
_typeMapper.GetTypeName(edmProperty.TypeUsage),
|
|
||||||
_code.Escape(edmProperty),
|
|
||||||
_code.SpaceAfter(Accessibility.ForGetter(edmProperty)),
|
|
||||||
_code.SpaceAfter(Accessibility.ForSetter(edmProperty)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string NavigationProperty(NavigationProperty navProp)
|
|
||||||
{
|
|
||||||
var endType = _typeMapper.GetTypeName(navProp.ToEndMember.GetEntityType());
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} {1} {2} {{ {3}get; {4}set; }}",
|
|
||||||
AccessibilityAndVirtual(Accessibility.ForNavigationProperty(navProp)),
|
|
||||||
navProp.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many ? ("ICollection<" + endType + ">") : endType,
|
|
||||||
_code.Escape(navProp),
|
|
||||||
_code.SpaceAfter(Accessibility.ForGetter(navProp)),
|
|
||||||
_code.SpaceAfter(Accessibility.ForSetter(navProp)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string AccessibilityAndVirtual(string accessibility)
|
|
||||||
{
|
|
||||||
return accessibility + (accessibility != "private" ? " virtual" : "");
|
|
||||||
}
|
|
||||||
|
|
||||||
public string EntityClassOpening(EntityType entity)
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} {1}partial class {2}{3}",
|
|
||||||
Accessibility.ForType(entity),
|
|
||||||
_code.SpaceAfter(_code.AbstractOption(entity)),
|
|
||||||
_code.Escape(entity),
|
|
||||||
_code.StringBefore(" : ", _typeMapper.GetTypeName(entity.BaseType)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string EnumOpening(SimpleType enumType)
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} enum {1} : {2}",
|
|
||||||
Accessibility.ForType(enumType),
|
|
||||||
_code.Escape(enumType),
|
|
||||||
_code.Escape(_typeMapper.UnderlyingClrType(enumType)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void WriteFunctionParameters(EdmFunction edmFunction, Action<string, string, string, string> writeParameter)
|
|
||||||
{
|
|
||||||
var parameters = FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
|
|
||||||
foreach (var parameter in parameters.Where(p => p.NeedsLocalVariable))
|
|
||||||
{
|
|
||||||
var isNotNull = parameter.IsNullableOfT ? parameter.FunctionParameterName + ".HasValue" : parameter.FunctionParameterName + " != null";
|
|
||||||
var notNullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", " + parameter.FunctionParameterName + ")";
|
|
||||||
var nullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", typeof(" + TypeMapper.FixNamespaces(parameter.RawClrTypeName) + "))";
|
|
||||||
writeParameter(parameter.LocalVariableName, isNotNull, notNullInit, nullInit);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public string ComposableFunctionMethod(EdmFunction edmFunction, string modelNamespace)
|
|
||||||
{
|
|
||||||
var parameters = _typeMapper.GetParameters(edmFunction);
|
|
||||||
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} IQueryable<{1}> {2}({3})",
|
|
||||||
AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
|
|
||||||
_typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
|
|
||||||
_code.Escape(edmFunction),
|
|
||||||
string.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string ComposableCreateQuery(EdmFunction edmFunction, string modelNamespace)
|
|
||||||
{
|
|
||||||
var parameters = _typeMapper.GetParameters(edmFunction);
|
|
||||||
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"return ((IObjectContextAdapter)this).ObjectContext.CreateQuery<{0}>(\"[{1}].[{2}]({3})\"{4});",
|
|
||||||
_typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
|
|
||||||
edmFunction.NamespaceName,
|
|
||||||
edmFunction.Name,
|
|
||||||
string.Join(", ", parameters.Select(p => "@" + p.EsqlParameterName).ToArray()),
|
|
||||||
_code.StringBefore(", ", string.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray())));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string FunctionMethod(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
|
|
||||||
{
|
|
||||||
var parameters = _typeMapper.GetParameters(edmFunction);
|
|
||||||
var returnType = _typeMapper.GetReturnType(edmFunction);
|
|
||||||
|
|
||||||
var paramList = String.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray());
|
|
||||||
if (includeMergeOption)
|
|
||||||
{
|
|
||||||
paramList = _code.StringAfter(paramList, ", ") + "MergeOption mergeOption";
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} {1} {2}({3})",
|
|
||||||
AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
|
|
||||||
returnType == null ? "int" : "ObjectResult<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
|
|
||||||
_code.Escape(edmFunction),
|
|
||||||
paramList);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string ExecuteFunction(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
|
|
||||||
{
|
|
||||||
var parameters = _typeMapper.GetParameters(edmFunction);
|
|
||||||
var returnType = _typeMapper.GetReturnType(edmFunction);
|
|
||||||
|
|
||||||
var callParams = _code.StringBefore(", ", String.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray()));
|
|
||||||
if (includeMergeOption)
|
|
||||||
{
|
|
||||||
callParams = ", mergeOption" + callParams;
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction{0}(\"{1}\"{2});",
|
|
||||||
returnType == null ? "" : "<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
|
|
||||||
edmFunction.Name,
|
|
||||||
callParams);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string DbSet(EntitySet entitySet)
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} virtual DbSet<{1}> {2} {{ get; set; }}",
|
|
||||||
Accessibility.ForReadOnlyProperty(entitySet),
|
|
||||||
_typeMapper.GetTypeName(entitySet.ElementType),
|
|
||||||
_code.Escape(entitySet));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string DbSetInitializer(EntitySet entitySet)
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} = Set<{1}>();",
|
|
||||||
_code.Escape(entitySet),
|
|
||||||
_typeMapper.GetTypeName(entitySet.ElementType));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string UsingDirectives(bool inHeader, bool includeCollections = true)
|
|
||||||
{
|
|
||||||
return inHeader == string.IsNullOrEmpty(_code.VsNamespaceSuggestion())
|
|
||||||
? string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0}using System;{1}" +
|
|
||||||
"{2}",
|
|
||||||
inHeader ? Environment.NewLine : "",
|
|
||||||
includeCollections ? (Environment.NewLine + "using System.Collections.Generic;") : "",
|
|
||||||
inHeader ? "" : Environment.NewLine)
|
|
||||||
: "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class TypeMapper
|
|
||||||
{
|
|
||||||
private const string ExternalTypeNameAttributeName = @"http://schemas.microsoft.com/ado/2006/04/codegeneration:ExternalTypeName";
|
|
||||||
|
|
||||||
private readonly System.Collections.IList _errors;
|
|
||||||
private readonly CodeGenerationTools _code;
|
|
||||||
private readonly MetadataTools _ef;
|
|
||||||
|
|
||||||
public static string FixNamespaces(string typeName)
|
|
||||||
{
|
|
||||||
return typeName.Replace("System.Data.Spatial.", "System.Data.Entity.Spatial.");
|
|
||||||
}
|
|
||||||
|
|
||||||
public TypeMapper(CodeGenerationTools code, MetadataTools ef, System.Collections.IList errors)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(code, "code");
|
|
||||||
ArgumentNotNull(ef, "ef");
|
|
||||||
ArgumentNotNull(errors, "errors");
|
|
||||||
|
|
||||||
_code = code;
|
|
||||||
_ef = ef;
|
|
||||||
_errors = errors;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTypeName(TypeUsage typeUsage)
|
|
||||||
{
|
|
||||||
return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace: null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTypeName(EdmType edmType)
|
|
||||||
{
|
|
||||||
return GetTypeName(edmType, isNullable: null, modelNamespace: null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTypeName(TypeUsage typeUsage, string modelNamespace)
|
|
||||||
{
|
|
||||||
return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTypeName(EdmType edmType, string modelNamespace)
|
|
||||||
{
|
|
||||||
return GetTypeName(edmType, isNullable: null, modelNamespace: modelNamespace);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTypeName(EdmType edmType, bool? isNullable, string modelNamespace)
|
|
||||||
{
|
|
||||||
if (edmType == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
var collectionType = edmType as CollectionType;
|
|
||||||
if (collectionType != null)
|
|
||||||
{
|
|
||||||
return String.Format(CultureInfo.InvariantCulture, "ICollection<{0}>", GetTypeName(collectionType.TypeUsage, modelNamespace));
|
|
||||||
}
|
|
||||||
|
|
||||||
var typeName = _code.Escape(edmType.MetadataProperties
|
|
||||||
.Where(p => p.Name == ExternalTypeNameAttributeName)
|
|
||||||
.Select(p => (string)p.Value)
|
|
||||||
.FirstOrDefault())
|
|
||||||
?? (modelNamespace != null && edmType.NamespaceName != modelNamespace ?
|
|
||||||
_code.CreateFullName(_code.EscapeNamespace(edmType.NamespaceName), _code.Escape(edmType)) :
|
|
||||||
_code.Escape(edmType));
|
|
||||||
|
|
||||||
if (edmType is StructuralType)
|
|
||||||
{
|
|
||||||
return typeName;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (edmType is SimpleType)
|
|
||||||
{
|
|
||||||
var clrType = UnderlyingClrType(edmType);
|
|
||||||
if (!IsEnumType(edmType))
|
|
||||||
{
|
|
||||||
typeName = _code.Escape(clrType);
|
|
||||||
}
|
|
||||||
|
|
||||||
typeName = FixNamespaces(typeName);
|
|
||||||
|
|
||||||
return clrType.IsValueType && isNullable == true ?
|
|
||||||
String.Format(CultureInfo.InvariantCulture, "Nullable<{0}>", typeName) :
|
|
||||||
typeName;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new ArgumentException("edmType");
|
|
||||||
}
|
|
||||||
|
|
||||||
public Type UnderlyingClrType(EdmType edmType)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(edmType, "edmType");
|
|
||||||
|
|
||||||
var primitiveType = edmType as PrimitiveType;
|
|
||||||
if (primitiveType != null)
|
|
||||||
{
|
|
||||||
return primitiveType.ClrEquivalentType;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (IsEnumType(edmType))
|
|
||||||
{
|
|
||||||
return GetEnumUnderlyingType(edmType).ClrEquivalentType;
|
|
||||||
}
|
|
||||||
|
|
||||||
return typeof(object);
|
|
||||||
}
|
|
||||||
|
|
||||||
public object GetEnumMemberValue(MetadataItem enumMember)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(enumMember, "enumMember");
|
|
||||||
|
|
||||||
var valueProperty = enumMember.GetType().GetProperty("Value");
|
|
||||||
return valueProperty == null ? null : valueProperty.GetValue(enumMember, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetEnumMemberName(MetadataItem enumMember)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(enumMember, "enumMember");
|
|
||||||
|
|
||||||
var nameProperty = enumMember.GetType().GetProperty("Name");
|
|
||||||
return nameProperty == null ? null : (string)nameProperty.GetValue(enumMember, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public System.Collections.IEnumerable GetEnumMembers(EdmType enumType)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(enumType, "enumType");
|
|
||||||
|
|
||||||
var membersProperty = enumType.GetType().GetProperty("Members");
|
|
||||||
return membersProperty != null
|
|
||||||
? (System.Collections.IEnumerable)membersProperty.GetValue(enumType, null)
|
|
||||||
: Enumerable.Empty<MetadataItem>();
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool EnumIsFlags(EdmType enumType)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(enumType, "enumType");
|
|
||||||
|
|
||||||
var isFlagsProperty = enumType.GetType().GetProperty("IsFlags");
|
|
||||||
return isFlagsProperty != null && (bool)isFlagsProperty.GetValue(enumType, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool IsEnumType(GlobalItem edmType)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(edmType, "edmType");
|
|
||||||
|
|
||||||
return edmType.GetType().Name == "EnumType";
|
|
||||||
}
|
|
||||||
|
|
||||||
public PrimitiveType GetEnumUnderlyingType(EdmType enumType)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(enumType, "enumType");
|
|
||||||
|
|
||||||
return (PrimitiveType)enumType.GetType().GetProperty("UnderlyingType").GetValue(enumType, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string CreateLiteral(object value)
|
|
||||||
{
|
|
||||||
if (value == null || value.GetType() != typeof(TimeSpan))
|
|
||||||
{
|
|
||||||
return _code.CreateLiteral(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Format(CultureInfo.InvariantCulture, "new TimeSpan({0})", ((TimeSpan)value).Ticks);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool VerifyCaseInsensitiveTypeUniqueness(IEnumerable<string> types, string sourceFile)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(types, "types");
|
|
||||||
ArgumentNotNull(sourceFile, "sourceFile");
|
|
||||||
|
|
||||||
var hash = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
|
|
||||||
if (types.Any(item => !hash.Add(item)))
|
|
||||||
{
|
|
||||||
_errors.Add(
|
|
||||||
new CompilerError(sourceFile, -1, -1, "6023",
|
|
||||||
String.Format(CultureInfo.CurrentCulture, CodeGenerationTools.GetResourceString("Template_CaseInsensitiveTypeConflict"))));
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<SimpleType> GetEnumItemsToGenerate(IEnumerable<GlobalItem> itemCollection)
|
|
||||||
{
|
|
||||||
return GetItemsToGenerate<SimpleType>(itemCollection)
|
|
||||||
.Where(e => IsEnumType(e));
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<T> GetItemsToGenerate<T>(IEnumerable<GlobalItem> itemCollection) where T: EdmType
|
|
||||||
{
|
|
||||||
return itemCollection
|
|
||||||
.OfType<T>()
|
|
||||||
.Where(i => !i.MetadataProperties.Any(p => p.Name == ExternalTypeNameAttributeName))
|
|
||||||
.OrderBy(i => i.Name);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<string> GetAllGlobalItems(IEnumerable<GlobalItem> itemCollection)
|
|
||||||
{
|
|
||||||
return itemCollection
|
|
||||||
.Where(i => i is EntityType || i is ComplexType || i is EntityContainer || IsEnumType(i))
|
|
||||||
.Select(g => GetGlobalItemName(g));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetGlobalItemName(GlobalItem item)
|
|
||||||
{
|
|
||||||
if (item is EdmType)
|
|
||||||
{
|
|
||||||
return ((EdmType)item).Name;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return ((EntityContainer)item).Name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetSimpleProperties(EntityType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetSimpleProperties(ComplexType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetComplexProperties(EntityType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetComplexProperties(ComplexType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(EntityType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(ComplexType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<NavigationProperty> GetNavigationProperties(EntityType type)
|
|
||||||
{
|
|
||||||
return type.NavigationProperties.Where(np => np.DeclaringType == type);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<NavigationProperty> GetCollectionNavigationProperties(EntityType type)
|
|
||||||
{
|
|
||||||
return type.NavigationProperties.Where(np => np.DeclaringType == type && np.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many);
|
|
||||||
}
|
|
||||||
|
|
||||||
public FunctionParameter GetReturnParameter(EdmFunction edmFunction)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(edmFunction, "edmFunction");
|
|
||||||
|
|
||||||
var returnParamsProperty = edmFunction.GetType().GetProperty("ReturnParameters");
|
|
||||||
return returnParamsProperty == null
|
|
||||||
? edmFunction.ReturnParameter
|
|
||||||
: ((IEnumerable<FunctionParameter>)returnParamsProperty.GetValue(edmFunction, null)).FirstOrDefault();
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool IsComposable(EdmFunction edmFunction)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(edmFunction, "edmFunction");
|
|
||||||
|
|
||||||
var isComposableProperty = edmFunction.GetType().GetProperty("IsComposableAttribute");
|
|
||||||
return isComposableProperty != null && (bool)isComposableProperty.GetValue(edmFunction, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<FunctionImportParameter> GetParameters(EdmFunction edmFunction)
|
|
||||||
{
|
|
||||||
return FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
|
|
||||||
}
|
|
||||||
|
|
||||||
public TypeUsage GetReturnType(EdmFunction edmFunction)
|
|
||||||
{
|
|
||||||
var returnParam = GetReturnParameter(edmFunction);
|
|
||||||
return returnParam == null ? null : _ef.GetElementType(returnParam.TypeUsage);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool GenerateMergeOptionFunction(EdmFunction edmFunction, bool includeMergeOption)
|
|
||||||
{
|
|
||||||
var returnType = GetReturnType(edmFunction);
|
|
||||||
return !includeMergeOption && returnType != null && returnType.EdmType.BuiltInTypeKind == BuiltInTypeKind.EntityType;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void ArgumentNotNull<T>(T arg, string name) where T : class
|
|
||||||
{
|
|
||||||
if (arg == null)
|
|
||||||
{
|
|
||||||
throw new ArgumentNullException(name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
10
server/DAL/ScapeDb.Designer.cs
generated
10
server/DAL/ScapeDb.Designer.cs
generated
|
|
@ -1,10 +0,0 @@
|
||||||
// T4 code generation is enabled for model 'C:\Users\Alec\Desktop\GitHub\circlescape\server\DAL\ScapeDb.edmx'.
|
|
||||||
// To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
|
|
||||||
// property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
|
|
||||||
// is open in the designer.
|
|
||||||
|
|
||||||
// If no context and entity classes have been generated, it may be because you created an empty model but
|
|
||||||
// have not yet chosen which version of Entity Framework to use. To generate a context class and entity
|
|
||||||
// classes for your model, open the model in the designer, right-click on the designer surface, and
|
|
||||||
// select 'Update Model from Database...', 'Generate Database from Model...', or 'Add Code Generation
|
|
||||||
// Item...'.
|
|
||||||
|
|
@ -1,9 +1,39 @@
|
||||||
//------------------------------------------------------------------------------
|
using System;
|
||||||
// <auto-generated>
|
using System.Data.Entity;
|
||||||
// This code was generated from a template.
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
//
|
using System.IO;
|
||||||
// Manual changes to this file may cause unexpected behavior in your application.
|
using System.Linq;
|
||||||
// Manual changes to this file will be overwritten if the code is regenerated.
|
using Config = SockScape.Configuration;
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
namespace SockScape.DAL {
|
||||||
|
[DbConfigurationType(typeof(MySql.Data.Entity.MySqlEFConfiguration))]
|
||||||
|
internal partial class ScapeDb : DbContext {
|
||||||
|
private static readonly string Dsn;
|
||||||
|
|
||||||
|
static ScapeDb() {
|
||||||
|
DbConfiguration.SetConfiguration(new MySql.Data.Entity.MySqlEFConfiguration());
|
||||||
|
|
||||||
|
// fix for migrations
|
||||||
|
if(!Directory.GetCurrentDirectory().ToLower().Contains(":\\windows")) {
|
||||||
|
Dsn = "server=" + Config.Database["Server"]
|
||||||
|
+ ";port=" + (Config.Database["Port"] ?? "3306")
|
||||||
|
+ ";user id=" + Config.Database["Username"]
|
||||||
|
+ ";password=" + Config.Database["Password"]
|
||||||
|
+ ";persistsecurityinfo=True;"
|
||||||
|
+ "database=" + Config.Database["Database"];
|
||||||
|
} else {
|
||||||
|
Dsn = "name=ScapeDb";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ScapeDb() : base(Dsn) { }
|
||||||
|
|
||||||
|
public DbSet<User> Users { get; set; }
|
||||||
|
public DbSet<Origin> Origins { get; set; }
|
||||||
|
public DbSet<Session> Sessions { get; set; }
|
||||||
|
|
||||||
|
protected override void OnModelCreating(DbModelBuilder builder) {
|
||||||
|
base.OnModelCreating(builder);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,142 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<edmx:Edmx Version="3.0" xmlns:edmx="http://schemas.microsoft.com/ado/2009/11/edmx">
|
|
||||||
<!-- EF Runtime content -->
|
|
||||||
<edmx:Runtime>
|
|
||||||
<!-- SSDL content -->
|
|
||||||
<edmx:StorageModels>
|
|
||||||
<Schema Namespace="scapeModel.Store" Provider="MySql.Data.MySqlClient" ProviderManifestToken="5.5" 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">
|
|
||||||
<EntityType Name="Sessions">
|
|
||||||
<Key>
|
|
||||||
<PropertyRef Name="Id" />
|
|
||||||
</Key>
|
|
||||||
<Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
|
|
||||||
<Property Name="Secret" Type="binary" MaxLength="20" Nullable="false" />
|
|
||||||
<Property Name="UserId" Type="bigint" Nullable="false" />
|
|
||||||
<Property Name="ServerId" Type="int" Nullable="false" />
|
|
||||||
</EntityType>
|
|
||||||
<EntityType Name="Users">
|
|
||||||
<Key>
|
|
||||||
<PropertyRef Name="Id" />
|
|
||||||
</Key>
|
|
||||||
<Property Name="Id" Type="bigint" StoreGeneratedPattern="Identity" Nullable="false" />
|
|
||||||
<Property Name="Username" Type="varchar" MaxLength="16" Nullable="false" />
|
|
||||||
<Property Name="Password" Type="varchar" MaxLength="256" Nullable="false" />
|
|
||||||
<Property Name="Joined" Type="datetime" Precision="0" Nullable="false" />
|
|
||||||
<Property Name="LastLogin" Type="datetime" Precision="0" />
|
|
||||||
</EntityType>
|
|
||||||
<Association Name="IX_FK_UserId_Users">
|
|
||||||
<End Role="Users" Type="Self.Users" Multiplicity="1" />
|
|
||||||
<End Role="Sessions" Type="Self.Sessions" Multiplicity="*" />
|
|
||||||
<ReferentialConstraint>
|
|
||||||
<Principal Role="Users">
|
|
||||||
<PropertyRef Name="Id" />
|
|
||||||
</Principal>
|
|
||||||
<Dependent Role="Sessions">
|
|
||||||
<PropertyRef Name="UserId" />
|
|
||||||
</Dependent>
|
|
||||||
</ReferentialConstraint>
|
|
||||||
</Association>
|
|
||||||
<EntityContainer Name="scapeModelStoreContainer">
|
|
||||||
<EntitySet Name="Sessions" EntityType="Self.Sessions" Schema="scape" store:Type="Tables" />
|
|
||||||
<EntitySet Name="Users" EntityType="Self.Users" Schema="scape" store:Type="Tables" />
|
|
||||||
<AssociationSet Name="IX_FK_UserId_Users" Association="Self.IX_FK_UserId_Users">
|
|
||||||
<End Role="Users" EntitySet="Users" />
|
|
||||||
<End Role="Sessions" EntitySet="Sessions" />
|
|
||||||
</AssociationSet>
|
|
||||||
</EntityContainer>
|
|
||||||
</Schema></edmx:StorageModels>
|
|
||||||
<!-- CSDL content -->
|
|
||||||
<edmx:ConceptualModels>
|
|
||||||
<Schema Namespace="scapeModel" 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">
|
|
||||||
<EntityType Name="Session">
|
|
||||||
<Key>
|
|
||||||
<PropertyRef Name="Id" />
|
|
||||||
</Key>
|
|
||||||
<Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
|
|
||||||
<Property Name="Secret" Type="Binary" Nullable="false" MaxLength="20" FixedLength="true" />
|
|
||||||
<Property Name="UserId" Type="Int64" Nullable="false" />
|
|
||||||
<Property Name="ServerId" Type="Int32" Nullable="false" />
|
|
||||||
<NavigationProperty Name="User" Relationship="Self.IX_FK_UserId_Users" FromRole="Sessions" ToRole="Users" />
|
|
||||||
</EntityType>
|
|
||||||
<EntityType Name="User">
|
|
||||||
<Key>
|
|
||||||
<PropertyRef Name="Id" />
|
|
||||||
</Key>
|
|
||||||
<Property Name="Id" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
|
|
||||||
<Property Name="Username" Type="String" MaxLength="16" FixedLength="false" Unicode="false" Nullable="false" />
|
|
||||||
<Property Name="Password" Type="String" MaxLength="256" FixedLength="false" Unicode="false" Nullable="false" />
|
|
||||||
<Property Name="Joined" Type="DateTime" Nullable="false" />
|
|
||||||
<Property Name="LastLogin" Type="DateTime" />
|
|
||||||
<NavigationProperty Name="Sessions" Relationship="Self.IX_FK_UserId_Users" FromRole="Users" ToRole="Sessions" />
|
|
||||||
</EntityType>
|
|
||||||
<Association Name="IX_FK_UserId_Users">
|
|
||||||
<End Role="Users" Type="Self.User" Multiplicity="1" />
|
|
||||||
<End Role="Sessions" Type="Self.Session" Multiplicity="*" />
|
|
||||||
<ReferentialConstraint>
|
|
||||||
<Principal Role="Users">
|
|
||||||
<PropertyRef Name="Id" />
|
|
||||||
</Principal>
|
|
||||||
<Dependent Role="Sessions">
|
|
||||||
<PropertyRef Name="UserId" />
|
|
||||||
</Dependent>
|
|
||||||
</ReferentialConstraint>
|
|
||||||
</Association>
|
|
||||||
<EntityContainer Name="ScapeDb" annotation:LazyLoadingEnabled="true">
|
|
||||||
<EntitySet Name="Sessions" EntityType="Self.Session" />
|
|
||||||
<EntitySet Name="Users" EntityType="Self.User" />
|
|
||||||
<AssociationSet Name="IX_FK_UserId_Users" Association="Self.IX_FK_UserId_Users">
|
|
||||||
<End Role="Users" EntitySet="Users" />
|
|
||||||
<End Role="Sessions" EntitySet="Sessions" />
|
|
||||||
</AssociationSet>
|
|
||||||
</EntityContainer>
|
|
||||||
</Schema>
|
|
||||||
</edmx:ConceptualModels>
|
|
||||||
<!-- C-S mapping content -->
|
|
||||||
<edmx:Mappings>
|
|
||||||
<Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
|
|
||||||
<EntityContainerMapping StorageEntityContainer="scapeModelStoreContainer" CdmEntityContainer="ScapeDb">
|
|
||||||
<EntitySetMapping Name="Sessions">
|
|
||||||
<EntityTypeMapping TypeName="scapeModel.Session">
|
|
||||||
<MappingFragment StoreEntitySet="Sessions">
|
|
||||||
<ScalarProperty Name="Id" ColumnName="Id" />
|
|
||||||
<ScalarProperty Name="Secret" ColumnName="Secret" />
|
|
||||||
<ScalarProperty Name="UserId" ColumnName="UserId" />
|
|
||||||
<ScalarProperty Name="ServerId" ColumnName="ServerId" />
|
|
||||||
</MappingFragment>
|
|
||||||
</EntityTypeMapping>
|
|
||||||
</EntitySetMapping>
|
|
||||||
<EntitySetMapping Name="Users">
|
|
||||||
<EntityTypeMapping TypeName="scapeModel.User">
|
|
||||||
<MappingFragment StoreEntitySet="Users">
|
|
||||||
<ScalarProperty Name="Id" ColumnName="Id" />
|
|
||||||
<ScalarProperty Name="Username" ColumnName="Username" />
|
|
||||||
<ScalarProperty Name="Password" ColumnName="Password" />
|
|
||||||
<ScalarProperty Name="Joined" ColumnName="Joined" />
|
|
||||||
<ScalarProperty Name="LastLogin" ColumnName="LastLogin" />
|
|
||||||
</MappingFragment>
|
|
||||||
</EntityTypeMapping>
|
|
||||||
</EntitySetMapping>
|
|
||||||
</EntityContainerMapping>
|
|
||||||
</Mapping>
|
|
||||||
</edmx:Mappings>
|
|
||||||
</edmx:Runtime>
|
|
||||||
<!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->
|
|
||||||
<Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
|
|
||||||
<Connection>
|
|
||||||
<DesignerInfoPropertySet>
|
|
||||||
<DesignerProperty Name="MetadataArtifactProcessing" Value="EmbedInOutputAssembly" />
|
|
||||||
</DesignerInfoPropertySet>
|
|
||||||
</Connection>
|
|
||||||
<Options>
|
|
||||||
<DesignerInfoPropertySet>
|
|
||||||
<DesignerProperty Name="ValidateOnBuild" Value="true" />
|
|
||||||
<DesignerProperty Name="EnablePluralization" Value="true" />
|
|
||||||
<DesignerProperty Name="IncludeForeignKeysInModel" Value="true" />
|
|
||||||
<DesignerProperty Name="UseLegacyProvider" Value="false" />
|
|
||||||
<DesignerProperty Name="CodeGenerationStrategy" Value="None" />
|
|
||||||
</DesignerInfoPropertySet>
|
|
||||||
</Options>
|
|
||||||
<!-- Diagram content (shape and connector positions) -->
|
|
||||||
<Diagrams></Diagrams>
|
|
||||||
</Designer>
|
|
||||||
</edmx:Edmx>
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<edmx:Edmx Version="3.0" xmlns:edmx="http://schemas.microsoft.com/ado/2009/11/edmx">
|
|
||||||
<!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->
|
|
||||||
<edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
|
|
||||||
<!-- Diagram content (shape and connector positions) -->
|
|
||||||
<edmx:Diagrams>
|
|
||||||
<Diagram DiagramId="a9efd1a15f4941d58d923b1be45ee1e2" Name="Diagram1">
|
|
||||||
<EntityTypeShape EntityType="scapeModel.Session" Width="1.5" PointX="3" PointY="1" IsExpanded="true" />
|
|
||||||
<EntityTypeShape EntityType="scapeModel.User" Width="1.5" PointX="0.75" PointY="0.875" IsExpanded="true" />
|
|
||||||
<AssociationConnector Association="scapeModel.IX_FK_UserId_Users" ManuallyRouted="false" />
|
|
||||||
</Diagram>
|
|
||||||
</edmx:Diagrams>
|
|
||||||
</edmx:Designer>
|
|
||||||
</edmx:Edmx>
|
|
||||||
|
|
@ -1,733 +0,0 @@
|
||||||
<#@ template language="C#" debug="false" hostspecific="true"#>
|
|
||||||
<#@ include file="EF6.Utility.CS.ttinclude"#><#@
|
|
||||||
output extension=".cs"#><#
|
|
||||||
|
|
||||||
const string inputFile = @"ScapeDb.edmx";
|
|
||||||
var textTransform = DynamicTextTransformation.Create(this);
|
|
||||||
var code = new CodeGenerationTools(this);
|
|
||||||
var ef = new MetadataTools(this);
|
|
||||||
var typeMapper = new TypeMapper(code, ef, textTransform.Errors);
|
|
||||||
var fileManager = EntityFrameworkTemplateFileManager.Create(this);
|
|
||||||
var itemCollection = new EdmMetadataLoader(textTransform.Host, textTransform.Errors).CreateEdmItemCollection(inputFile);
|
|
||||||
var codeStringGenerator = new CodeStringGenerator(code, typeMapper, ef);
|
|
||||||
|
|
||||||
if (!typeMapper.VerifyCaseInsensitiveTypeUniqueness(typeMapper.GetAllGlobalItems(itemCollection), inputFile))
|
|
||||||
{
|
|
||||||
return string.Empty;
|
|
||||||
}
|
|
||||||
|
|
||||||
WriteHeader(codeStringGenerator, fileManager);
|
|
||||||
|
|
||||||
foreach (var entity in typeMapper.GetItemsToGenerate<EntityType>(itemCollection))
|
|
||||||
{
|
|
||||||
fileManager.StartNewFile(entity.Name + ".cs");
|
|
||||||
BeginNamespace(code);
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.UsingDirectives(inHeader: false)#>
|
|
||||||
<#=codeStringGenerator.EntityClassOpening(entity)#>
|
|
||||||
{
|
|
||||||
<#
|
|
||||||
var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(entity);
|
|
||||||
var collectionNavigationProperties = typeMapper.GetCollectionNavigationProperties(entity);
|
|
||||||
var complexProperties = typeMapper.GetComplexProperties(entity);
|
|
||||||
|
|
||||||
if (propertiesWithDefaultValues.Any() || collectionNavigationProperties.Any() || complexProperties.Any())
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
|
|
||||||
public <#=code.Escape(entity)#>()
|
|
||||||
{
|
|
||||||
<#
|
|
||||||
foreach (var edmProperty in propertiesWithDefaultValues)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
this.<#=code.Escape(edmProperty)#> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue)#>;
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var navigationProperty in collectionNavigationProperties)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
this.<#=code.Escape(navigationProperty)#> = new HashSet<<#=typeMapper.GetTypeName(navigationProperty.ToEndMember.GetEntityType())#>>();
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var complexProperty in complexProperties)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
this.<#=code.Escape(complexProperty)#> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage)#>();
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
}
|
|
||||||
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
|
|
||||||
var simpleProperties = typeMapper.GetSimpleProperties(entity);
|
|
||||||
if (simpleProperties.Any())
|
|
||||||
{
|
|
||||||
foreach (var edmProperty in simpleProperties)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.Property(edmProperty)#>
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (complexProperties.Any())
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
|
|
||||||
<#
|
|
||||||
foreach(var complexProperty in complexProperties)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.Property(complexProperty)#>
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var navigationProperties = typeMapper.GetNavigationProperties(entity);
|
|
||||||
if (navigationProperties.Any())
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
|
|
||||||
<#
|
|
||||||
foreach (var navigationProperty in navigationProperties)
|
|
||||||
{
|
|
||||||
if (navigationProperty.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.NavigationProperty(navigationProperty)#>
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
}
|
|
||||||
<#
|
|
||||||
EndNamespace(code);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var complex in typeMapper.GetItemsToGenerate<ComplexType>(itemCollection))
|
|
||||||
{
|
|
||||||
fileManager.StartNewFile(complex.Name + ".cs");
|
|
||||||
BeginNamespace(code);
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false)#>
|
|
||||||
<#=Accessibility.ForType(complex)#> partial class <#=code.Escape(complex)#>
|
|
||||||
{
|
|
||||||
<#
|
|
||||||
var complexProperties = typeMapper.GetComplexProperties(complex);
|
|
||||||
var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(complex);
|
|
||||||
|
|
||||||
if (propertiesWithDefaultValues.Any() || complexProperties.Any())
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
public <#=code.Escape(complex)#>()
|
|
||||||
{
|
|
||||||
<#
|
|
||||||
foreach (var edmProperty in propertiesWithDefaultValues)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
this.<#=code.Escape(edmProperty)#> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue)#>;
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var complexProperty in complexProperties)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
this.<#=code.Escape(complexProperty)#> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage)#>();
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
}
|
|
||||||
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
|
|
||||||
var simpleProperties = typeMapper.GetSimpleProperties(complex);
|
|
||||||
if (simpleProperties.Any())
|
|
||||||
{
|
|
||||||
foreach(var edmProperty in simpleProperties)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.Property(edmProperty)#>
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (complexProperties.Any())
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
|
|
||||||
<#
|
|
||||||
foreach(var edmProperty in complexProperties)
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.Property(edmProperty)#>
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
}
|
|
||||||
<#
|
|
||||||
EndNamespace(code);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var enumType in typeMapper.GetEnumItemsToGenerate(itemCollection))
|
|
||||||
{
|
|
||||||
fileManager.StartNewFile(enumType.Name + ".cs");
|
|
||||||
BeginNamespace(code);
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false)#>
|
|
||||||
<#
|
|
||||||
if (typeMapper.EnumIsFlags(enumType))
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
[Flags]
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
<#=codeStringGenerator.EnumOpening(enumType)#>
|
|
||||||
{
|
|
||||||
<#
|
|
||||||
var foundOne = false;
|
|
||||||
|
|
||||||
foreach (MetadataItem member in typeMapper.GetEnumMembers(enumType))
|
|
||||||
{
|
|
||||||
foundOne = true;
|
|
||||||
#>
|
|
||||||
<#=code.Escape(typeMapper.GetEnumMemberName(member))#> = <#=typeMapper.GetEnumMemberValue(member)#>,
|
|
||||||
<#
|
|
||||||
}
|
|
||||||
|
|
||||||
if (foundOne)
|
|
||||||
{
|
|
||||||
this.GenerationEnvironment.Remove(this.GenerationEnvironment.Length - 3, 1);
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
}
|
|
||||||
<#
|
|
||||||
EndNamespace(code);
|
|
||||||
}
|
|
||||||
|
|
||||||
fileManager.Process();
|
|
||||||
|
|
||||||
#>
|
|
||||||
<#+
|
|
||||||
|
|
||||||
public void WriteHeader(CodeStringGenerator codeStringGenerator, EntityFrameworkTemplateFileManager fileManager)
|
|
||||||
{
|
|
||||||
fileManager.StartHeader();
|
|
||||||
#>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1")#>
|
|
||||||
//
|
|
||||||
// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2")#>
|
|
||||||
// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3")#>
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
<#=codeStringGenerator.UsingDirectives(inHeader: true)#>
|
|
||||||
<#+
|
|
||||||
fileManager.EndBlock();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void BeginNamespace(CodeGenerationTools code)
|
|
||||||
{
|
|
||||||
var codeNamespace = code.VsNamespaceSuggestion();
|
|
||||||
if (!String.IsNullOrEmpty(codeNamespace))
|
|
||||||
{
|
|
||||||
#>
|
|
||||||
namespace <#=code.EscapeNamespace(codeNamespace)#>
|
|
||||||
{
|
|
||||||
<#+
|
|
||||||
PushIndent(" ");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void EndNamespace(CodeGenerationTools code)
|
|
||||||
{
|
|
||||||
if (!String.IsNullOrEmpty(code.VsNamespaceSuggestion()))
|
|
||||||
{
|
|
||||||
PopIndent();
|
|
||||||
#>
|
|
||||||
}
|
|
||||||
<#+
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public const string TemplateId = "CSharp_DbContext_Types_EF6";
|
|
||||||
|
|
||||||
public class CodeStringGenerator
|
|
||||||
{
|
|
||||||
private readonly CodeGenerationTools _code;
|
|
||||||
private readonly TypeMapper _typeMapper;
|
|
||||||
private readonly MetadataTools _ef;
|
|
||||||
|
|
||||||
public CodeStringGenerator(CodeGenerationTools code, TypeMapper typeMapper, MetadataTools ef)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(code, "code");
|
|
||||||
ArgumentNotNull(typeMapper, "typeMapper");
|
|
||||||
ArgumentNotNull(ef, "ef");
|
|
||||||
|
|
||||||
_code = code;
|
|
||||||
_typeMapper = typeMapper;
|
|
||||||
_ef = ef;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string Property(EdmProperty edmProperty)
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} {1} {2} {{ {3}get; {4}set; }}",
|
|
||||||
Accessibility.ForProperty(edmProperty),
|
|
||||||
_typeMapper.GetTypeName(edmProperty.TypeUsage),
|
|
||||||
_code.Escape(edmProperty),
|
|
||||||
_code.SpaceAfter(Accessibility.ForGetter(edmProperty)),
|
|
||||||
_code.SpaceAfter(Accessibility.ForSetter(edmProperty)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string NavigationProperty(NavigationProperty navProp)
|
|
||||||
{
|
|
||||||
var endType = _typeMapper.GetTypeName(navProp.ToEndMember.GetEntityType());
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} {1} {2} {{ {3}get; {4}set; }}",
|
|
||||||
AccessibilityAndVirtual(Accessibility.ForNavigationProperty(navProp)),
|
|
||||||
navProp.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many ? ("ICollection<" + endType + ">") : endType,
|
|
||||||
_code.Escape(navProp),
|
|
||||||
_code.SpaceAfter(Accessibility.ForGetter(navProp)),
|
|
||||||
_code.SpaceAfter(Accessibility.ForSetter(navProp)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string AccessibilityAndVirtual(string accessibility)
|
|
||||||
{
|
|
||||||
return accessibility + (accessibility != "private" ? " virtual" : "");
|
|
||||||
}
|
|
||||||
|
|
||||||
public string EntityClassOpening(EntityType entity)
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} {1}partial class {2}{3}",
|
|
||||||
Accessibility.ForType(entity),
|
|
||||||
_code.SpaceAfter(_code.AbstractOption(entity)),
|
|
||||||
_code.Escape(entity),
|
|
||||||
_code.StringBefore(" : ", _typeMapper.GetTypeName(entity.BaseType)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string EnumOpening(SimpleType enumType)
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} enum {1} : {2}",
|
|
||||||
Accessibility.ForType(enumType),
|
|
||||||
_code.Escape(enumType),
|
|
||||||
_code.Escape(_typeMapper.UnderlyingClrType(enumType)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void WriteFunctionParameters(EdmFunction edmFunction, Action<string, string, string, string> writeParameter)
|
|
||||||
{
|
|
||||||
var parameters = FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
|
|
||||||
foreach (var parameter in parameters.Where(p => p.NeedsLocalVariable))
|
|
||||||
{
|
|
||||||
var isNotNull = parameter.IsNullableOfT ? parameter.FunctionParameterName + ".HasValue" : parameter.FunctionParameterName + " != null";
|
|
||||||
var notNullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", " + parameter.FunctionParameterName + ")";
|
|
||||||
var nullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", typeof(" + TypeMapper.FixNamespaces(parameter.RawClrTypeName) + "))";
|
|
||||||
writeParameter(parameter.LocalVariableName, isNotNull, notNullInit, nullInit);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public string ComposableFunctionMethod(EdmFunction edmFunction, string modelNamespace)
|
|
||||||
{
|
|
||||||
var parameters = _typeMapper.GetParameters(edmFunction);
|
|
||||||
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} IQueryable<{1}> {2}({3})",
|
|
||||||
AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
|
|
||||||
_typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
|
|
||||||
_code.Escape(edmFunction),
|
|
||||||
string.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string ComposableCreateQuery(EdmFunction edmFunction, string modelNamespace)
|
|
||||||
{
|
|
||||||
var parameters = _typeMapper.GetParameters(edmFunction);
|
|
||||||
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"return ((IObjectContextAdapter)this).ObjectContext.CreateQuery<{0}>(\"[{1}].[{2}]({3})\"{4});",
|
|
||||||
_typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
|
|
||||||
edmFunction.NamespaceName,
|
|
||||||
edmFunction.Name,
|
|
||||||
string.Join(", ", parameters.Select(p => "@" + p.EsqlParameterName).ToArray()),
|
|
||||||
_code.StringBefore(", ", string.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray())));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string FunctionMethod(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
|
|
||||||
{
|
|
||||||
var parameters = _typeMapper.GetParameters(edmFunction);
|
|
||||||
var returnType = _typeMapper.GetReturnType(edmFunction);
|
|
||||||
|
|
||||||
var paramList = String.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray());
|
|
||||||
if (includeMergeOption)
|
|
||||||
{
|
|
||||||
paramList = _code.StringAfter(paramList, ", ") + "MergeOption mergeOption";
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} {1} {2}({3})",
|
|
||||||
AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
|
|
||||||
returnType == null ? "int" : "ObjectResult<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
|
|
||||||
_code.Escape(edmFunction),
|
|
||||||
paramList);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string ExecuteFunction(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
|
|
||||||
{
|
|
||||||
var parameters = _typeMapper.GetParameters(edmFunction);
|
|
||||||
var returnType = _typeMapper.GetReturnType(edmFunction);
|
|
||||||
|
|
||||||
var callParams = _code.StringBefore(", ", String.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray()));
|
|
||||||
if (includeMergeOption)
|
|
||||||
{
|
|
||||||
callParams = ", mergeOption" + callParams;
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction{0}(\"{1}\"{2});",
|
|
||||||
returnType == null ? "" : "<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
|
|
||||||
edmFunction.Name,
|
|
||||||
callParams);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string DbSet(EntitySet entitySet)
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0} virtual DbSet<{1}> {2} {{ get; set; }}",
|
|
||||||
Accessibility.ForReadOnlyProperty(entitySet),
|
|
||||||
_typeMapper.GetTypeName(entitySet.ElementType),
|
|
||||||
_code.Escape(entitySet));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string UsingDirectives(bool inHeader, bool includeCollections = true)
|
|
||||||
{
|
|
||||||
return inHeader == string.IsNullOrEmpty(_code.VsNamespaceSuggestion())
|
|
||||||
? string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
"{0}using System;{1}" +
|
|
||||||
"{2}",
|
|
||||||
inHeader ? Environment.NewLine : "",
|
|
||||||
includeCollections ? (Environment.NewLine + "using System.Collections.Generic;") : "",
|
|
||||||
inHeader ? "" : Environment.NewLine)
|
|
||||||
: "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class TypeMapper
|
|
||||||
{
|
|
||||||
private const string ExternalTypeNameAttributeName = @"http://schemas.microsoft.com/ado/2006/04/codegeneration:ExternalTypeName";
|
|
||||||
|
|
||||||
private readonly System.Collections.IList _errors;
|
|
||||||
private readonly CodeGenerationTools _code;
|
|
||||||
private readonly MetadataTools _ef;
|
|
||||||
|
|
||||||
public TypeMapper(CodeGenerationTools code, MetadataTools ef, System.Collections.IList errors)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(code, "code");
|
|
||||||
ArgumentNotNull(ef, "ef");
|
|
||||||
ArgumentNotNull(errors, "errors");
|
|
||||||
|
|
||||||
_code = code;
|
|
||||||
_ef = ef;
|
|
||||||
_errors = errors;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string FixNamespaces(string typeName)
|
|
||||||
{
|
|
||||||
return typeName.Replace("System.Data.Spatial.", "System.Data.Entity.Spatial.");
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTypeName(TypeUsage typeUsage)
|
|
||||||
{
|
|
||||||
return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace: null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTypeName(EdmType edmType)
|
|
||||||
{
|
|
||||||
return GetTypeName(edmType, isNullable: null, modelNamespace: null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTypeName(TypeUsage typeUsage, string modelNamespace)
|
|
||||||
{
|
|
||||||
return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTypeName(EdmType edmType, string modelNamespace)
|
|
||||||
{
|
|
||||||
return GetTypeName(edmType, isNullable: null, modelNamespace: modelNamespace);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTypeName(EdmType edmType, bool? isNullable, string modelNamespace)
|
|
||||||
{
|
|
||||||
if (edmType == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
var collectionType = edmType as CollectionType;
|
|
||||||
if (collectionType != null)
|
|
||||||
{
|
|
||||||
return String.Format(CultureInfo.InvariantCulture, "ICollection<{0}>", GetTypeName(collectionType.TypeUsage, modelNamespace));
|
|
||||||
}
|
|
||||||
|
|
||||||
var typeName = _code.Escape(edmType.MetadataProperties
|
|
||||||
.Where(p => p.Name == ExternalTypeNameAttributeName)
|
|
||||||
.Select(p => (string)p.Value)
|
|
||||||
.FirstOrDefault())
|
|
||||||
?? (modelNamespace != null && edmType.NamespaceName != modelNamespace ?
|
|
||||||
_code.CreateFullName(_code.EscapeNamespace(edmType.NamespaceName), _code.Escape(edmType)) :
|
|
||||||
_code.Escape(edmType));
|
|
||||||
|
|
||||||
if (edmType is StructuralType)
|
|
||||||
{
|
|
||||||
return typeName;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (edmType is SimpleType)
|
|
||||||
{
|
|
||||||
var clrType = UnderlyingClrType(edmType);
|
|
||||||
if (!IsEnumType(edmType))
|
|
||||||
{
|
|
||||||
typeName = _code.Escape(clrType);
|
|
||||||
}
|
|
||||||
|
|
||||||
typeName = FixNamespaces(typeName);
|
|
||||||
|
|
||||||
return clrType.IsValueType && isNullable == true ?
|
|
||||||
String.Format(CultureInfo.InvariantCulture, "Nullable<{0}>", typeName) :
|
|
||||||
typeName;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new ArgumentException("edmType");
|
|
||||||
}
|
|
||||||
|
|
||||||
public Type UnderlyingClrType(EdmType edmType)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(edmType, "edmType");
|
|
||||||
|
|
||||||
var primitiveType = edmType as PrimitiveType;
|
|
||||||
if (primitiveType != null)
|
|
||||||
{
|
|
||||||
return primitiveType.ClrEquivalentType;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (IsEnumType(edmType))
|
|
||||||
{
|
|
||||||
return GetEnumUnderlyingType(edmType).ClrEquivalentType;
|
|
||||||
}
|
|
||||||
|
|
||||||
return typeof(object);
|
|
||||||
}
|
|
||||||
|
|
||||||
public object GetEnumMemberValue(MetadataItem enumMember)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(enumMember, "enumMember");
|
|
||||||
|
|
||||||
var valueProperty = enumMember.GetType().GetProperty("Value");
|
|
||||||
return valueProperty == null ? null : valueProperty.GetValue(enumMember, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetEnumMemberName(MetadataItem enumMember)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(enumMember, "enumMember");
|
|
||||||
|
|
||||||
var nameProperty = enumMember.GetType().GetProperty("Name");
|
|
||||||
return nameProperty == null ? null : (string)nameProperty.GetValue(enumMember, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public System.Collections.IEnumerable GetEnumMembers(EdmType enumType)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(enumType, "enumType");
|
|
||||||
|
|
||||||
var membersProperty = enumType.GetType().GetProperty("Members");
|
|
||||||
return membersProperty != null
|
|
||||||
? (System.Collections.IEnumerable)membersProperty.GetValue(enumType, null)
|
|
||||||
: Enumerable.Empty<MetadataItem>();
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool EnumIsFlags(EdmType enumType)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(enumType, "enumType");
|
|
||||||
|
|
||||||
var isFlagsProperty = enumType.GetType().GetProperty("IsFlags");
|
|
||||||
return isFlagsProperty != null && (bool)isFlagsProperty.GetValue(enumType, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool IsEnumType(GlobalItem edmType)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(edmType, "edmType");
|
|
||||||
|
|
||||||
return edmType.GetType().Name == "EnumType";
|
|
||||||
}
|
|
||||||
|
|
||||||
public PrimitiveType GetEnumUnderlyingType(EdmType enumType)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(enumType, "enumType");
|
|
||||||
|
|
||||||
return (PrimitiveType)enumType.GetType().GetProperty("UnderlyingType").GetValue(enumType, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string CreateLiteral(object value)
|
|
||||||
{
|
|
||||||
if (value == null || value.GetType() != typeof(TimeSpan))
|
|
||||||
{
|
|
||||||
return _code.CreateLiteral(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Format(CultureInfo.InvariantCulture, "new TimeSpan({0})", ((TimeSpan)value).Ticks);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool VerifyCaseInsensitiveTypeUniqueness(IEnumerable<string> types, string sourceFile)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(types, "types");
|
|
||||||
ArgumentNotNull(sourceFile, "sourceFile");
|
|
||||||
|
|
||||||
var hash = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
|
|
||||||
if (types.Any(item => !hash.Add(item)))
|
|
||||||
{
|
|
||||||
_errors.Add(
|
|
||||||
new CompilerError(sourceFile, -1, -1, "6023",
|
|
||||||
String.Format(CultureInfo.CurrentCulture, CodeGenerationTools.GetResourceString("Template_CaseInsensitiveTypeConflict"))));
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<SimpleType> GetEnumItemsToGenerate(IEnumerable<GlobalItem> itemCollection)
|
|
||||||
{
|
|
||||||
return GetItemsToGenerate<SimpleType>(itemCollection)
|
|
||||||
.Where(e => IsEnumType(e));
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<T> GetItemsToGenerate<T>(IEnumerable<GlobalItem> itemCollection) where T: EdmType
|
|
||||||
{
|
|
||||||
return itemCollection
|
|
||||||
.OfType<T>()
|
|
||||||
.Where(i => !i.MetadataProperties.Any(p => p.Name == ExternalTypeNameAttributeName))
|
|
||||||
.OrderBy(i => i.Name);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<string> GetAllGlobalItems(IEnumerable<GlobalItem> itemCollection)
|
|
||||||
{
|
|
||||||
return itemCollection
|
|
||||||
.Where(i => i is EntityType || i is ComplexType || i is EntityContainer || IsEnumType(i))
|
|
||||||
.Select(g => GetGlobalItemName(g));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetGlobalItemName(GlobalItem item)
|
|
||||||
{
|
|
||||||
if (item is EdmType)
|
|
||||||
{
|
|
||||||
return ((EdmType)item).Name;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return ((EntityContainer)item).Name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetSimpleProperties(EntityType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetSimpleProperties(ComplexType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetComplexProperties(EntityType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetComplexProperties(ComplexType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(EntityType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(ComplexType type)
|
|
||||||
{
|
|
||||||
return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<NavigationProperty> GetNavigationProperties(EntityType type)
|
|
||||||
{
|
|
||||||
return type.NavigationProperties.Where(np => np.DeclaringType == type);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<NavigationProperty> GetCollectionNavigationProperties(EntityType type)
|
|
||||||
{
|
|
||||||
return type.NavigationProperties.Where(np => np.DeclaringType == type && np.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many);
|
|
||||||
}
|
|
||||||
|
|
||||||
public FunctionParameter GetReturnParameter(EdmFunction edmFunction)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(edmFunction, "edmFunction");
|
|
||||||
|
|
||||||
var returnParamsProperty = edmFunction.GetType().GetProperty("ReturnParameters");
|
|
||||||
return returnParamsProperty == null
|
|
||||||
? edmFunction.ReturnParameter
|
|
||||||
: ((IEnumerable<FunctionParameter>)returnParamsProperty.GetValue(edmFunction, null)).FirstOrDefault();
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool IsComposable(EdmFunction edmFunction)
|
|
||||||
{
|
|
||||||
ArgumentNotNull(edmFunction, "edmFunction");
|
|
||||||
|
|
||||||
var isComposableProperty = edmFunction.GetType().GetProperty("IsComposableAttribute");
|
|
||||||
return isComposableProperty != null && (bool)isComposableProperty.GetValue(edmFunction, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<FunctionImportParameter> GetParameters(EdmFunction edmFunction)
|
|
||||||
{
|
|
||||||
return FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
|
|
||||||
}
|
|
||||||
|
|
||||||
public TypeUsage GetReturnType(EdmFunction edmFunction)
|
|
||||||
{
|
|
||||||
var returnParam = GetReturnParameter(edmFunction);
|
|
||||||
return returnParam == null ? null : _ef.GetElementType(returnParam.TypeUsage);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool GenerateMergeOptionFunction(EdmFunction edmFunction, bool includeMergeOption)
|
|
||||||
{
|
|
||||||
var returnType = GetReturnType(edmFunction);
|
|
||||||
return !includeMergeOption && returnType != null && returnType.EdmType.BuiltInTypeKind == BuiltInTypeKind.EntityType;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void ArgumentNotNull<T>(T arg, string name) where T : class
|
|
||||||
{
|
|
||||||
if (arg == null)
|
|
||||||
{
|
|
||||||
throw new ArgumentNullException(name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#>
|
|
||||||
|
|
@ -1,24 +1,25 @@
|
||||||
//------------------------------------------------------------------------------
|
using System;
|
||||||
// <auto-generated>
|
using System.Collections.Generic;
|
||||||
// This code was generated from a template.
|
using System.ComponentModel.DataAnnotations;
|
||||||
//
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
// Manual changes to this file may cause unexpected behavior in your application.
|
using System.Linq;
|
||||||
// Manual changes to this file will be overwritten if the code is regenerated.
|
using System.Net;
|
||||||
// </auto-generated>
|
using System.Text;
|
||||||
//------------------------------------------------------------------------------
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace SockScape.DAL
|
|
||||||
{
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
public partial class Session
|
|
||||||
{
|
|
||||||
public int Id { get; set; }
|
|
||||||
public byte[] Secret { get; set; }
|
|
||||||
public long UserId { get; set; }
|
|
||||||
public int ServerId { get; set; }
|
|
||||||
|
|
||||||
|
namespace SockScape.DAL {
|
||||||
|
public partial class Session {
|
||||||
|
[Key, ForeignKey("User")]
|
||||||
|
public long Id { get; set; }
|
||||||
|
[Required]
|
||||||
public virtual User User { get; set; }
|
public virtual User User { get; set; }
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
[Index(IsUnique = true)]
|
||||||
|
[MaxLength(16), MinLength(16)]
|
||||||
|
public byte[] Secret { get; set; }
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
public int ServerId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,32 +1,27 @@
|
||||||
//------------------------------------------------------------------------------
|
using System;
|
||||||
// <auto-generated>
|
using System.Collections.Generic;
|
||||||
// This code was generated from a template.
|
using System.ComponentModel.DataAnnotations;
|
||||||
//
|
using System.Linq;
|
||||||
// Manual changes to this file may cause unexpected behavior in your application.
|
using System.Text;
|
||||||
// Manual changes to this file will be overwritten if the code is regenerated.
|
using System.Threading.Tasks;
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
namespace SockScape.DAL
|
|
||||||
{
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
public partial class User
|
|
||||||
{
|
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
|
|
||||||
public User()
|
|
||||||
{
|
|
||||||
this.Sessions = new HashSet<Session>();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
namespace SockScape.DAL {
|
||||||
|
public partial class User {
|
||||||
public long Id { get; set; }
|
public long Id { get; set; }
|
||||||
public string Username { get; set; }
|
|
||||||
public string Password { get; set; }
|
|
||||||
public System.DateTime Joined { get; set; }
|
|
||||||
public Nullable<System.DateTime> LastLogin { get; set; }
|
|
||||||
|
|
||||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
|
[Required]
|
||||||
public virtual ICollection<Session> Sessions { get; set; }
|
[MaxLength(16)]
|
||||||
|
public string Username { get; set; }
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
[MaxLength(36), MinLength(36)]
|
||||||
|
public byte[] Password { get; set; }
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
public DateTime Joined { get; set; }
|
||||||
|
public DateTime? LastLogin { get; set; }
|
||||||
|
|
||||||
|
public virtual ICollection<Origin> Origins { get; set; }
|
||||||
|
public virtual Session Session { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Configuration;
|
using System.Configuration;
|
||||||
|
using System.Data.Entity;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
@ -9,10 +10,12 @@ using System.Numerics;
|
||||||
using Glove;
|
using Glove;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using Kneesocks;
|
using Kneesocks;
|
||||||
|
using MySql.Data.Entity;
|
||||||
|
|
||||||
namespace SockScape {
|
namespace SockScape {
|
||||||
class Entrypoint {
|
class Entrypoint {
|
||||||
static void Main(string[] args) {
|
static void Main(string[] args) {
|
||||||
|
DbConfiguration.SetConfiguration(new MySqlEFConfiguration());
|
||||||
var db = new DAL.ScapeDb();
|
var db = new DAL.ScapeDb();
|
||||||
var a = db.Users.ToList();
|
var a = db.Users.ToList();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,5 +24,29 @@ namespace Glove {
|
||||||
return hasher.ComputeHash(bytes);
|
return hasher.ComputeHash(bytes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private const int HashIterations = 3000;
|
||||||
|
|
||||||
|
public static byte[] HashPassword(this string pwd) {
|
||||||
|
byte[] salt, hash = new byte[36];
|
||||||
|
RNG.NextBytes(salt = new byte[16]);
|
||||||
|
|
||||||
|
using(var hasher = new Rfc2898DeriveBytes(pwd, salt, HashIterations)) {
|
||||||
|
byte[] rawHash = hasher.GetBytes(20);
|
||||||
|
Array.Copy(salt, 0, hash, 0, 16);
|
||||||
|
Array.Copy(rawHash, 0, hash, 16, 20);
|
||||||
|
}
|
||||||
|
|
||||||
|
return hash;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool CheckPassword(this string pwd, byte[] hash) {
|
||||||
|
byte[] salt = hash.Take(16).ToArray();
|
||||||
|
|
||||||
|
using(var hasher = new Rfc2898DeriveBytes(pwd, salt, HashIterations)) {
|
||||||
|
byte[] phash = hasher.GetBytes(20);
|
||||||
|
return hash.Skip(16).SequenceEqual(phash);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
29
server/Migrations/201708231959530_Initial.Designer.cs
generated
Normal file
29
server/Migrations/201708231959530_Initial.Designer.cs
generated
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
// <auto-generated />
|
||||||
|
namespace SockScape.Migrations
|
||||||
|
{
|
||||||
|
using System.CodeDom.Compiler;
|
||||||
|
using System.Data.Entity.Migrations;
|
||||||
|
using System.Data.Entity.Migrations.Infrastructure;
|
||||||
|
using System.Resources;
|
||||||
|
|
||||||
|
[GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
|
||||||
|
public sealed partial class Initial : IMigrationMetadata
|
||||||
|
{
|
||||||
|
private readonly ResourceManager Resources = new ResourceManager(typeof(Initial));
|
||||||
|
|
||||||
|
string IMigrationMetadata.Id
|
||||||
|
{
|
||||||
|
get { return "201708231959530_Initial"; }
|
||||||
|
}
|
||||||
|
|
||||||
|
string IMigrationMetadata.Source
|
||||||
|
{
|
||||||
|
get { return null; }
|
||||||
|
}
|
||||||
|
|
||||||
|
string IMigrationMetadata.Target
|
||||||
|
{
|
||||||
|
get { return Resources.GetString("Target"); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
61
server/Migrations/201708231959530_Initial.cs
Normal file
61
server/Migrations/201708231959530_Initial.cs
Normal file
|
|
@ -0,0 +1,61 @@
|
||||||
|
namespace SockScape.Migrations
|
||||||
|
{
|
||||||
|
using System;
|
||||||
|
using System.Data.Entity.Migrations;
|
||||||
|
|
||||||
|
public partial class Initial : DbMigration
|
||||||
|
{
|
||||||
|
public override void Up()
|
||||||
|
{
|
||||||
|
CreateTable(
|
||||||
|
"dbo.Origins",
|
||||||
|
c => new
|
||||||
|
{
|
||||||
|
Id = c.Long(nullable: false, identity: true),
|
||||||
|
UserId = c.Long(nullable: false),
|
||||||
|
RawIp = c.Binary(nullable: false, storeType: "binary(16)"),
|
||||||
|
})
|
||||||
|
.PrimaryKey(t => t.Id)
|
||||||
|
.ForeignKey("dbo.Users", t => t.UserId, cascadeDelete: true)
|
||||||
|
.Index(t => new { t.UserId, t.RawIp }, unique: true, name: "IX_RawIp_UserId_Unique");
|
||||||
|
|
||||||
|
CreateTable(
|
||||||
|
"dbo.Users",
|
||||||
|
c => new
|
||||||
|
{
|
||||||
|
Id = c.Long(nullable: false, identity: true),
|
||||||
|
Username = c.String(nullable: false, maxLength: 16, storeType: "varchar"),
|
||||||
|
Password = c.Binary(nullable: false, storeType: "binary(36)"),
|
||||||
|
Joined = c.DateTime(nullable: false, precision: 0),
|
||||||
|
LastLogin = c.DateTime(precision: 0),
|
||||||
|
})
|
||||||
|
.PrimaryKey(t => t.Id);
|
||||||
|
|
||||||
|
CreateTable(
|
||||||
|
"dbo.Sessions",
|
||||||
|
c => new
|
||||||
|
{
|
||||||
|
Id = c.Long(nullable: false),
|
||||||
|
Secret = c.Binary(nullable: false, storeType: "binary(16)"),
|
||||||
|
ServerId = c.Int(nullable: false),
|
||||||
|
})
|
||||||
|
.PrimaryKey(t => t.Id)
|
||||||
|
.ForeignKey("dbo.Users", t => t.Id)
|
||||||
|
.Index(t => t.Id)
|
||||||
|
.Index(t => t.Secret, unique: true);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Down()
|
||||||
|
{
|
||||||
|
DropForeignKey("dbo.Origins", "UserId", "dbo.Users");
|
||||||
|
DropForeignKey("dbo.Sessions", "Id", "dbo.Users");
|
||||||
|
DropIndex("dbo.Sessions", new[] { "Secret" });
|
||||||
|
DropIndex("dbo.Sessions", new[] { "Id" });
|
||||||
|
DropIndex("dbo.Origins", "IX_RawIp_UserId_Unique");
|
||||||
|
DropTable("dbo.Sessions");
|
||||||
|
DropTable("dbo.Users");
|
||||||
|
DropTable("dbo.Origins");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
126
server/Migrations/201708231959530_Initial.resx
Normal file
126
server/Migrations/201708231959530_Initial.resx
Normal file
|
|
@ -0,0 +1,126 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<data name="Target" xml:space="preserve">
|
||||||
|
<value>H4sIAAAAAAAEAO1a3W7bNhS+H7B3EHQ5pJaTrMVm2C1SJxncJXEQucXuAlqiHaIUqZJUGmPYk+1ij7RX2NG/REq2bCdZVgy+sSmeH57znUPyk//+86/hu4eAWvdYSMLZyD7s9W0LM4/7hC1HdqQWr36y3739/rvhmR88WJ/yecfxPJBkcmTfKRUOHEd6dzhAshcQT3DJF6rn8cBBPneO+v2fncNDB4MKG3RZ1vAmYooEOPkBP8eceThUEaKX3MdUZuPwxE20WlcowDJEHh7ZLvc+ux4Kce/05MK2TihB4ISL6cK2EGNcIQUuDj5K7CrB2dINYQDR2SrEMG+BqMSZ64NyetdV9I/iVTilYK7Ki6TiwZYKD4+zsDi6+E7BtYuwQeDOIMBqFa86Cd7IngqyJKBYNzUYUxFP0yLbS+cfWBILgMdBkXuASPw5sMYRVZHAI4YjJRA9sK6jOSXer3g1458xG7GI0qpL4BQ8qw3A0LXgIRZqdYMXmaMT37acupyjCxZiFZl0EROm3vxoW1dgHM0pLjJeWbCruMC/YIYFUti/RkphwWIdOImZYV2zBcgSm+2t13GDvk7CXMV7wpAAs5fo4QKzpbqDOnxjW+fkAfv5QKZ1k5krdE+WySobnLatG0yTh/KOhGnNZGm+TZ+fCx7ccFqgJRm+dXkkPLA14+azGRJLrOp+DJ0SfGshmRrtCsh49v9wbIQjg2+5Reh60Ls7oekjI9DpQUaJqAO4NMPXSMqvXPhrYHy8I4w1Sx84YbiwcwphmpFgezUXSKoLnjRBXVPXMkqhL3etpLxamiopr7KurrhYymSnaHAle2b4Uh03nKk9bPKmc10XrnUt7Uzgm6nu9Th0sSeSwD929zfsxMGseXt89BR7SCe46btIIxa7wO1ESu6RxIc63lL79cWcMd9a50wKxsoiIBEANRICuMD2yO73eodGiFq0FhVVak1DUldp6gM8YhG3e0ThKCwB4YQpE7yEeSREdI1pTaYj5ONYF9r1J6c4xCzei9bEcXezhXatBjdFZOhUYLAeHdW+3JbGxuNOmcX87FzP4w9rcNHY9TfBQo/OlJ1iihW2Trz0TjFG0kO+WbJQKf4jIKrB6WcAVEPsu1jNj+HPgKm0D4GMAgks8q4Tb1+n84ZdDlzLNjqZna10mMT6XKz0U0XZ8DTgGTirK4hj0SSewmyDcFbQTfJFT9RUVOJk6Ml2gcqUpl1CT9qGPl34XHXXyPyGtlxRkgVML6P6ujqsuXbmM5fc2no2Np+KrwU61qy3qd3ssdx86y0gXxIyTsrI5MyN00LdDC9RGMI9pELlZCOWm/I441fu9ixHkOpwPNlAdhTeFpbgZoWWWHsKpsHTcyKkggsAmqP4DDT2A2NaXuAt5ZNbqdewmaO8pvL58fesYhoIl4belwmew1qCuG0mF0YDIKZgQp8hikTD+XXMaRSw9v7dLp333aqGtl7criUjQKpKsiFTx9DRImB0fCPIxvZYz1mnjKZFs3s+m6q+QzabxZ4ulyl3oGczHe2uqSQDqprK0e6a8st+VU8+1l1L5a5fVVQZfjE4Kza03aGW79Pbo61V8mkAl199qxrysW205Bfbup589JlTa+yW+pTCerFrarvjMNupNr/9MLaudIptQYjuiR9vW5cr9wvtxc97ydcxJbDgcsYlYmSBpUqJE/t177X2FuXlvNFwpPRpp9caz079zGOzENWN7O2WpE397UJuxbhiTOCC8zCyf0+kBtbkt9tk+7xNxW8/MvIlwgfWVEDCB9bhgTWR6djAmsGFxPpjv1cWirDVnPKmy892nh1t7dl2bxe+KVxUaX52j4R3h4RBHO7J4peZ3Yuk92HVKqHWrwX2SPrWuL8/Zb9Zb/ouYy/e+l8DTYdimvhF7fR3qOI699yljPduHDoNnax0pxLfkflNb+dbk7IGm7AzXbwTGddyfXgqPve/z+F2TPMjkqw6/7ITZ/yiwdHKSbxAPtZkdbqwrmtI1/RoDXvOnENm027VQsY1MrKthGyT4maKroWrXUfVNilv40yflMithqBkNjqwtk1070vhardfVB1mVcLuSfhY8yYJhVb5tx2UuCTLUkX83zuGvVqJFXMmbMHzStc8yqdom/0lVgjOaOhEKLJAnoLHXpzB+B8pnxCNYMpZMMf+hE0jFUYKloyDOa39yyXuGOvsJ6Rz3efhNEzeST/GEsBNEh8zp+x9RKhf+H3ecFBpURG3ouzsH+dSxXeA5arQdMVZR0VZ+IoOOsNBSEGZnDIX3eNdfAPAXuAl8lY5H9CuZHMi6mEfnhK0FCiQmY5SHn4Chv3g4e0/NSdKyXQqAAA=</value>
|
||||||
|
</data>
|
||||||
|
<data name="DefaultSchema" xml:space="preserve">
|
||||||
|
<value>dbo</value>
|
||||||
|
</data>
|
||||||
|
</root>
|
||||||
|
|
@ -61,6 +61,12 @@
|
||||||
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
<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>
|
<HintPath>packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Migrations, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
|
<HintPath>packages\Migrations.1.0.1.0\lib\net40-Client\Migrations.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
|
<Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
|
||||||
<HintPath>packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
|
<HintPath>packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
|
@ -83,29 +89,15 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Configuration.cs" />
|
<Compile Include="Configuration.cs" />
|
||||||
<Compile Include="DAL\Origin.cs" />
|
<Compile Include="DAL\Origin.cs" />
|
||||||
<Compile Include="DAL\ScapeDb.Context.cs">
|
<Compile Include="DAL\ScapeDb.cs" />
|
||||||
<AutoGen>True</AutoGen>
|
<Compile Include="DAL\Session.cs" />
|
||||||
<DesignTime>True</DesignTime>
|
<Compile Include="DAL\User.cs" />
|
||||||
<DependentUpon>ScapeDb.Context.tt</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="DAL\ScapeDb.cs">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
<DependentUpon>ScapeDb.tt</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="DAL\ScapeDb.Designer.cs">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
<DependentUpon>ScapeDb.edmx</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="DAL\Session.cs">
|
|
||||||
<DependentUpon>ScapeDb.tt</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="DAL\User.cs">
|
|
||||||
<DependentUpon>ScapeDb.tt</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Encryption\KeyExchange.cs" />
|
<Compile Include="Encryption\KeyExchange.cs" />
|
||||||
<Compile Include="Encryption\Cipher.cs" />
|
<Compile Include="Encryption\Cipher.cs" />
|
||||||
|
<Compile Include="Migrations\201708231959530_Initial.cs" />
|
||||||
|
<Compile Include="Migrations\201708231959530_Initial.Designer.cs">
|
||||||
|
<DependentUpon>201708231959530_Initial.cs</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="Migrations\Configuration.cs" />
|
<Compile Include="Migrations\Configuration.cs" />
|
||||||
<Compile Include="ServerList.cs" />
|
<Compile Include="ServerList.cs" />
|
||||||
<Compile Include="Socks\MasterConnection.cs" />
|
<Compile Include="Socks\MasterConnection.cs" />
|
||||||
|
|
@ -123,12 +115,8 @@
|
||||||
<None Include="App.config">
|
<None Include="App.config">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</None>
|
</None>
|
||||||
<EntityDeploy Include="DAL\ScapeDb.edmx">
|
<None Include="connectionStrings.config">
|
||||||
<Generator>EntityModelCodeGenerator</Generator>
|
<DependentUpon>App.config</DependentUpon>
|
||||||
<LastGenOutput>ScapeDb.Designer.cs</LastGenOutput>
|
|
||||||
</EntityDeploy>
|
|
||||||
<None Include="DAL\ScapeDb.edmx.diagram">
|
|
||||||
<DependentUpon>ScapeDb.edmx</DependentUpon>
|
|
||||||
</None>
|
</None>
|
||||||
<None Include="packages.config">
|
<None Include="packages.config">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
|
|
@ -145,16 +133,6 @@
|
||||||
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
|
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="DAL\ScapeDb.Context.tt">
|
|
||||||
<Generator>TextTemplatingFileGenerator</Generator>
|
|
||||||
<DependentUpon>ScapeDb.edmx</DependentUpon>
|
|
||||||
<LastGenOutput>ScapeDb.Context.cs</LastGenOutput>
|
|
||||||
</Content>
|
|
||||||
<Content Include="DAL\ScapeDb.tt">
|
|
||||||
<Generator>TextTemplatingFileGenerator</Generator>
|
|
||||||
<DependentUpon>ScapeDb.edmx</DependentUpon>
|
|
||||||
<LastGenOutput>ScapeDb.cs</LastGenOutput>
|
|
||||||
</Content>
|
|
||||||
<Content Include="Fodyweavers.xml">
|
<Content Include="Fodyweavers.xml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<DependentUpon>App.config</DependentUpon>
|
<DependentUpon>App.config</DependentUpon>
|
||||||
|
|
@ -182,6 +160,11 @@
|
||||||
<Install>false</Install>
|
<Install>false</Install>
|
||||||
</BootstrapperPackage>
|
</BootstrapperPackage>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<EmbeddedResource Include="Migrations\201708231959530_Initial.resx">
|
||||||
|
<DependentUpon>201708231959530_Initial.cs</DependentUpon>
|
||||||
|
</EmbeddedResource>
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@
|
||||||
<package id="Costura.Fody" version="1.4.0" targetFramework="net46" developmentDependency="true" />
|
<package id="Costura.Fody" version="1.4.0" targetFramework="net46" developmentDependency="true" />
|
||||||
<package id="EntityFramework" version="6.1.3" targetFramework="net46" />
|
<package id="EntityFramework" version="6.1.3" targetFramework="net46" />
|
||||||
<package id="Fody" version="2.0.4" targetFramework="net46" developmentDependency="true" />
|
<package id="Fody" version="2.0.4" targetFramework="net46" developmentDependency="true" />
|
||||||
|
<package id="log4net" version="2.0.5" targetFramework="net46" />
|
||||||
|
<package id="Migrations" version="1.0.1.0" targetFramework="net46" />
|
||||||
<package id="MySql.Data" version="6.9.9" targetFramework="net46" />
|
<package id="MySql.Data" version="6.9.9" targetFramework="net46" />
|
||||||
<package id="MySql.Data.Entity" version="6.9.9" targetFramework="net46" />
|
<package id="MySql.Data.Entity" version="6.9.9" targetFramework="net46" />
|
||||||
</packages>
|
</packages>
|
||||||
Loading…
Reference in a new issue