Skip to content

Commit

Permalink
Merge pull request #22 from tugberkugurlu/fix-namespaces
Browse files Browse the repository at this point in the history
Fix namespaces
  • Loading branch information
tugberkugurlu authored Oct 5, 2016
2 parents 7406e95 + b8e2bb8 commit de8cbe7
Show file tree
Hide file tree
Showing 17 changed files with 21 additions and 22 deletions.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"projects": ["src"],
"projects": ["src", "samples"],
"sdk": {
"version": "1.0.0-preview2-003121"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Microsoft.Extensions.Logging;
using IdentitySample.Models.AccountViewModels;
using IdentitySample.Services;
using Dnx.Identity.MongoDB;
using AspNetCore.Identity.MongoDB;

namespace IdentitySample.Controllers
{
Expand Down
2 changes: 1 addition & 1 deletion samples/IdentitySample.Mvc/Controllers/ManageController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Extensions.Logging;
using IdentitySample.Models.ManageViewModels;
using IdentitySample.Services;
using Dnx.Identity.MongoDB;
using AspNetCore.Identity.MongoDB;

namespace IdentitySamples.Controllers
{
Expand Down
2 changes: 1 addition & 1 deletion samples/IdentitySample.Mvc/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
using Microsoft.Extensions.Options;
using System.Security.Claims;
using MongoDB.Driver;
using Dnx.Identity.MongoDB;
using AspNetCore.Identity.MongoDB;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.DataProtection;
Expand Down
2 changes: 1 addition & 1 deletion samples/IdentitySample.Mvc/Views/Account/Login.cshtml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using System.Collections.Generic
@using Microsoft.AspNetCore.Http
@using Microsoft.AspNetCore.Http.Authentication
@using Dnx.Identity.MongoDB
@using AspNetCore.Identity.MongoDB
@model LoginViewModel
@inject SignInManager<MongoIdentityUser> SignInManager

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using Microsoft.AspNetCore.Identity
@using Dnx.Identity.MongoDB
@using AspNetCore.Identity.MongoDB

@inject SignInManager<MongoIdentityUser> SignInManager
@inject UserManager<MongoIdentityUser> UserManager
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Dnx.Identity.MongoDB.Models
namespace AspNetCore.Identity.MongoDB.Models
{
public class ConfirmationOccurrence : Occurrence
{
Expand Down
2 changes: 1 addition & 1 deletion src/AspNetCore.Identity.MongoDB/Models/FutureOccurrence.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Dnx.Identity.MongoDB.Models
namespace AspNetCore.Identity.MongoDB.Models
{
public class FutureOccurrence : Occurrence
{
Expand Down
2 changes: 1 addition & 1 deletion src/AspNetCore.Identity.MongoDB/Models/MongoUserClaim.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Security.Claims;

namespace Dnx.Identity.MongoDB.Models
namespace AspNetCore.Identity.MongoDB.Models
{
public class MongoUserClaim : IEquatable<MongoUserClaim>, IEquatable<Claim>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Dnx.Identity.MongoDB.Models
namespace AspNetCore.Identity.MongoDB.Models
{
public abstract class MongoUserContactRecord : IEquatable<MongoUserEmail>
{
Expand Down
2 changes: 1 addition & 1 deletion src/AspNetCore.Identity.MongoDB/Models/MongoUserEmail.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Dnx.Identity.MongoDB.Models
namespace AspNetCore.Identity.MongoDB.Models
{
public class MongoUserEmail : MongoUserContactRecord
{
Expand Down
2 changes: 1 addition & 1 deletion src/AspNetCore.Identity.MongoDB/Models/MongoUserLogin.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using Microsoft.AspNetCore.Identity;

namespace Dnx.Identity.MongoDB.Models
namespace AspNetCore.Identity.MongoDB.Models
{
public class MongoUserLogin : IEquatable<MongoUserLogin>, IEquatable<UserLoginInfo>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Dnx.Identity.MongoDB.Models
namespace AspNetCore.Identity.MongoDB.Models
{
public class MongoUserPhoneNumber : MongoUserContactRecord
{
Expand Down
2 changes: 1 addition & 1 deletion src/AspNetCore.Identity.MongoDB/Models/Occurrence.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Dnx.Identity.MongoDB.Models
namespace AspNetCore.Identity.MongoDB.Models
{
public class Occurrence
{
Expand Down
6 changes: 3 additions & 3 deletions src/AspNetCore.Identity.MongoDB/MongoConfig.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Dnx.Identity.MongoDB.Models;
using AspNetCore.Identity.MongoDB.Models;
using Microsoft.AspNetCore.Identity;
using MongoDB.Bson.Serialization;
using MongoDB.Bson.Serialization.Conventions;
using System;
using System.Threading;

namespace Dnx.Identity.MongoDB
namespace AspNetCore.Identity.MongoDB
{
internal static class MongoConfig
{
Expand Down Expand Up @@ -71,7 +71,7 @@ private static void RegisterConventions()
new CamelCaseElementNameConvention(),
};

ConventionRegistry.Register("Dnx.Identity.MongoDB", pack, IsConventionApplicable);
ConventionRegistry.Register("AspNetCore.Identity.MongoDB", pack, IsConventionApplicable);
}

private static bool IsConventionApplicable(Type type)
Expand Down
5 changes: 2 additions & 3 deletions src/AspNetCore.Identity.MongoDB/MongoIdentityUser.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using Dnx.Identity.MongoDB.Models;
using System.Globalization;
using AspNetCore.Identity.MongoDB.Models;
using System.Security.Claims;

namespace Dnx.Identity.MongoDB
namespace AspNetCore.Identity.MongoDB
{
public class MongoIdentityUser
{
Expand Down
4 changes: 2 additions & 2 deletions src/AspNetCore.Identity.MongoDB/MongoUserStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
using System.Threading.Tasks;
using System.Threading;
using MongoDB.Driver;
using Dnx.Identity.MongoDB.Models;
using AspNetCore.Identity.MongoDB.Models;
using System.Linq;
using System.Security.Claims;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Logging;
using MongoDB.Bson.Serialization.Conventions;

namespace Dnx.Identity.MongoDB
namespace AspNetCore.Identity.MongoDB
{
public class MongoUserStore<TUser> :
IUserStore<TUser>,
Expand Down

0 comments on commit de8cbe7

Please sign in to comment.