Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Makes build cake 1.0.0 compatible #1436

Closed
wants to merge 1 commit into from
Closed

Makes build cake 1.0.0 compatible #1436

wants to merge 1 commit into from

Conversation

abriening
Copy link

@abriening abriening commented Feb 12, 2021 •
edited
Loading

Fixes / New Feature #

Proposed Changes

  • Adds .config with dotnet-tools to load cake.tool
  • restore and use dotnet cake in Makefile
  • Fixes change in DeleteDirectory signature

@abriening abriening mentioned this pull request Feb 12, 2021
Closed
@abriening abriening force-pushed the cake-1-0-0-compatible branch from cf4f9bf to 30dd5d0 Compare February 12, 2021 04:22
@abriening abriening mentioned this pull request Feb 12, 2021
Closed
@abriening abriening force-pushed the cake-1-0-0-compatible branch from 30dd5d0 to 7806238 Compare February 12, 2021 13:53
@bjartekh bjartekh mentioned this pull request Feb 22, 2021
Open
@Ugway77 Ugway77 mentioned this pull request Apr 7, 2021
Closed
@mehyaa mehyaa mentioned this pull request Jun 1, 2021
Open
@amamei amamei mentioned this pull request Jun 21, 2021
Closed
@raman-m
Copy link
Member

raman-m commented Jun 30, 2023 •
edited
Loading

@abriening Hi Andrew!

Please do the following:

  • Merge PR 1
  • Rebase feature branch onto develop
  • Resolve all merge conflicts

@raman-m raman-m added the conflicts Feature branch has merge conflicts label Jul 11, 2023
@raman-m raman-m force-pushed the cake-1-0-0-compatible branch from 7806238 to 77cc435 Compare August 23, 2023 16:57
@raman-m raman-m added bug Identified as a potential bug proposal Proposal for a new functionality in Ocelot needs feedback Issue is waiting on feedback before acceptance and removed conflicts Feature branch has merge conflicts labels Aug 23, 2023
@raman-m
Copy link
Member

raman-m commented Aug 23, 2023

@abriening Hi Andrew!
I've tried to solve and resolve merge conflicts in better manner.
So, the feature branch has been rebased onto ThreeMammals:develop successfully!
I've kept all changes from target branch because it contains most actual config for builds.
But now, I don't see any changes in your PR at all. Small change on line 444. Is it relevant?
Also, Cake Tool has version 3.0.0 now, not 1.0.0 as it's requested in PR.
It seems your PR is obsolete now, right?

@raman-m raman-m added question Initially seen a question could become a new feature or bug or closed ;) waiting Waiting for answer to question or feedback from issue raiser labels Aug 23, 2023
@abriening
Copy link
Author

My PRs were ignored for several years. I've moved to https://github.com/microsoft/reverse-proxy instead of ocelot.

@raman-m
Copy link
Member

raman-m commented Aug 28, 2023

Andrew!
Sorry for ignoring your PR. The owner doesn't care about this project since 2020.
Can we close the PR because of applied fix by owner in other commits?

raman-m
raman-m requested changes Sep 30, 2023
View reviewed changes
build.cake
@@ -441,22 +441,22 @@ private void PublishPackages(ConvertableDirectoryPath packagesDir, ConvertableFi

private void CreateGitHubRelease()
{
var json = $"{{ \"tag_name\": \"{versioning.NuGetVersion}\", \"target_commitish\": \"main\", \"name\": \"{versioning.NuGetVersion}\", \"body\": \"{ReleaseNotesAsJson()}\", \"draft\": true, \"prerelease\": true }}";

var json = $"{{ \"tag_name\": \"{versioning.NuGetVersion}\", \"target_commitish\": \"master\", \"name\": \"{versioning.NuGetVersion}\", \"body\": \"{ReleaseNotesAsJson()}\", \"draft\": true, \"prerelease\": true }}";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
var json = $"{{ \"tag_name\": \"{versioning.NuGetVersion}\", \"target_commitish\": \"master\", \"name\": \"{versioning.NuGetVersion}\", \"body\": \"{ReleaseNotesAsJson()}\", \"draft\": true, \"prerelease\": true }}";
var json = $"{{ \"tag_name\": \"{versioning.NuGetVersion}\", \"target_commitish\": \"main\", \"name\": \"{versioning.NuGetVersion}\", \"body\": \"{ReleaseNotesAsJson()}\", \"draft\": true, \"prerelease\": true }}";

We make releases on main which protected!
master is not protected anymore, and this branch was removed.

@raman-m raman-m force-pushed the cake-1-0-0-compatible branch from 77cc435 to cc8416f Compare September 30, 2023 15:05
@abriening abriening closed this Oct 9, 2023
@raman-m raman-m added wontfix No plan to include this issue in the Ocelot core functionality. and removed question Initially seen a question could become a new feature or bug or closed ;) needs feedback Issue is waiting on feedback before acceptance waiting Waiting for answer to question or feedback from issue raiser labels Oct 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@raman-m raman-m raman-m requested changes

@gcaraman gcaraman Awaiting requested review from gcaraman

@amamei amamei Awaiting requested review from amamei

@CristaliS CristaliS Awaiting requested review from CristaliS

Assignees

@abriening abriening

Labels
bug Identified as a potential bug proposal Proposal for a new functionality in Ocelot wontfix No plan to include this issue in the Ocelot core functionality.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@abriening @raman-m @CristaliS @amamei @gcaraman