Skip to content

SfsClient subtree update for proxy support - #5044

Closed
Nicolas Dietrich (nidietr-MSFT) wants to merge 2 commits into
microsoft:masterfrom
nidietr-MSFT:SfsClient-Update-ProxySupport
Closed

SfsClient subtree update for proxy support#5044
Nicolas Dietrich (nidietr-MSFT) wants to merge 2 commits into
microsoft:masterfrom
nidietr-MSFT:SfsClient-Update-ProxySupport

Conversation

@nidietr-MSFT

@nidietr-MSFT Nicolas Dietrich (nidietr-MSFT) commented Dec 6, 2024 •
edited by microsoft-github-policy-service Bot
Loading

Copy link
Copy Markdown
Contributor
Microsoft Reviewers: Open in CodeFlow

@nidietr-MSFT
Squashed 'src/SfsClient/sfs-client/' changes from be733af9..c639a506
48c2def 
c639a506 Adding support for a custom proxy input (microsoft#218)
258d189b Improve logging when the content type is wrong (microsoft#221)
216210ab Adding required permissions to enable uploading of CodeQL results (microsoft#214)
fb953d6e Bump github/codeql-action from 2 to 3 (microsoft#215)
52af7124 Enabling CodeQL scanning (microsoft#211)
e555d764 Bump clang-format from 18.1.5 to 19.1.1 (microsoft#210)
ab8f0e72 Setup: improving build tools installation (microsoft#207)

git-subtree-dir: src/SfsClient/sfs-client
git-subtree-split: c639a506e712dbd29ca7ca0c78d5216658e78748
@nidietr-MSFT
Update SfsClient subtree to get Proxy Support from commit c639a50
34148cb
arthuraraujo-msft
Arthur Araujo (arthuraraujo-msft) reviewed Dec 6, 2024
View reviewed changes
Comment thread src/SfsClient/readme.md
## SfsClient

Do not change code under the sfs-client directory; it contains sfs-client source code from commit [be733af](https://github.com/microsoft/sfs-client/commits/be733af).
Do not change code under the sfs-client directory; it contains sfs-client source code from commit [c639a50](https://github.com/microsoft/sfs-client/commit/c639a50).

@arthuraraujo-msft Arthur Araujo (arthuraraujo-msft) Dec 6, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Please wait for the release of the client to happen before picking the commit hash.

@arthuraraujo-msft Arthur Araujo (arthuraraujo-msft) Dec 9, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Do use this release https://github.com/microsoft/sfs-client/releases/tag/1.1.0

@yao-msft

yao-msft commented Dec 9, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

For subtree updates, to keep the history, we'll usually do something similar to below
git subtree pull -P src/SfsClient/sfs-client https://github.com/microsoft/sfs-client 1.1.0 --squash
This will create 2 commits. We do not modify these 2 commits. All changes outside of the subtree pull will go to a 3rd commit (readme, etc). Also please update the (SFS_VERSION)s to be 1.1.0 in SfsClient.vcxproj in the 3rd commit.

@nidietr-MSFT

Nicolas Dietrich (nidietr-MSFT) commented Dec 10, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Thanks Yao, Arthur.

Then, for clarity, let's cancel this PR.

I have now created a new clean PR for SfsClient update in WinGet
SfsClient update 1.1.0 for proxy support #5052

This new PR:

  • directly pulls SfsClient 1.1.0 release, through its 2 unmodified commits from github subtree pull xxx -squash
  • has as a separate 3rd commit the readme.md & SfsClient project updated

@nidietr-MSFT
Nicolas Dietrich (nidietr-MSFT) deleted the SfsClient-Update-ProxySupport branch December 10, 2024 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@arthuraraujo-msft Arthur Araujo (arthuraraujo-msft) arthuraraujo-msft left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@nidietr-MSFT @yao-msft @arthuraraujo-msft