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

Update preview to main #2311

Merged
merged 34 commits into from
Mar 2, 2022
Merged

Update preview to main #2311

merged 34 commits into from
Mar 2, 2022

Conversation

dylanbulfinMS
Copy link
Contributor

Checklist

  • I have read the contribution guidelines.
  • I added or modified the existing tests to cover the change (we do not allow our test coverage to go down).
  • This pull-request is submitted against the main branch.

Description of the changes

Reference/Link to the issue solved with this PR (if any)

jamdavi and others added 30 commits December 7, 2021 18:55
@jamdavi
doc(client, service): Update documents about the Proxy property for v…
4564243 
…arious clients (#2248)

Update our code docs to better explain proxy settings
@azabbasi
Cleanup IDE warnings. From 442 down to 31. (#2254)
27685d1
@azabbasi
Fix documented exception types thrown by methods in device client. (#…
2cf35f3 
…2256)
@azabbasi
(Fix: DeviceClient): Fix the concurrency issue in MQTT stack (#2234)
4618ef3
Update RegistryManager bulk API unit tests (#2258)
5245797
feat(hub-svc): add support and tests for configurations export (#2250)
d22f9f3
Temporarily disable import devices/configs test (#2263)
2b05e47
fix(iot-svc): update debug assert (#2264)
89973ed 
* fix(iot-svc): update debug assert

* Temporarily disable import devices/configs test (#2263)

* fix(iot-svc): update debug assert

* Reduce modules in ModulesClient_GetModulesOnDevice to 2
Consolidate keyvault writes, and fix error about null (#2266)
0582733
Cleanup code in Hub RTAC (#2268)
4de5519
@azabbasi
fix(deviceClient): Fix issue with AMQP connection pool and TokenRefer…
8f9d565 
…esher disposal. (#2260)

* Fix issue with AMQP connection pool

* Dispose the connection holder appropriately

* Add unit testing capability to connection pool
Move more LA steps under conditional (#2270)
f8b92fc
Disable import/export of config until bug fix (#2273)
823fbec
@dylanbulfinMS
Adding RBAC support for provisioning SDK (#2262)
7a26eda 
* Added types for different credentials

* Altered code to work with new types

* Fixed Managers

* removed unneeded #if !NET451

* Filled in method summaries

* refactored GetHeaderProvider

* Added documentation

* Formatting fixes to address comments
@jamdavi
Adding Common 0.7.1 (#2272)
7508dd2
Fix doc comment list bullets (#2275)
49e0854 
* Fix doc comment list bullets

* Change to use description tag
@jamdavi
sdl(all): Create SBOM for net packages (#2261)
f811e08
Streamline an RBAC test (#2274)
f072c94
Exclude low pri .net targets in PR builds (#2277)
1229b72
@azabbasi
Update IDeviceIdentity interface to add doc comments. (#2282)
cbbad60
Fix remaining doc comment bullets (#2285)
313d885
Give e2e appId permission on the DPS instance (#2283)
65749c2
@azabbasi
fix(DeviceClient): Avoid NRE after client dispose (#2286)
f114662
@azabbasi
Revert "Adding RBAC support for provisioning SDK (#2262)" (#2289)
5e522cd 
This reverts commit 7a26eda.
@azabbasi
Version bump for 2021-01-26 release (#2291)
6cce47a
Update service clients instantiation doc comments (#2290)
5a05eb3 
* Update RegistryManager instantiation doc comments

* Update other service client doc comments.
Fix class field constants casing (#2292)
d20e5bd
Disable checks for config in import e2e test (#2293)
89f83b9
Update iteration path in vsts.yaml (#2296)
e4ef736
@abhipsaMisra
fix(iot-device): Update QoS settings to AtLeastOnce for mqtt layer su…
3beea8a 
…bscriptions
jamdavi and others added 3 commits February 15, 2022 10:13
@jamdavi
Update CODEOWNERS (#2304)
a9841c6
Update to Azure.Core 1.22.0 to update dependency on System.Text.Encod… (
ea504ae 
#2309)

* Update to Azure.Core 1.22.0 to update dependency on System.Text.Encodings.Web

* Update readme.md typo

* Update readme.md for patch 4 of latest LTS
@dylanbulfinMS
Merge branch 'main' into dbulfin/preview
e861cb4
@dylanbulfinMS
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@dylanbulfinMS
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

drwill-ms
drwill-ms suggested changes Mar 2, 2022
View reviewed changes
Copy link
Contributor

@drwill-ms drwill-ms left a comment

Choose a reason for hiding this comment

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

The only changes we should be seeing are those you've made in your feature branch.

Also, the feature branch should be named more specifically, like previews/dps-rbac.

@dylanbulfinMS
Copy link
Contributor Author

dylanbulfinMS commented Mar 2, 2022 •
edited
Loading

The only changes we should be seeing are those you've made in your feature branch.

Also, the feature branch should be named more specifically, like previews/dps-rbac.

This PR is meant to be the one updating preview from master, not to merge my feature branch into preview

@abhipsaMisra
Copy link
Member

As a part of previews/feature to preview merge, we perform the following steps:

  1. Bring changes from main to previews/feature

Checkout a branch from previews/feature branch
Git merge main
Resolve conflicts
Send a PR
Create a merge commit to previews/feature branch

  1. Bring changes from main to preview

Checkout a branch from preview branch
Git merge main
Resolve conflicts
Send a PR
Create a merge commit to preview branch

  1. Bring previews/feature into preview

Git checkout preview
Git checkout -b /featureToPreview
Git merge feature
Git push --set-upstream origin /featureToPreview
PR comparing /featureToPreview and preview
Squash and merge

1 can be treated as optional. It is recommended when the previews/feature branch is expected to hang around for a while and might benefit from the updates being made in main.

If I'm not mistaken, this PR is meant to address (2). Is that correct @dylanbulfinMS ?

@dylanbulfinMS dylanbulfinMS merged commit b1caf77 into preview Mar 2, 2022
@dylanbulfinMS dylanbulfinMS deleted the dbulfin/preview branch March 2, 2022 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drwill-ms drwill-ms drwill-ms approved these changes

@timtay-microsoft timtay-microsoft Awaiting requested review from timtay-microsoft

@abhipsaMisra abhipsaMisra Awaiting requested review from abhipsaMisra

@azabbasi azabbasi Awaiting requested review from azabbasi

@andyk-ms andyk-ms Awaiting requested review from andyk-ms

@brycewang-microsoft brycewang-microsoft Awaiting requested review from brycewang-microsoft

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dylanbulfinMS @abhipsaMisra @drwill-ms @jamdavi @azabbasi