-
Notifications
You must be signed in to change notification settings - Fork 4k
Update to R5 RP 2019-07-01 API (#27) #10294
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Could do with some info on the failure https://dev.azure.com/azure-sdk/public/_build/results?buildId=144087&view=logs&jobId=e1b7b984-9f58-529f-7c5a-f15f8e35cfa6 please. |
/azp run |
Azure Pipelines successfully started running 3 pipeline(s). |
properties "Nfsv4" and "CreationData" were renamed and were treated as breaking changes by system, suppress following error messages https://dev.azure.com/azure-sdk/public/_build/results?buildId=161091&view=artifacts Also you can check https://github.com/Azure/azure-powershell/blob/master/documentation/Debugging-StaticAnalysis-Errors.md for detail. |
ok, I have updated that file and the pipeline now passes. |
@@ -1,4 +1,4 @@ | |||
<Project Sdk="Microsoft.NET.Sdk"> | |||
<Project Sdk="Microsoft.NET.Sdk"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how is this line different?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmmm, really can't say. I don't see any difference and have not made any change to it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check if there are any white spaces, could be caused by your text editor.
Also simply fix the merge conflict, let me know if you have any update.
I'll try to merge it for you as soon as I can.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suspect it was caused by the editor but there is no whitespace difference.
Concerning the merge conflicts, because this is test record files and there are too many diffs to fix in github, I know of no other way than cloning from azure, force pushing to my fork, reapplying all the changes and then rerunning all the tests. It also means the PR is closed and a new one must be opened. This is time consuming and happens a lot while things are in review. Is there a shorter way? Thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Try rebasing: https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/cleaning-up-commits.md#rebasing
No need to close this or create a new PR, and no need to run all the tests by the way -- only the four tests that have conflicts need to be re-ran.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't have luck with rebasing but anyway the closure of the PR is not something I manually do but seems to occur with the force push. I will try again next time but for now this PR has closed and I will link another shortly.
Regarding the diff mentioned above, I've now seen that this is because the original file contains '<EF><BB><BF>' which was stripped out.
PR replaced by #10445 |
Description
Checklist
CONTRIBUTING.md
ChangeLog.md
file(s) has been updated:ChangeLog.md
file can be found atsrc/{{SERVICE}}/{{SERVICE}}/ChangeLog.md
## Upcoming Release
header -- no new version header should be added