Did you add the kendo.directives to your module configuration?
/* 'app' MODULE DEFINITION */
var appModule = angular.module("app", [
"ui.router",
"ui.bootstrap",
'ui.utils',
"ui.jq",
'ui.grid',
'ui.grid.pagination',
"oc.lazyLoad",
"ngSanitize",
"ngMessages",
'angularFileUpload',
'daterangepicker',
'angularMoment',
'frapontillo.bootstrap-switch',
'abp',
'kendo.directives'
]);
On Step 4, I delete all the files in the File Explorer, I just don't unzip and override. You may have untracked files, and they may have removed files from the solution also, so I do that. GIT will understand if you delete a file, then add it back into the directory, that it was an edit, not a delete and add.
Other than that, yes, looks about right to me.
Quick question. The ZipFile you checked into Framework-Master, is it the same version of AspNetZero you have been using on your current code?
If not, you will need to reset things. Because you need to base your current changes off the code that was branched in Framework-Master. So this first time, what you need to do is take the new solution from AspnetZero, and manually copy your changes into that new solution. This was, your changes are now based off the new code. This way, as you download new versions, the merges will happen right.
If you did have the original file, then you would want to make sure you used the code you originally based your solution on to be the start of Framework-Master.
Where is a whiteboard when you need one lol.
I actually Use Visual Studio to resolve my GIT conflicts. So it's almost the exact experience I had with TFS. I run the GIT commands to merge on the command line, then go to VS and open Team explorer, and Click Changes. It shows you the merge conflicts and let's you fix them there. At least it works with vsts online. I assume it may work the same with GitHub.
Remember, Framework-Master will only have downloaded files. So it will never have changes that you manually made. You want GIT to just track changes that the AspNetZero guys made. Make sense? Then, once you merge from Framework-Master branch to your branch, your merging their changes into your changes. It works out perfectly. There are some manual steps after merge, like upgrading Nuget on any projects you added to the solution, moving around migrations, etc. But mostly pretty painless.
Good luck, you won't regret moving to GIT. It took my a while to make the plunge, but wow am I glad I did!
For Azure, create a blank database first through the Portal.
Then, inside the AspNetZero solution, under tools, there is a Migrator project. Change the connection string within that project to point to your Azure DB, run it.
Hope that helps a little.
Ok, I figured it out. In the UserManager class within the Core project, override the CreateIdentityAsync method. You can add your claim in here. SignInManager calls this function. I will update the GitHub link.
public override async Task<ClaimsIdentity> CreateIdentityAsync(User user, string authenticationType)
{
var identity = await base.CreateIdentityAsync(user, authenticationType);
//- Custom claim here
identity.AddClaim(new Claim("MyCustomClaim", "ClaimValue"));
return identity;
}
And by the way, sorry to keep harping on this @drcgreece, this is one of those places where the pros / cons of not changing their code is a tough one. You can either modify the class they gave you, or you have to Implement your own UserManager that inherits from theirs, and within the IOC config, you can change how the IUserManager interface is created. To me, it's just a little more than I want to do. Your mileage may very.
Sorry, I don't mean to sound so repetitive, I just thought this was a good example of how the lines get blurred as you go.
That's ok. This should work the same in TFS. You can Merge down in TFS without ever merging "up".
So if you create the very root branch from the Zip file downloaded (absolutely no changes). Then immediately after you commit that, branch to "Framework".
Then, each time you get a new ZipFile from AspNetZero site, you just go to the Framework Branch, and unzip the file. in GIT, I delete everything, then unzip it. That way if they have deleted any files, I get that also. in TFS, this may be the only complication. You may need to do the following:
Then, check in. Once that's done, you merge back to your Master branch. NEVER merge into the framework branch. Framework branch is always just the contents of the ZipFile. Then, when you merge, you should see conflicts where things have changed. Just a normal code merge at that point. Something you can undo, and rollback.
I will find the commands for #4 tomorrow. I have a batch file in my old code somewhere that does it.
I feel like I need to make a video explaining how I am doing the merging. I see these steps and I cringe. I am just not sure I have the time to do that.
Read my post on GitHub again. I can't say how strongly I believe you have to use your source control's merging capabilities. You ask which files have changed, I know that because my source control system tells me what changed. It already knows how to merge files and helps you make those decisions. You have to take advantage of that system in my opinion. I am probably 3 or 4 versions behind, but merging would take me probably just a few hours at most. I think I could get it done within a day for sure (minus testing time).
Sorry if I sound overly opinionated on this subject. I just believe your experience would be so much better doing it this way. I will hop off my soap box now.
Any quick hints for this? I am about to have to really tear apart some of the code, and it's going to take quite a bit of time. I was hopeful someone had an "oh that's easy" answer.
<cite>ismcagdas: </cite> Hi,
I have deleted your last post in this topic because sharing source code here is against license rules. Can you also delete files from dropbox as well ?
Please share only your DbContext class's content here or you can send the whole project via email.
Thanks.
Sorry as well. I didn't realize that when I asked him to post it.