fix for Issue #101 - Unable to open SquishItAspNetTest in VS2010 #102
Conversation
This comment has been minimized.
This comment has been minimized.
all unit tests pass; mono tests not run |
Hmm. I didn't realize pushing further commits to my fork would affect this pull request. Is there any way to split this pull request into two separate requests? The SquishAndGetUrls method is for use when loading files on-demand (ie. jQuery.ajax, dojo.require, YUI.Get.script, etc). Renders the bundle and returns the url(s) as appropriate. Eg. Bundle()
.Javascript()
.Add("~/js/test1.js")
.Add("~/js/test2.js")
.SquishAndGetUrls("~/js/test_#.js") If Debug, returns If Release, returns Unit Tests included for Javascript and Css bundles. |
Apologies, I don't think I have seen any messages at all from this pull request. I didn't realize it was here until just now. I'm looking at some of your commits, and I like them. We might change up some of the naming, but I really like it. Thank you! |
Glad it might be useful. I wasn't sure about the etiquette of bugging Sorry about the messed up commit/pull thing. I don't know enough Thanks again for making a great tool. |
I can split them up and integrate them separately, but it won't look like it came from your fork. As long as you don't care about the fame and fortune that comes with your name on a commit :-) In the future, just create a branch in your fork and then point the pull request to that branch. It is a really useful feature that you can add changes to a pull request since it just points at a fork, but it is confusing when you first do it! I know I made the same exact mistake. Justin Etheredge On Tuesday, February 7, 2012 at 9:12 AM, Adrian Lanning wrote:
|
Integrate away, good sir. :-) Thanks for the advice. Regarding getting it right the next time, do you happen to have any good references to a simple workflow? I found this one from the NuGet guys (bottom of the page) but it seems a bit more complicated than what you describe: https://github.com/NuGet/NuGetGallery/blob/master/README.markdown Assuming the NuGet workflow is appropriate, then next time should I submit the github pull request between steps 4 and 5? Or is that automatically done with the 'git pull' command in step 5? |
I think that their workflow is a bit more complicated. I think you'll want to create branches in your fork and not merge them into master. This way you can create multiple pull requests from the same fork. |
Simple fix, just removed reference to VS9 file in project's csproj file