Merge master into feature/iot_pnp #1520
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This also adds previously-required parameters back into @PSBoundParameters to pass down to pre- and post-scripts. Co-authored-by: Heath Stewart <heaths@microsoft.com>
* Update subscription configuration schema to include new parameters * Support platform specific arm template parameters and legacy hashtable format * Update arm template parameter comment to include top level key * Restore AdditionalParameters. Merge ArmTemplateParameters from stringified hash literal * Handle duplicate keys more explicitly for arm and env vars * Regenerate New-TestResources.ps1 markdown * revert variable name to environmentVariables to fix post-scripts * Handle empty arm template parameters better * Remove arm template parameter merge logic from deploy template * Add merge hashes function to New-TestResources.ps1 * Add merge hashes function to New-TestResources.ps1 * Add env variable overwrite warning. Use ContainsKey checks * Temporarily manually fix invalid generated markdown links Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
* Refactor eng/common/README.md * Add doc directory Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>
Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>
* Add debug flag to arm deployment command * Only set debug preference when $CI is true Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
* Added the preprocess scripts. * string array to string Co-authored-by: Sima Zhu <sizhu@microsoft.com>
…lds (Azure#1474) Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>
Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
* adding notes about security on readme file * Update sdk/samples/iot/docs/how_to_iot_hub_esp8266_nodemcu.md Co-authored-by: Mollie Munoz <mollie.munoz@microsoft.com> * Update sdk/samples/iot/docs/how_to_iot_hub_esp8266_nodemcu.md Co-authored-by: Ahson Khan <ahson_ahmedk@yahoo.com> * Update sdk/samples/iot/docs/how_to_iot_hub_esp8266_nodemcu.md Co-authored-by: Ahson Khan <ahson_ahmedk@yahoo.com> * Update sdk/samples/iot/docs/how_to_iot_hub_esp8266_nodemcu.md Co-authored-by: Mollie Munoz <mollie.munoz@microsoft.com> * Update sdk/samples/iot/docs/how_to_iot_hub_esp8266_nodemcu.md Co-authored-by: Ahson Khan <ahson_ahmedk@yahoo.com> * Update sdk/samples/iot/docs/how_to_iot_hub_esp8266_nodemcu.md Co-authored-by: Mollie Munoz <mollie.munoz@microsoft.com> * Update how_to_iot_hub_esp8266_nodemcu.md * Update sdk/samples/iot/docs/how_to_iot_hub_esp8266_nodemcu.md Co-authored-by: Eric Wolz <ericwol@microsoft.com> * Update sdk/samples/iot/docs/how_to_iot_hub_esp8266_nodemcu.md Co-authored-by: Eric Wolz <ericwol@microsoft.com> * Update sdk/samples/iot/docs/how_to_iot_hub_esp8266_nodemcu.md Co-authored-by: Eric Wolz <ericwol@microsoft.com> Co-authored-by: Mollie Munoz <mollie.munoz@microsoft.com> Co-authored-by: Ahson Khan <ahson_ahmedk@yahoo.com> Co-authored-by: Eric Wolz <ericwol@microsoft.com>
* Add debugging link on resource deployment failures to log output * Update aka link for live test help docs. Use here string and empty throw. Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
* Improve Update-ChangeLog Logic * Updates to ChangeLog-Operations.ps1, copy-docs-to-blobstorage.ps1, Invoke-GitHubAPI.ps1 and Package-Properties.ps1 * More changeLog Logic Improvements * Update date parsing Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>
…ark the value as const as well. (Azure#1261)" (Azure#1517) This reverts commit 5723678.
…f the SDK (Azure#1495) * Update AddAzureSDKforC.cmake to reference the latest release of the SDK * Remove pnp from the tag being referenced.
…the feature branch (Azure#1506)
danewalton
requested review from
antkmsft,
CIPop,
danieljurek,
ericwolz and
ewertons
as code owners
danewalton
requested review from
hihigupt,
joshfree,
jspaith,
momuno,
RickWinter,
vhvb1989 and
a team
as code owners
ericwolz
approved these changes
Nov 16, 2020
ahsonkhan
reviewed
Nov 16, 2020
| @@ -1,7 +1,19 @@ | |||
| # Release History | |||
|
|
|||
| ## 1.1.0-beta.3 (Unreleased) | |||
| ## 1.1.0-beta.4 (Unreleased) | |||
There was a problem hiding this comment.
We don't want to bump this version. .3 in the feature branch was correct. @weshaggard - what do you suggest we do here?
The workflow in this feature branch includes frequent pull/merge from master. Should we limit those to only prior to a beta release?
There was a problem hiding this comment.
Unfortunately there isn't any magic solution here you will just have to carefully watch the versions of the components that you plan to potentially ship in the feature branch and ensure the version matches that versioning plan.
I would suggest you take pretty frequent changes as we don't want a big surprise late in the process if the merge has any issues.
ahsonkhan
reviewed
Nov 17, 2020
Comment on lines
+8
to
+16
| ### Bug Fixes | ||
|
|
||
| - [[#1472]](https://github.com/Azure/azure-sdk-for-c/pull/1472) Fix `az_iot_message_properties_next()` when the buffer in which the properties were kept was bigger than the length of characters in the buffer. | ||
|
|
||
| ### Other Changes and Improvements | ||
|
|
||
| - [[#1473]](https://github.com/Azure/azure-sdk-for-c/pull/1473) Add remove server certificate validation on paho and ESP8266 samples. | ||
| - [[#1449]](https://github.com/Azure/azure-sdk-for-c/pull/1449) Add basic reconnection capability for the ESP8266 sample. | ||
| - [[#1490]](https://github.com/Azure/azure-sdk-for-c/pull/1490) Fix static analyzer flagging of non-checked return value in `az_iot_hub_client_c2d_parse_received_topic()`. |
There was a problem hiding this comment.
@danewalton These Changelog changes are incorrect and duplicated from the beta.2 release below.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This needs a little patchwork on the iot sample readme which I have in another branch. Will send after this PR to keep this on topic.