Skip to content

Commit 836101e

Browse files
Merge branch 'main' into main
2 parents fffd971 + eb9d036 commit 836101e

File tree

301 files changed

+17687
-938
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

301 files changed

+17687
-938
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@
771771
# ServiceOwners: @sunilagarwal @lfittl-msft @sr-msft @niklarin
772772

773773
# PRLabel: %Provisioning
774-
/sdk/provisioning/ @JoshLove-msft @tg-msft
774+
/sdk/provisioning/ @JoshLove-msft @tg-msft @christothes @KrzysztofCwalina
775775

776776
# ServiceLabel: %Provisioning
777777
# AzureSdkOwners: @JoshLove-msft
@@ -967,6 +967,12 @@
967967
# PRLabel: %Communication - Resource Manager
968968
/sdk/communication/Azure.ResourceManager.Communication/ @archerzz @ArcturusZhang @ArthurMa1978
969969

970+
# PRLael: %Container Orchestrator Runtime
971+
/sdk/containerorchestratorruntime/Azure.ResourceManager.*/ @HE-Xinyu @ddadaal
972+
973+
# ServiceLabel: %Container Orchestrator Runtime
974+
# ServiceOwners: @HE-Xinyu @ddadaal
975+
970976
# PRLabel: %Device Registry
971977
/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/ @davidemontanari @atastrophic @marcodalessandro @rohankhandelwal @riteshrao
972978

eng/Packages.Data.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
All should have PrivateAssets="All" set so they don't become package dependencies
229229
-->
230230
<ItemGroup>
231-
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20241010.1" PrivateAssets="All" />
231+
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20241017.1" PrivateAssets="All" />
232232
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20240813.2" PrivateAssets="All" />
233233
<PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
234234
<PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="All" />

eng/common/pipelines/templates/steps/save-package-properties.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ parameters:
1616
default: eng/common/scripts
1717

1818
steps:
19-
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
19+
# There will be transitory period for every language repo where the <language> - pullrequest build definition will run
20+
# alongside the <language> - <service> - ci definitions. These pullrequest build definitions will have the ServiceDirectory parameter
21+
# set to 'auto', which will allow the expanding and contracting based on PR Diff.
22+
23+
# The other public CI builds will pass a real service directory, which will not activate the PR diff logic and as such will operate
24+
# as before this change.
25+
- ${{ if and(eq(variables['Build.Reason'], 'PullRequest'), eq(parameters.ServiceDirectory, 'auto')) }}:
2026
- task: Powershell@2
2127
displayName: Generate PR Diff
2228
inputs:

eng/common/scripts/Helpers/Service-Level-Readme-Automation-Helpers.ps1

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,17 @@ function create-service-readme(
1111
$readmePath = Join-Path $readmeFolder -ChildPath $readmeName
1212
$content = ""
1313
if (Test-Path (Join-Path $readmeFolder -ChildPath $indexTableLink)) {
14+
# Escape the close parentheses in the URL. This is required by docs
15+
# https://github.com/Azure/azure-sdk-tools/issues/5433
16+
# This line looks incorrect but the left parameter is a regex and must
17+
# escape the parentheses. The right is a literal string and, since this is
18+
# PowerShell, the backslash does not itself need to be escaped.
19+
20+
# Example: "filename-with-(parens).md" -> "filename-with-(parens\).md"
21+
$escapedIndexTableLink = $indexTableLink -replace '\)', '\)'
22+
1423
$content = "## Packages - $moniker`r`n"
15-
$content += "[!INCLUDE [packages]($indexTableLink)]"
24+
$content += "[!INCLUDE [packages]($escapedIndexTableLink)]"
1625
}
1726
if (!$content) {
1827
LogError "There are no packages under service '$serviceName'. "
@@ -101,15 +110,15 @@ function generate-service-level-readme(
101110
$readmeFolder = "$docRepoLocation/$pathPrefix/$moniker/"
102111
$serviceReadme = "$readmeBaseName.md"
103112
$indexReadme = "$readmeBaseName-index.md"
104-
113+
105114
if ($packageInfos) {
106115
generate-markdown-table `
107116
-readmeFolder $readmeFolder `
108117
-readmeName $indexReadme `
109118
-packageInfos $packageInfos `
110-
-moniker $moniker
119+
-moniker $moniker
111120
}
112-
121+
113122
if (!(Test-Path "$readmeFolder$serviceReadme") -and $packageInfos) {
114123
create-service-readme `
115124
-readmeFolder $readmeFolder `

0 commit comments

Comments
 (0)