Skip to content

Commit 72c18a8

Browse files
authored
Merge pull request #44548 from dotnet/main
Merge main into live
2 parents 1c1b72e + f255580 commit 72c18a8

File tree

16 files changed

+79
-34
lines changed

16 files changed

+79
-34
lines changed

.github/workflows/live-protection.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ permissions:
44
contents: read
55

66
jobs:
7-
comment:
7+
live_protection_job:
8+
name: Prevent unintended merge to live
89
runs-on: ubuntu-latest
910
steps:
1011
- name: Harden Runner
@@ -14,14 +15,14 @@ jobs:
1415

1516
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
1617
env:
17-
SHOULD_COMMENT: ${{ github.base_ref == 'refs/heads/live' && !(github.event.issue.user.login == 'cxwtool' || github.head_ref == 'refs/heads/main') }}
18+
SHOULD_COMMENT: ${{ github.base_ref == 'live' && github.head_ref != 'main' }}
1819
with:
1920
script: |
2021
if (process.env.SHOULD_COMMENT == 'true') {
2122
github.issues.createComment({
2223
issue_number: context.issue.number,
2324
owner: context.repo.owner,
2425
repo: context.repo.repo,
25-
body: 'It looks like this pull request may have been opened on the `live` branch by mistake. In general, PRs should target the `main` branch.'
26+
body: 'It looks like this pull request was opened on the `live` branch by mistake. In general, PRs should target the `main` branch.'
2627
})
2728
}

docs/azure/includes/dotnet-all.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
| Resource Management - API Center | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.ApiCenter/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.ApiCenter-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ApiCenter_1.0.0-beta.2/sdk/apicenter/Azure.ResourceManager.ApiCenter/) |
167167
| Resource Management - API Management | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.ApiManagement/1.2.0)<br>NuGet [1.3.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.ApiManagement/1.3.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ApiManagement-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ApiManagement_1.2.0/sdk/apimanagement/Azure.ResourceManager.ApiManagement/)<br>GitHub [1.3.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ApiManagement_1.3.0-beta.1/sdk/apimanagement/Azure.ResourceManager.ApiManagement/) |
168168
| Resource Management - App Compliance Automation | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.AppComplianceAutomation/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.AppComplianceAutomation-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppComplianceAutomation_1.0.0/sdk/appcomplianceautomation/Azure.ResourceManager.AppComplianceAutomation/) |
169-
| Resource Management - App Configuration | NuGet [1.3.2](https://www.nuget.org/packages/Azure.ResourceManager.AppConfiguration/1.3.2) | [docs](/dotnet/api/overview/azure/ResourceManager.AppConfiguration-readme) | GitHub [1.3.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppConfiguration_1.3.2/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/) |
169+
| Resource Management - App Configuration | NuGet [1.4.0](https://www.nuget.org/packages/Azure.ResourceManager.AppConfiguration/1.4.0) | [docs](/dotnet/api/overview/azure/ResourceManager.AppConfiguration-readme) | GitHub [1.4.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppConfiguration_1.4.0/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/) |
170170
| Resource Management - App Platform | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.AppPlatform/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.AppPlatform-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppPlatform_1.1.1/sdk/appplatform/Azure.ResourceManager.AppPlatform/) |
171171
| Resource Management - App Service | NuGet [1.3.0](https://www.nuget.org/packages/Azure.ResourceManager.AppService/1.3.0) | [docs](/dotnet/api/overview/azure/ResourceManager.AppService-readme) | GitHub [1.3.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppService_1.3.0/sdk/websites/Azure.ResourceManager.AppService/) |
172172
| Resource Management - Application Insights | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.ApplicationInsights/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.ApplicationInsights-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ApplicationInsights_1.0.0/sdk/applicationinsights/Azure.ResourceManager.ApplicationInsights/) |
@@ -189,7 +189,7 @@
189189
| Resource Management - Communication | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.Communication/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Communication-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Communication_1.2.0/sdk/communication/Azure.ResourceManager.Communication/) |
190190
| Resource Management - Compute | NuGet [1.7.0](https://www.nuget.org/packages/Azure.ResourceManager.Compute/1.7.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Compute-readme) | GitHub [1.7.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Compute_1.7.0/sdk/compute/Azure.ResourceManager.Compute/) |
191191
| Resource Management - Computefleet | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.ComputeFleet/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.ComputeFleet-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ComputeFleet_1.0.0/sdk/computefleet/Azure.ResourceManager.ComputeFleet/) |
192-
| Resource Management - Computeschedule | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.ComputeSchedule/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ComputeSchedule-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ComputeSchedule_1.0.0-beta.1/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/) |
192+
| Resource Management - Computeschedule | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.ComputeSchedule/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.ComputeSchedule-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ComputeSchedule_1.0.0/sdk/computeschedule/Azure.ResourceManager.ComputeSchedule/) |
193193
| Resource Management - Confidential Ledger | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.ConfidentialLedger/1.0.1)<br>NuGet [1.1.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.ConfidentialLedger/1.1.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.ConfidentialLedger-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ConfidentialLedger_1.0.1/sdk/confidentialledger/Azure.ResourceManager.ConfidentialLedger/)<br>GitHub [1.1.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ConfidentialLedger_1.1.0-beta.4/sdk/confidentialledger/Azure.ResourceManager.ConfidentialLedger/) |
194194
| Resource Management - Confluent | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.Confluent/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Confluent-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Confluent_1.2.0/sdk/confluent/Azure.ResourceManager.Confluent/) |
195195
| Resource Management - Connected VMware vSphere | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.ConnectedVMwarevSphere/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.ConnectedVMwarevSphere-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ConnectedVMwarevSphere_1.1.0/sdk/connectedvmwarevsphere/Azure.ResourceManager.ConnectedVMwarevSphere/) |
@@ -221,7 +221,7 @@
221221
| Resource Management - Dev Center | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.DevCenter/1.0.1) | [docs](/dotnet/api/overview/azure/ResourceManager.DevCenter-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DevCenter_1.0.1/sdk/devcenter/Azure.ResourceManager.DevCenter/) |
222222
| Resource Management - Dev Spaces | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.DevSpaces/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.DevSpaces-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DevSpaces_1.0.0-beta.4/sdk/devspaces/Azure.ResourceManager.DevSpaces/) |
223223
| Resource Management - Device Provisioning Services | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.DeviceProvisioningServices/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.DeviceProvisioningServices-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DeviceProvisioningServices_1.2.0/sdk/deviceprovisioningservices/Azure.ResourceManager.DeviceProvisioningServices/) |
224-
| Resource Management - Device Registry | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.DeviceRegistry/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.DeviceRegistry-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DeviceRegistry_1.0.0-beta.1/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/) |
224+
| Resource Management - Device Registry | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.DeviceRegistry/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.DeviceRegistry-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DeviceRegistry_1.0.0-beta.2/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/) |
225225
| Resource Management - Device Update | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.DeviceUpdate/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.DeviceUpdate-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DeviceUpdate_1.0.0/sdk/deviceupdate/Azure.ResourceManager.DeviceUpdate/) |
226226
| Resource Management - DevOps Infrastructure | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.DevOpsInfrastructure/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.DevOpsInfrastructure-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DevOpsInfrastructure_1.0.0-beta.1/sdk/devopsinfrastructure/Azure.ResourceManager.DevOpsInfrastructure/) |
227227
| Resource Management - DevTest Labs | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.DevTestLabs/1.1.1) | [docs](/dotnet/api/overview/azure/ResourceManager.DevTestLabs-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.DevTestLabs_1.1.1/sdk/devtestlabs/Azure.ResourceManager.DevTestLabs/) |
@@ -257,6 +257,7 @@
257257
| Resource Management - IoT Central | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.IotCentral/1.0.1)<br>NuGet [1.1.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.IotCentral/1.1.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.IotCentral-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotCentral_1.0.1/sdk/iotcentral/Azure.ResourceManager.IotCentral/)<br>GitHub [1.1.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotCentral_1.1.0-beta.2/sdk/iotcentral/Azure.ResourceManager.IotCentral/) |
258258
| Resource Management - IoT Firmware Defense | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.IotFirmwareDefense/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.IotFirmwareDefense-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotFirmwareDefense_1.0.0/sdk/iot/Azure.ResourceManager.IotFirmwareDefense/) |
259259
| Resource Management - IoT Hub | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.IotHub/1.1.1)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.IotHub/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.IotHub-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotHub_1.1.1/sdk/iothub/Azure.ResourceManager.IotHub/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotHub_1.2.0-beta.1/sdk/iothub/Azure.ResourceManager.IotHub/) |
260+
| Resource Management - Iotoperations | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.IotOperations/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.IotOperations-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotOperations_1.0.0/sdk/iotoperations/Azure.ResourceManager.IotOperations/) |
260261
| Resource Management - Key Vault | NuGet [1.3.0](https://www.nuget.org/packages/Azure.ResourceManager.KeyVault/1.3.0) | [docs](/dotnet/api/overview/azure/ResourceManager.KeyVault-readme) | GitHub [1.3.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.KeyVault_1.3.0/sdk/keyvault/Azure.ResourceManager.KeyVault/) |
261262
| Resource Management - Kubernetes Configuration | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.KubernetesConfiguration/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.KubernetesConfiguration-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.KubernetesConfiguration_1.2.0/sdk/kubernetesconfiguration/Azure.ResourceManager.KubernetesConfiguration/) |
262263
| Resource Management - Kusto | NuGet [1.6.0](https://www.nuget.org/packages/Azure.ResourceManager.Kusto/1.6.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Kusto-readme) | GitHub [1.6.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Kusto_1.6.0/sdk/kusto/Azure.ResourceManager.Kusto/) |

0 commit comments

Comments
 (0)