paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'vnext' of https://github.com/pazof/yavsc.git

Browse Source
This commit is contained in:
Paul Schneider
2016-10-10 12:58:42 +02:00
parent 189d864b6f 6aef4dcdcf
commit 0dfda37611
10 changed files with 1207 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
BookAStar/BookAStar.UWP/project.lock.json
View File

@ -1,9 +1,10 @@
{
"locked": false,
"version": 1,
"version": 2,
"targets": {
"UAP,Version=v10.0": {
"Xamarin.Forms/2.0.0.6482": {
"type": "package",
"compile": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
@ -20,6 +21,7 @@
},
"UAP,Version=v10.0/win10-arm": {
"Xamarin.Forms/2.0.0.6482": {
"type": "package",
"compile": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
@ -36,38 +38,7 @@
},
"UAP,Version=v10.0/win10-arm-aot": {
"Xamarin.Forms/2.0.0.6482": {
"compile": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.dll": {},
"lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
},
"runtime": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.dll": {},
"lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
}
}
},
"UAP,Version=v10.0/win10-x64": {
"Xamarin.Forms/2.0.0.6482": {
"compile": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.dll": {},
"lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
},
"runtime": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.dll": {},
"lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
}
}
},
"UAP,Version=v10.0/win10-x64-aot": {
"Xamarin.Forms/2.0.0.6482": {
"type": "package",
"compile": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
@ -84,6 +55,7 @@
},
"UAP,Version=v10.0/win10-x86": {
"Xamarin.Forms/2.0.0.6482": {
"type": "package",
"compile": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
@ -100,6 +72,41 @@
},
"UAP,Version=v10.0/win10-x86-aot": {
"Xamarin.Forms/2.0.0.6482": {
"type": "package",
"compile": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.dll": {},
"lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
},
"runtime": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.dll": {},
"lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
}
}
},
"UAP,Version=v10.0/win10-x64": {
"Xamarin.Forms/2.0.0.6482": {
"type": "package",
"compile": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.dll": {},
"lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
},
"runtime": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.dll": {},
"lib/uap10.0/Xamarin.Forms.Xaml.dll": {}
}
}
},
"UAP,Version=v10.0/win10-x64-aot": {
"Xamarin.Forms/2.0.0.6482": {
"type": "package",
"compile": {
"lib/uap10.0/Xamarin.Forms.Core.dll": {},
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll": {},
@ -117,24 +124,22 @@
},
"libraries": {
"Xamarin.Forms/2.0.0.6482": {
"sha512": "ZE9oH3uZY1gUwFiBB4Wr9y2CD73nWgJTHkSx2EZC9MrchSevV5SKTeP4UG4iy3NyuAPtXzBFgXfKCtRIN7ZR/g==",
"type": "package",
"sha512": "ZE9oH3uZY1gUwFiBB4Wr9y2CD73nWgJTHkSx2EZC9MrchSevV5SKTeP4UG4iy3NyuAPtXzBFgXfKCtRIN7ZR/g==",
"files": [
"Xamarin.Forms.2.0.0.6482.nupkg.sha512",
"Xamarin.Forms.nuspec",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.Decompiler.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.CSharp.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.Cecil.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.Xml.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.CSharp.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/ICSharpCode.NRefactory.Xml.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.Mdb.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.Pdb.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.Rocks.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Mono.Cecil.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Build.Tasks.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets",
"build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.dll",
"lib/MonoAndroid10/FormsViewGroup.dll",
"lib/MonoAndroid10/Xamarin.Forms.Core.dll",
"lib/MonoAndroid10/Xamarin.Forms.Core.xml",
@ -148,18 +153,6 @@
"lib/MonoTouch10/Xamarin.Forms.Platform.iOS.Classic.dll",
"lib/MonoTouch10/Xamarin.Forms.Xaml.dll",
"lib/MonoTouch10/Xamarin.Forms.Xaml.xml",
"lib/WP80/Xamarin.Forms.Core.dll",
"lib/WP80/Xamarin.Forms.Core.xml",
"lib/WP80/Xamarin.Forms.Platform.WP8.dll",
"lib/WP80/Xamarin.Forms.Platform.dll",
"lib/WP80/Xamarin.Forms.Xaml.dll",
"lib/WP80/Xamarin.Forms.Xaml.xml",
"lib/Xamarin.iOS10/Xamarin.Forms.Core.dll",
"lib/Xamarin.iOS10/Xamarin.Forms.Core.xml",
"lib/Xamarin.iOS10/Xamarin.Forms.Platform.dll",
"lib/Xamarin.iOS10/Xamarin.Forms.Platform.iOS.dll",
"lib/Xamarin.iOS10/Xamarin.Forms.Xaml.dll",
"lib/Xamarin.iOS10/Xamarin.Forms.Xaml.xml",
"lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.dll",
"lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.xml",
"lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Platform.dll",
@ -167,6 +160,7 @@
"lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.xml",
"lib/uap10.0/Xamarin.Forms.Core.dll",
"lib/uap10.0/Xamarin.Forms.Core.xml",
"lib/uap10.0/Xamarin.Forms.Platform.dll",
"lib/uap10.0/Xamarin.Forms.Platform.UAP.dll",
"lib/uap10.0/Xamarin.Forms.Platform.UAP.pri",
"lib/uap10.0/Xamarin.Forms.Platform.UAP/FormsTextBox.xbf",
@ -174,45 +168,58 @@
"lib/uap10.0/Xamarin.Forms.Platform.UAP/Properties/Xamarin.Forms.Platform.UAP.rd.xml",
"lib/uap10.0/Xamarin.Forms.Platform.UAP/Resources.xbf",
"lib/uap10.0/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.xr.xml",
"lib/uap10.0/Xamarin.Forms.Platform.dll",
"lib/uap10.0/Xamarin.Forms.Xaml.dll",
"lib/uap10.0/Xamarin.Forms.Xaml.xml",
"lib/win81/Xamarin.Forms.Core.dll",
"lib/win81/Xamarin.Forms.Core.xml",
"lib/win81/Xamarin.Forms.Platform.dll",
"lib/win81/Xamarin.Forms.Platform.WinRT.dll",
"lib/win81/Xamarin.Forms.Platform.WinRT.pri",
"lib/win81/Xamarin.Forms.Platform.WinRT.Tablet.dll",
"lib/win81/Xamarin.Forms.Platform.WinRT.Tablet.pri",
"lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/Resources.xbf",
"lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/TabletResources.xbf",
"lib/win81/Xamarin.Forms.Platform.WinRT.Tablet/Xamarin.Forms.Platform.WinRT.Tablet.xr.xml",
"lib/win81/Xamarin.Forms.Platform.WinRT.dll",
"lib/win81/Xamarin.Forms.Platform.WinRT.pri",
"lib/win81/Xamarin.Forms.Platform.WinRT/FormsTextBox.xbf",
"lib/win81/Xamarin.Forms.Platform.WinRT/PageControl.xbf",
"lib/win81/Xamarin.Forms.Platform.WinRT/StepperControl.xbf",
"lib/win81/Xamarin.Forms.Platform.WinRT/Xamarin.Forms.Platform.WinRT.xr.xml",
"lib/win81/Xamarin.Forms.Platform.dll",
"lib/win81/Xamarin.Forms.Xaml.dll",
"lib/win81/Xamarin.Forms.Xaml.xml",
"lib/WP80/Xamarin.Forms.Core.dll",
"lib/WP80/Xamarin.Forms.Core.xml",
"lib/WP80/Xamarin.Forms.Platform.dll",
"lib/WP80/Xamarin.Forms.Platform.WP8.dll",
"lib/WP80/Xamarin.Forms.Xaml.dll",
"lib/WP80/Xamarin.Forms.Xaml.xml",
"lib/wpa81/Xamarin.Forms.Core.dll",
"lib/wpa81/Xamarin.Forms.Core.xml",
"lib/wpa81/Xamarin.Forms.Platform.dll",
"lib/wpa81/Xamarin.Forms.Platform.WinRT.dll",
"lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone.dll",
"lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone.pri",
"lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/PhoneResources.xbf",
"lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/Resources.xbf",
"lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/SearchBox.xbf",
"lib/wpa81/Xamarin.Forms.Platform.WinRT.Phone/Xamarin.Forms.Platform.WinRT.Phone.xr.xml",
"lib/wpa81/Xamarin.Forms.Platform.WinRT.dll",
"lib/wpa81/Xamarin.Forms.Platform.WinRT.pri",
"lib/wpa81/Xamarin.Forms.Platform.WinRT/FormsTextBox.xbf",
"lib/wpa81/Xamarin.Forms.Platform.WinRT/PageControl.xbf",
"lib/wpa81/Xamarin.Forms.Platform.WinRT/StepperControl.xbf",
"lib/wpa81/Xamarin.Forms.Platform.WinRT/Xamarin.Forms.Platform.WinRT.xr.xml",
"lib/wpa81/Xamarin.Forms.Platform.dll",
"lib/wpa81/Xamarin.Forms.Xaml.dll",
"lib/wpa81/Xamarin.Forms.Xaml.xml",
"lib/Xamarin.iOS10/Xamarin.Forms.Core.dll",
"lib/Xamarin.iOS10/Xamarin.Forms.Core.xml",
"lib/Xamarin.iOS10/Xamarin.Forms.Platform.dll",
"lib/Xamarin.iOS10/Xamarin.Forms.Platform.iOS.dll",
"lib/Xamarin.iOS10/Xamarin.Forms.Xaml.dll",
"lib/Xamarin.iOS10/Xamarin.Forms.Xaml.xml",
"tools/init.ps1",
"tools/Xamarin.Forms.Core.Design.dll",
"tools/Xamarin.Forms.Xaml.Design.dll",
"tools/init.ps1"
"Xamarin.Forms.2.0.0.6482.nupkg.sha512",
"Xamarin.Forms.nuspec"
]
}
},

6
Yavsc.Api/project.lock.json
View File

@ -753,7 +753,7 @@
}
}
},
".NETFramework,Version=v4.5.1/win7-x86": {
".NETFramework,Version=v4.5.1/debian.8-x86": {
"EntityFramework.Commands/7.0.0-rc1-final": {
"type": "package",
"dependencies": {
@ -1504,7 +1504,7 @@
}
}
},
".NETFramework,Version=v4.5.1/win7-x64": {
".NETFramework,Version=v4.5.1/debian.8-x64": {
"EntityFramework.Commands/7.0.0-rc1-final": {
"type": "package",
"dependencies": {
@ -3043,4 +3043,4 @@
],
".NETFramework,Version=v4.5.1": []
}
}
}

746
Yavsc/Migrations/20161010102616_recontact.Designer.cs generated Normal file
View File

@ -0,0 +1,746 @@
using System;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Infrastructure;
using Microsoft.Data.Entity.Metadata;
using Microsoft.Data.Entity.Migrations;
using Yavsc.Models;
namespace Yavsc.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20161010102616_recontact")]
partial class recontact
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
modelBuilder
.HasAnnotation("ProductVersion", "7.0.0-rc1-16348");
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b =>
{
b.Property<string>("Id");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken();
b.Property<string>("Name")
.HasAnnotation("MaxLength", 256);
b.Property<string>("NormalizedName")
.HasAnnotation("MaxLength", 256);
b.HasKey("Id");
b.HasIndex("NormalizedName")
.HasAnnotation("Relational:Name", "RoleNameIndex");
b.HasAnnotation("Relational:TableName", "AspNetRoles");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("ClaimType");
b.Property<string>("ClaimValue");
b.Property<string>("RoleId")
.IsRequired();
b.HasKey("Id");
b.HasAnnotation("Relational:TableName", "AspNetRoleClaims");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("ClaimType");
b.Property<string>("ClaimValue");
b.Property<string>("UserId")
.IsRequired();
b.HasKey("Id");
b.HasAnnotation("Relational:TableName", "AspNetUserClaims");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider");
b.Property<string>("ProviderKey");
b.Property<string>("ProviderDisplayName");
b.Property<string>("UserId")
.IsRequired();
b.HasKey("LoginProvider", "ProviderKey");
b.HasAnnotation("Relational:TableName", "AspNetUserLogins");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId");
b.Property<string>("RoleId");
b.HasKey("UserId", "RoleId");
b.HasAnnotation("Relational:TableName", "AspNetUserRoles");
});
modelBuilder.Entity("Yavsc.Location", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("Address")
.IsRequired();
b.Property<double>("Latitude");
b.Property<double>("Longitude");
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.AccountBalance", b =>
{
b.Property<string>("UserId");
b.Property<long>("ContactCredits");
b.Property<decimal>("Credits");
b.HasKey("UserId");
});
modelBuilder.Entity("Yavsc.Models.Activity", b =>
{
b.Property<string>("Code")
.HasAnnotation("MaxLength", 512);
b.Property<string>("ActorDenomination");
b.Property<string>("Description");
b.Property<string>("ModeratorGroupName");
b.Property<string>("Name")
.IsRequired()
.HasAnnotation("MaxLength", 512);
b.Property<string>("Photo");
b.HasKey("Code");
});
modelBuilder.Entity("Yavsc.Models.ApplicationUser", b =>
{
b.Property<string>("Id");
b.Property<int>("AccessFailedCount");
b.Property<string>("Avatar");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken();
b.Property<string>("DedicatedGoogleCalendar");
b.Property<string>("Email")
.HasAnnotation("MaxLength", 256);
b.Property<bool>("EmailConfirmed");
b.Property<bool>("LockoutEnabled");
b.Property<DateTimeOffset?>("LockoutEnd");
b.Property<string>("NormalizedEmail")
.HasAnnotation("MaxLength", 256);
b.Property<string>("NormalizedUserName")
.HasAnnotation("MaxLength", 256);
b.Property<string>("PasswordHash");
b.Property<string>("PhoneNumber");
b.Property<bool>("PhoneNumberConfirmed");
b.Property<long?>("PostalAddressId");
b.Property<string>("SecurityStamp");
b.Property<bool>("TwoFactorEnabled");
b.Property<string>("UserName")
.HasAnnotation("MaxLength", 256);
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasAnnotation("Relational:Name", "EmailIndex");
b.HasIndex("NormalizedUserName")
.HasAnnotation("Relational:Name", "UserNameIndex");
b.HasAnnotation("Relational:TableName", "AspNetUsers");
});
modelBuilder.Entity("Yavsc.Models.Auth.Client", b =>
{
b.Property<string>("Id");
b.Property<bool>("Active");
b.Property<string>("DisplayName");
b.Property<string>("LogoutRedirectUri")
.HasAnnotation("MaxLength", 100);
b.Property<string>("RedirectUri");
b.Property<int>("RefreshTokenLifeTime");
b.Property<string>("Secret");
b.Property<int>("Type");
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.Auth.RefreshToken", b =>
{
b.Property<string>("Id");
b.Property<string>("ClientId")
.IsRequired()
.HasAnnotation("MaxLength", 50);
b.Property<DateTime>("ExpiresUtc");
b.Property<DateTime>("IssuedUtc");
b.Property<string>("ProtectedTicket")
.IsRequired();
b.Property<string>("Subject")
.IsRequired()
.HasAnnotation("MaxLength", 50);
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.BalanceImpact", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("BalanceId")
.IsRequired();
b.Property<DateTime>("ExecDate");
b.Property<decimal>("Impact");
b.Property<string>("Reason")
.IsRequired();
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<long?>("ArticleId");
b.Property<int>("Count");
b.Property<string>("Description")
.IsRequired();
b.Property<long?>("EstimateId");
b.Property<long?>("EstimateTemplateId");
b.Property<decimal>("UnitaryCost");
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("AttachedFilesString");
b.Property<string>("AttachedGraphicsString");
b.Property<string>("ClientId")
.IsRequired();
b.Property<long?>("CommandId");
b.Property<string>("CommandType");
b.Property<string>("Description");
b.Property<string>("OwnerId")
.IsRequired();
b.Property<int?>("Status");
b.Property<string>("Title");
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.Billing.EstimateTemplate", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("Description");
b.Property<string>("OwnerId")
.IsRequired();
b.Property<string>("Title");
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.Billing.ExceptionSIREN", b =>
{
b.Property<string>("SIREN");
b.HasKey("SIREN");
});
modelBuilder.Entity("Yavsc.Models.Blog", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("AuthorId");
b.Property<string>("Content");
b.Property<DateTime>("Modified");
b.Property<string>("Photo");
b.Property<DateTime>("Posted")
.ValueGeneratedOnAdd()
.HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP");
b.Property<int>("Rate");
b.Property<string>("Title");
b.Property<bool>("Visible");
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("ClientId")
.IsRequired();
b.Property<DateTime>("CreationDate")
.ValueGeneratedOnAdd()
.HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP");
b.Property<DateTime>("EventDate");
b.Property<long?>("LocationId");
b.Property<string>("PerformerId")
.IsRequired();
b.Property<decimal?>("Previsional");
b.Property<DateTime?>("ValidationDate");
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.Circle", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("ApplicationUserId");
b.Property<string>("Name");
b.Property<string>("OwnerId");
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.CircleMember", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<long>("CircleId");
b.Property<string>("MemberId")
.IsRequired();
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.Contact", b =>
{
b.Property<string>("OwnerId");
b.Property<string>("UserId");
b.Property<string>("ApplicationUserId");
b.HasKey("OwnerId", "UserId");
});
modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b =>
{
b.Property<string>("DeviceId");
b.Property<DateTime>("DeclarationDate")
.ValueGeneratedOnAdd()
.HasAnnotation("Relational:GeneratedValueSql", "LOCALTIMESTAMP");
b.Property<string>("DeviceOwnerId");
b.Property<string>("GCMRegistrationId")
.IsRequired();
b.Property<string>("Model");
b.Property<string>("Platform");
b.Property<string>("Version");
b.HasKey("DeviceId");
});
modelBuilder.Entity("Yavsc.Models.Market.BaseProduct", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("Description");
b.Property<string>("Discriminator")
.IsRequired();
b.Property<string>("Name");
b.Property<bool>("Public");
b.HasKey("Id");
b.HasAnnotation("Relational:DiscriminatorProperty", "Discriminator");
b.HasAnnotation("Relational:DiscriminatorValue", "BaseProduct");
});
modelBuilder.Entity("Yavsc.Models.Market.Service", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("ContextId");
b.Property<string>("Description");
b.Property<string>("Name");
b.Property<bool>("Public");
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.OAuth.OAuth2Tokens", b =>
{
b.Property<string>("UserId");
b.Property<string>("AccessToken");
b.Property<DateTime>("Expiration");
b.Property<string>("ExpiresIn");
b.Property<string>("RefreshToken");
b.Property<string>("TokenType");
b.HasKey("UserId");
});
modelBuilder.Entity("Yavsc.Models.PostTag", b =>
{
b.Property<long>("PostId");
b.Property<long>("TagId");
b.HasKey("PostId", "TagId");
});
modelBuilder.Entity("Yavsc.Models.Skill", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("Name");
b.Property<int>("Rate");
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.Tag", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("Name")
.IsRequired();
b.HasKey("Id");
});
modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b =>
{
b.Property<string>("PerformerId");
b.Property<bool>("AcceptGeoLocalization");
b.Property<bool>("AcceptNotifications");
b.Property<bool>("AcceptPublicContact");
b.Property<bool>("Active");
b.Property<string>("ActivityCode")
.IsRequired();
b.Property<int?>("MaxDailyCost");
b.Property<int?>("MinDailyCost");
b.Property<long?>("OfferId");
b.Property<long>("OrganizationAddressId");
b.Property<int>("Rate");
b.Property<string>("SIREN")
.IsRequired()
.HasAnnotation("MaxLength", 14);
b.Property<string>("WebSite");
b.HasKey("PerformerId");
});
modelBuilder.Entity("Yavsc.Models.Market.Product", b =>
{
b.HasBaseType("Yavsc.Models.Market.BaseProduct");
b.Property<decimal>("Depth");
b.Property<decimal>("Height");
b.Property<decimal?>("Price");
b.Property<decimal>("Weight");
b.Property<decimal>("Width");
b.HasAnnotation("Relational:DiscriminatorValue", "Product");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim<string>", b =>
{
b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole")
.WithMany()
.HasForeignKey("RoleId");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim<string>", b =>
{
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("UserId");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin<string>", b =>
{
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("UserId");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole<string>", b =>
{
b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole")
.WithMany()
.HasForeignKey("RoleId");
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("UserId");
});
modelBuilder.Entity("Yavsc.Models.AccountBalance", b =>
{
b.HasOne("Yavsc.Models.ApplicationUser")
.WithOne()
.HasForeignKey("Yavsc.Models.AccountBalance", "UserId");
});
modelBuilder.Entity("Yavsc.Models.ApplicationUser", b =>
{
b.HasOne("Yavsc.Location")
.WithMany()
.HasForeignKey("PostalAddressId");
});
modelBuilder.Entity("Yavsc.Models.BalanceImpact", b =>
{
b.HasOne("Yavsc.Models.AccountBalance")
.WithMany()
.HasForeignKey("BalanceId");
});
modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b =>
{
b.HasOne("Yavsc.Models.Market.BaseProduct")
.WithMany()
.HasForeignKey("ArticleId");
b.HasOne("Yavsc.Models.Billing.Estimate")
.WithMany()
.HasForeignKey("EstimateId");
b.HasOne("Yavsc.Models.Billing.EstimateTemplate")
.WithMany()
.HasForeignKey("EstimateTemplateId");
});
modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b =>
{
b.HasOne("Yavsc.Models.Booking.BookQuery")
.WithMany()
.HasForeignKey("CommandId");
});
modelBuilder.Entity("Yavsc.Models.Blog", b =>
{
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("AuthorId");
});
modelBuilder.Entity("Yavsc.Models.Booking.BookQuery", b =>
{
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("ClientId");
b.HasOne("Yavsc.Location")
.WithMany()
.HasForeignKey("LocationId");
b.HasOne("Yavsc.Models.Workflow.PerformerProfile")
.WithMany()
.HasForeignKey("PerformerId");
});
modelBuilder.Entity("Yavsc.Models.Circle", b =>
{
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("ApplicationUserId");
});
modelBuilder.Entity("Yavsc.Models.CircleMember", b =>
{
b.HasOne("Yavsc.Models.Circle")
.WithMany()
.HasForeignKey("CircleId");
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("MemberId");
});
modelBuilder.Entity("Yavsc.Models.Contact", b =>
{
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("ApplicationUserId");
});
modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b =>
{
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("DeviceOwnerId");
});
modelBuilder.Entity("Yavsc.Models.Market.Service", b =>
{
b.HasOne("Yavsc.Models.Activity")
.WithMany()
.HasForeignKey("ContextId");
});
modelBuilder.Entity("Yavsc.Models.PostTag", b =>
{
b.HasOne("Yavsc.Models.Blog")
.WithMany()
.HasForeignKey("PostId");
});
modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b =>
{
b.HasOne("Yavsc.Models.Activity")
.WithMany()
.HasForeignKey("ActivityCode");
b.HasOne("Yavsc.Models.Market.Service")
.WithMany()
.HasForeignKey("OfferId");
b.HasOne("Yavsc.Location")
.WithMany()
.HasForeignKey("OrganizationAddressId");
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("PerformerId");
});
}
}
}

283
Yavsc/Migrations/20161010102616_recontact.cs Normal file
View File

@ -0,0 +1,283 @@
using System;
using System.Collections.Generic;
using Microsoft.Data.Entity.Migrations;
namespace Yavsc.Migrations
{
public partial class recontact : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId", table: "AspNetRoleClaims");
migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId", table: "AspNetUserClaims");
migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId", table: "AspNetUserLogins");
migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_IdentityRole_RoleId", table: "AspNetUserRoles");
migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_ApplicationUser_UserId", table: "AspNetUserRoles");
migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance");
migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact");
migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery");
migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery");
migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember");
migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember");
migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_OwnerId", table: "Contact");
migrationBuilder.DropForeignKey(name: "FK_PostTag_Blog_PostId", table: "PostTag");
migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile");
migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile");
migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile");
migrationBuilder.AddColumn<string>(
name: "ApplicationUserId",
table: "Contact",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CommandType",
table: "Estimate",
nullable: true);
migrationBuilder.AddForeignKey(
name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId",
table: "AspNetRoleClaims",
column: "RoleId",
principalTable: "AspNetRoles",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId",
table: "AspNetUserClaims",
column: "UserId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId",
table: "AspNetUserLogins",
column: "UserId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_IdentityUserRole<string>_IdentityRole_RoleId",
table: "AspNetUserRoles",
column: "RoleId",
principalTable: "AspNetRoles",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_IdentityUserRole<string>_ApplicationUser_UserId",
table: "AspNetUserRoles",
column: "UserId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_AccountBalance_ApplicationUser_UserId",
table: "AccountBalance",
column: "UserId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_BalanceImpact_AccountBalance_BalanceId",
table: "BalanceImpact",
column: "BalanceId",
principalTable: "AccountBalance",
principalColumn: "UserId",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_BookQuery_ApplicationUser_ClientId",
table: "BookQuery",
column: "ClientId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_BookQuery_PerformerProfile_PerformerId",
table: "BookQuery",
column: "PerformerId",
principalTable: "PerformerProfile",
principalColumn: "PerformerId",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_CircleMember_Circle_CircleId",
table: "CircleMember",
column: "CircleId",
principalTable: "Circle",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_CircleMember_ApplicationUser_MemberId",
table: "CircleMember",
column: "MemberId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_Contact_ApplicationUser_ApplicationUserId",
table: "Contact",
column: "ApplicationUserId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_PostTag_Blog_PostId",
table: "PostTag",
column: "PostId",
principalTable: "Blog",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_PerformerProfile_Activity_ActivityCode",
table: "PerformerProfile",
column: "ActivityCode",
principalTable: "Activity",
principalColumn: "Code",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_PerformerProfile_Location_OrganizationAddressId",
table: "PerformerProfile",
column: "OrganizationAddressId",
principalTable: "Location",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_PerformerProfile_ApplicationUser_PerformerId",
table: "PerformerProfile",
column: "PerformerId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId", table: "AspNetRoleClaims");
migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId", table: "AspNetUserClaims");
migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId", table: "AspNetUserLogins");
migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_IdentityRole_RoleId", table: "AspNetUserRoles");
migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_ApplicationUser_UserId", table: "AspNetUserRoles");
migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance");
migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact");
migrationBuilder.DropForeignKey(name: "FK_BookQuery_ApplicationUser_ClientId", table: "BookQuery");
migrationBuilder.DropForeignKey(name: "FK_BookQuery_PerformerProfile_PerformerId", table: "BookQuery");
migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember");
migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember");
migrationBuilder.DropForeignKey(name: "FK_Contact_ApplicationUser_ApplicationUserId", table: "Contact");
migrationBuilder.DropForeignKey(name: "FK_PostTag_Blog_PostId", table: "PostTag");
migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Activity_ActivityCode", table: "PerformerProfile");
migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile");
migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile");
migrationBuilder.DropColumn(name: "ApplicationUserId", table: "Contact");
migrationBuilder.DropColumn(name: "CommandType", table: "Estimate");
migrationBuilder.AddForeignKey(
name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId",
table: "AspNetRoleClaims",
column: "RoleId",
principalTable: "AspNetRoles",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId",
table: "AspNetUserClaims",
column: "UserId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId",
table: "AspNetUserLogins",
column: "UserId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_IdentityUserRole<string>_IdentityRole_RoleId",
table: "AspNetUserRoles",
column: "RoleId",
principalTable: "AspNetRoles",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_IdentityUserRole<string>_ApplicationUser_UserId",
table: "AspNetUserRoles",
column: "UserId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_AccountBalance_ApplicationUser_UserId",
table: "AccountBalance",
column: "UserId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_BalanceImpact_AccountBalance_BalanceId",
table: "BalanceImpact",
column: "BalanceId",
principalTable: "AccountBalance",
principalColumn: "UserId",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_BookQuery_ApplicationUser_ClientId",
table: "BookQuery",
column: "ClientId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_BookQuery_PerformerProfile_PerformerId",
table: "BookQuery",
column: "PerformerId",
principalTable: "PerformerProfile",
principalColumn: "PerformerId",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_CircleMember_Circle_CircleId",
table: "CircleMember",
column: "CircleId",
principalTable: "Circle",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_CircleMember_ApplicationUser_MemberId",
table: "CircleMember",
column: "MemberId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_Contact_ApplicationUser_OwnerId",
table: "Contact",
column: "OwnerId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_PostTag_Blog_PostId",
table: "PostTag",
column: "PostId",
principalTable: "Blog",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_PerformerProfile_Activity_ActivityCode",
table: "PerformerProfile",
column: "ActivityCode",
principalTable: "Activity",
principalColumn: "Code",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_PerformerProfile_Location_OrganizationAddressId",
table: "PerformerProfile",
column: "OrganizationAddressId",
principalTable: "Location",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_PerformerProfile_ApplicationUser_PerformerId",
table: "PerformerProfile",
column: "PerformerId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
}
}
}

8
Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs
View File

@ -1,6 +1,8 @@
using System;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Infrastructure;
using Microsoft.Data.Entity.Metadata;
using Microsoft.Data.Entity.Migrations;
using Yavsc.Models;
namespace Yavsc.Migrations
@ -292,6 +294,8 @@ namespace Yavsc.Migrations
b.Property<long?>("CommandId");
b.Property<string>("CommandType");
b.Property<string>("Description");
b.Property<string>("OwnerId")
@ -411,6 +415,8 @@ namespace Yavsc.Migrations
b.Property<string>("UserId");
b.Property<string>("ApplicationUserId");
b.HasKey("OwnerId", "UserId");
});
@ -692,7 +698,7 @@ namespace Yavsc.Migrations
{
b.HasOne("Yavsc.Models.ApplicationUser")
.WithMany()
.HasForeignKey("OwnerId");
.HasForeignKey("ApplicationUserId");
});
modelBuilder.Entity("Yavsc.Models.Identity.GoogleCloudMobileDeclaration", b =>

6
Yavsc/Views/Home/Chat.cshtml
View File

@ -7,12 +7,14 @@
<input type="button" id="sendmessage" value="Send" />
<input type="hidden" id="displayname" />
@if (ViewBag.Contacts!=null) {
<select id="to" >
@foreach (var contact in ViewBag.Contacts) {
<option>@contact.UserName</option>
}
</select>
}
<ul id="discussion">
</ul>
<ul id="private">
@ -22,7 +24,7 @@
<!--Script references. -->
<!--The jQuery library is required and is referenced by default in _Layout.cshtml. -->
<!--Reference the SignalR library. -->
<script src="~/js/jquery.signalR-2.2.0.js"></script>
<script src="~/js/jquery.signalR-2.2.1.min.js"></script>
<!--Reference the autogenerated SignalR hub script. -->
<script src="~/signalr/hubs"></script>
<!--SignalR script to update the chat page and send messages.-->

4
Yavsc/project.json
View File

@ -68,8 +68,8 @@
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
"Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-final",
"Microsoft.AspNet.SignalR.Core": "2.2.0",
"Microsoft.AspNet.SignalR.JS": "2.2.0",
"Microsoft.AspNet.SignalR.Core": "2.2.1",
"Microsoft.AspNet.SignalR.JS": "2.2.1",
"Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*",
"Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-*",
"Microsoft.AspNet.WebSockets.Server": "1.0.0-rc1-final",

60
Yavsc/project.lock.json
View File

@ -199,12 +199,12 @@
"Zlib.Portable.Signed": "1.11.0"
},
"compile": {
"lib/net45/Google.Apis.dll": {},
"lib/net45/Google.Apis.PlatformServices.dll": {}
"lib/net45/Google.Apis.PlatformServices.dll": {},
"lib/net45/Google.Apis.dll": {}
},
"runtime": {
"lib/net45/Google.Apis.dll": {},
"lib/net45/Google.Apis.PlatformServices.dll": {}
"lib/net45/Google.Apis.PlatformServices.dll": {},
"lib/net45/Google.Apis.dll": {}
}
},
"Google.Apis.Core/1.11.1": {
@ -1347,7 +1347,7 @@
"lib/net451/Microsoft.AspNet.Session.dll": {}
}
},
"Microsoft.AspNet.SignalR.Core/2.2.0": {
"Microsoft.AspNet.SignalR.Core/2.2.1": {
"type": "package",
"dependencies": {
"Microsoft.Owin": "2.1.0",
@ -1362,7 +1362,7 @@
"lib/net45/Microsoft.AspNet.SignalR.Core.dll": {}
}
},
"Microsoft.AspNet.SignalR.JS/2.2.0": {
"Microsoft.AspNet.SignalR.JS/2.2.1": {
"type": "package",
"dependencies": {
"jQuery": "1.6.4"
@ -3016,12 +3016,12 @@
"Zlib.Portable.Signed": "1.11.0"
},
"compile": {
"lib/net45/Google.Apis.dll": {},
"lib/net45/Google.Apis.PlatformServices.dll": {}
"lib/net45/Google.Apis.PlatformServices.dll": {},
"lib/net45/Google.Apis.dll": {}
},
"runtime": {
"lib/net45/Google.Apis.dll": {},
"lib/net45/Google.Apis.PlatformServices.dll": {}
"lib/net45/Google.Apis.PlatformServices.dll": {},
"lib/net45/Google.Apis.dll": {}
}
},
"Google.Apis.Core/1.11.1": {
@ -4164,7 +4164,7 @@
"lib/net451/Microsoft.AspNet.Session.dll": {}
}
},
"Microsoft.AspNet.SignalR.Core/2.2.0": {
"Microsoft.AspNet.SignalR.Core/2.2.1": {
"type": "package",
"dependencies": {
"Microsoft.Owin": "2.1.0",
@ -4179,7 +4179,7 @@
"lib/net45/Microsoft.AspNet.SignalR.Core.dll": {}
}
},
"Microsoft.AspNet.SignalR.JS/2.2.0": {
"Microsoft.AspNet.SignalR.JS/2.2.1": {
"type": "package",
"dependencies": {
"jQuery": "1.6.4"
@ -5833,12 +5833,12 @@
"Zlib.Portable.Signed": "1.11.0"
},
"compile": {
"lib/net45/Google.Apis.dll": {},
"lib/net45/Google.Apis.PlatformServices.dll": {}
"lib/net45/Google.Apis.PlatformServices.dll": {},
"lib/net45/Google.Apis.dll": {}
},
"runtime": {
"lib/net45/Google.Apis.dll": {},
"lib/net45/Google.Apis.PlatformServices.dll": {}
"lib/net45/Google.Apis.PlatformServices.dll": {},
"lib/net45/Google.Apis.dll": {}
}
},
"Google.Apis.Core/1.11.1": {
@ -6981,7 +6981,7 @@
"lib/net451/Microsoft.AspNet.Session.dll": {}
}
},
"Microsoft.AspNet.SignalR.Core/2.2.0": {
"Microsoft.AspNet.SignalR.Core/2.2.1": {
"type": "package",
"dependencies": {
"Microsoft.Owin": "2.1.0",
@ -6996,7 +6996,7 @@
"lib/net45/Microsoft.AspNet.SignalR.Core.dll": {}
}
},
"Microsoft.AspNet.SignalR.JS/2.2.0": {
"Microsoft.AspNet.SignalR.JS/2.2.1": {
"type": "package",
"dependencies": {
"jQuery": "1.6.4"
@ -9434,25 +9434,25 @@
"Microsoft.AspNet.Session.nuspec"
]
},
"Microsoft.AspNet.SignalR.Core/2.2.0": {
"Microsoft.AspNet.SignalR.Core/2.2.1": {
"type": "package",
"sha512": "y+gx2iv3Da2YIkh/m8BSitF63PAs7sDJY9td9blvgrXzCvKAb664sc/2D7kNSwEiFDLDGCoax6pqe3pRRDSDHQ==",
"sha512": "EUZlRTmUZ3di6hxCiyyhnUld/8AKTOuX1DAGhNLv+ocTfmnOJyS42AEzgxdIk1jRAlEpUEuoicVBBI07A2FU2g==",
"files": [
"lib/net45/Microsoft.AspNet.SignalR.Core.dll",
"lib/net45/Microsoft.AspNet.SignalR.Core.xml",
"Microsoft.AspNet.SignalR.Core.2.2.0.nupkg",
"Microsoft.AspNet.SignalR.Core.2.2.0.nupkg.sha512",
"Microsoft.AspNet.SignalR.Core.2.2.1.nupkg",
"Microsoft.AspNet.SignalR.Core.2.2.1.nupkg.sha512",
"Microsoft.AspNet.SignalR.Core.nuspec"
]
},
"Microsoft.AspNet.SignalR.JS/2.2.0": {
"Microsoft.AspNet.SignalR.JS/2.2.1": {
"type": "package",
"sha512": "VjALldAdg3AiBPSmP9HUmqFTOQVRhl/jZI9Sq5AZAEbiPPfDK1FRjqtVia35OXyC+wGW2n20M5QNRKFuflSUsA==",
"sha512": "IKzTOfXjhN7kaGX47BATuTqP/mjVCDb9ivAVvBBrJoaomLT0Puj4f7fnHepByRkT7IGpm6hLbPO3afws5rlFdw==",
"files": [
"content/Scripts/jquery.signalR-2.2.0.js",
"content/Scripts/jquery.signalR-2.2.0.min.js",
"Microsoft.AspNet.SignalR.JS.2.2.0.nupkg",
"Microsoft.AspNet.SignalR.JS.2.2.0.nupkg.sha512",
"content/Scripts/jquery.signalR-2.2.1.js",
"content/Scripts/jquery.signalR-2.2.1.min.js",
"Microsoft.AspNet.SignalR.JS.2.2.1.nupkg",
"Microsoft.AspNet.SignalR.JS.2.2.1.nupkg.sha512",
"Microsoft.AspNet.SignalR.JS.nuspec"
]
},
@ -11384,8 +11384,8 @@
"Microsoft.AspNet.Mvc.TagHelpers >= 6.0.0-rc1-*",
"Microsoft.AspNet.Server.Kestrel >= 1.0.0-rc1-final",
"Microsoft.AspNet.Server.WebListener >= 1.0.0-rc1-final",
"Microsoft.AspNet.SignalR.Core >= 2.2.0",
"Microsoft.AspNet.SignalR.JS >= 2.2.0",
"Microsoft.AspNet.SignalR.Core >= 2.2.1",
"Microsoft.AspNet.SignalR.JS >= 2.2.1",
"Microsoft.AspNet.StaticFiles >= 1.0.0-rc1-*",
"Microsoft.AspNet.Tooling.Razor >= 1.0.0-rc1-*",
"Microsoft.AspNet.WebSockets.Server >= 1.0.0-rc1-final",

87
Yavsc/wwwroot/js/jquery.signalR-2.2.0.js → Yavsc/wwwroot/js/jquery.signalR-2.2.1.js
View File

@ -1,10 +1,11 @@
/* jquery.signalR.core.js */
/*global window:false */
/*!
* ASP.NET SignalR JavaScript Library v2.2.0
* ASP.NET SignalR JavaScript Library v2.2.1
* http://signalr.net/
*
* Copyright (C) Microsoft Corporation. All rights reserved.
* Copyright (c) .NET Foundation. All rights reserved.
* Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
*
*/
@ -246,7 +247,14 @@
}
};
_pageWindow.load(function () { _pageLoaded = true; });
// .on() was added in version 1.7.0, .load() was removed in version 3.0.0 so we fallback to .load() if .on() does
// not exist to not break existing applications
if (typeof _pageWindow.on == "function") {
_pageWindow.on("load", function () { _pageLoaded = true; });
}
else {
_pageWindow.load(function () { _pageLoaded = true; });
}
function validateTransport(requestedTransport, connection) {
/// <summary>Validates the requested transport by cross checking it with the pre-defined signalR.transports</summary>
@ -902,8 +910,6 @@
connection.log("Stopping connection.");
changeState(connection, connection.state, signalR.connectionState.disconnected);
// Clear this no matter what
window.clearTimeout(connection._.beatHandle);
window.clearInterval(connection._.pingIntervalId);
@ -933,9 +939,6 @@
connection._.initHandler.stop();
}
// Trigger the disconnect event
$(connection).triggerHandler(events.onDisconnect);
delete connection._deferral;
delete connection.messageId;
delete connection.groupsToken;
@ -947,6 +950,10 @@
// Clear out our message buffer
connection._.connectingMessageBuffer.clear();
// Trigger the disconnect event
changeState(connection, connection.state, signalR.connectionState.disconnected);
$(connection).triggerHandler(events.onDisconnect);
return connection;
},
@ -974,7 +981,8 @@
}(window.jQuery, window));
/* jquery.signalR.transports.common.js */
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
/*global window:false */
/// <reference path="jquery.signalR.core.js" />
@ -1060,14 +1068,6 @@
connection.log(transport.name + " transport starting.");
that.transportTimeoutHandle = window.setTimeout(function () {
if (!failCalled) {
failCalled = true;
connection.log(transport.name + " transport timed out when trying to connect.");
that.transportFailed(transport, undefined, onFallback);
}
}, connection._.totalTransportConnectTimeout);
transport.start(connection, function () {
if (!failCalled) {
that.initReceived(transport, onSuccess);
@ -1083,6 +1083,14 @@
// false if it should attempt to reconnect
return !that.startCompleted || that.connectionStopped;
});
that.transportTimeoutHandle = window.setTimeout(function () {
if (!failCalled) {
failCalled = true;
connection.log(transport.name + " transport timed out when trying to connect.");
that.transportFailed(transport, undefined, onFallback);
}
}, connection._.totalTransportConnectTimeout);
},
stop: function () {
@ -1478,10 +1486,13 @@
}
},
tryInitialize: function (persistentResponse, onInitialized) {
if (persistentResponse.Initialized) {
tryInitialize: function (connection, persistentResponse, onInitialized) {
if (persistentResponse.Initialized && onInitialized) {
onInitialized();
} else if (persistentResponse.Initialized) {
connection.log("WARNING! The client received an init message after reconnecting.");
}
},
triggerReceived: function (connection, data) {
@ -1510,7 +1521,7 @@
transportLogic.triggerReceived(connection, message);
});
transportLogic.tryInitialize(data, onInitialized);
transportLogic.tryInitialize(connection, data, onInitialized);
}
}
},
@ -1661,7 +1672,9 @@
}(window.jQuery, window));
/* jquery.signalR.transports.webSockets.js */
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
/*global window:false */
/// <reference path="jquery.signalR.transports.common.js" />
@ -1816,7 +1829,9 @@
}(window.jQuery, window));
/* jquery.signalR.transports.serverSentEvents.js */
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
/*global window:false */
/// <reference path="jquery.signalR.transports.common.js" />
@ -1998,7 +2013,9 @@
}(window.jQuery, window));
/* jquery.signalR.transports.foreverFrame.js */
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
/*global window:false */
/// <reference path="jquery.signalR.transports.common.js" />
@ -2204,7 +2221,7 @@
}
}
catch (e) {
connection.log("Error occured when stopping foreverFrame transport. Message = " + e.message + ".");
connection.log("Error occurred when stopping foreverFrame transport. Message = " + e.message + ".");
}
}
@ -2244,7 +2261,9 @@
}(window.jQuery, window));
/* jquery.signalR.transports.longPolling.js */
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
/*global window:false */
/// <reference path="jquery.signalR.transports.common.js" />
@ -2274,7 +2293,12 @@
fireConnect = $.noop;
connection.log("LongPolling connected.");
onSuccess();
if (onSuccess) {
onSuccess();
} else {
connection.log("WARNING! The client received an init message after reconnecting.");
}
},
tryFailConnect = function (error) {
if (onFailed(error)) {
@ -2452,7 +2476,7 @@
}
});
// This will only ever pass after an error has occured via the poll ajax procedure.
// This will only ever pass after an error has occurred via the poll ajax procedure.
if (reconnecting && raiseReconnect === true) {
// We wait to reconnect depending on how many times we've failed to reconnect.
// This is essentially a heuristic that will exponentially increase in wait time before
@ -2499,7 +2523,8 @@
}(window.jQuery, window));
/* jquery.signalR.hubs.js */
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
/*global window:false */
/// <reference path="jquery.signalR.core.js" />
@ -2918,10 +2943,12 @@
}(window.jQuery, window));
/* jquery.signalR.version.js */
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
/*global window:false */
/// <reference path="jquery.signalR.core.js" />
(function ($, undefined) {
$.signalR.version = "2.2.0";
$.signalR.version = "2.2.1";
}(window.jQuery));

9
Yavsc/wwwroot/js/jquery.signalR-2.2.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long