Skip to content

Pk/upstream changes to push - #63

Merged
Simon Porter (simonporter) merged 3 commits into
Azure:vnextfrom
PradeepKadubandi:pk/upstream_changes_to_push
Sep 12, 2016
Merged

Pk/upstream changes to push#63
Simon Porter (simonporter) merged 3 commits into
Azure:vnextfrom
PradeepKadubandi:pk/upstream_changes_to_push

Conversation

@PradeepKadubandi

Copy link
Copy Markdown
Contributor

Affan Dar (@affandar) / Simon Porter (@simonporter) ,

What do you think about this change? I made this in my fork for service fabric custom provider so that I could reuse the test orchestration code, I would like to push these changes to main repository so that there will be less conflicts or changes in future for pull from remote. I think the change is good and no risk.

Let me know if you have any comments and I can fix it.

pradeek added 2 commits August 31, 2016 10:37
… that
service fabric implementation can reference those and stress test executable
can reference the service fabric.
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

@simonporterSimon Porter (simonporter)Sep 7, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add this import: Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props"

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@simonporter

Copy link
Copy Markdown
Contributor

Added two minor comments if you can update I'll merge them in.

@PradeepKadubandi

Copy link
Copy Markdown
ContributorAuthor

Simon Porter (@simonporter) , Took care of the comments - can you merge the changes? Thanks!

@simonporter
Simon Porter (simonporter) merged commit d817c90 into Azure:vnextSep 12, 2016
@PradeepKadubandi
Pradeep Kadubandi (PradeepKadubandi) deleted the pk/upstream_changes_to_push branch September 22, 2016 22:30
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@PradeepKadubandi@simonporter