Skip to content

Commit

Permalink
merging master
Browse files Browse the repository at this point in the history
  • Loading branch information
achauhan-scc committed Sep 2, 2024
2 parents 1be8cb7 + 3f8cf30 commit a879970
Show file tree
Hide file tree
Showing 1,791 changed files with 117,487 additions and 7,827 deletions.
21 changes: 21 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,9 @@
# ServiceLabel: %Monitor - Exporter
# ServiceOwners: @cijothomas @reyang @rajkumar-rangaraj @TimothyMothra @vishweshbankwar

# PRLabel: %Monitor - LiveMetrics
/sdk/monitor/Azure.Monitor.OpenTelemetry.LiveMetrics/ @cijothomas @reyang @rajkumar-rangaraj @TimothyMothra @vishweshbankwar @xiang17

# ServiceLabel: %Monitor - LiveMetrics
# ServiceOwners: @cijothomas @reyang @rajkumar-rangaraj @TimothyMothra @vishweshbankwar @xiang17

Expand All @@ -674,6 +677,12 @@
# PRLabel: %Mixed Reality
/sdk/objectanchors/ @crtreasu @rgarcia @JoshLove-msft

# PRLabel: %Remote Rendering
/sdk/remoterendering/ @FlorianBorn71 @MichaelZp0 @ChristopherManthei

#ServiceLabel: %Remote Rendering
#ServiceOwners: @FlorianBorn71 @MichaelZp0 @ChristopherManthei

# ServiceLabel: %Mixed Reality
# ServiceOwners: @crtreasu @rgarcia

Expand Down Expand Up @@ -1000,6 +1009,12 @@
# ServiceLabel: %Network - Mobile %Mgmt
# ServiceOwners: @ArthurMa1978

# PRLabel: %Network - Cloud
/sdk/networkcloud/Azure.ResourceManager.*/ @Azure/azure-sdk-write-networkcloud

# ServiceLabel: %Network - Cloud %Mgmt
# ServiceOwners: @Azure/azure-sdk-write-networkcloud

# PRLabel: %New Relic
/sdk/newrelicobservability/Azure.ResourceManager.*/ @dipeshbhakat-microsoft @vipray-ms

Expand Down Expand Up @@ -1043,6 +1058,12 @@
# ServiceLabel: %Spring App Discovery %Mgmt
# ServiceOwners: @sunkun99

# PRLabel: %Compute - Fleet
/sdk/computefleet/ @sahilarora92 @dhruvil009

# ServiceLabel: %Compute - Fleet
# ServiceOwners: @sahilarora92 @dhruvil009

# ######## Eng Sys ########
/eng/ @hallipr @weshaggard @benbp
/eng/common/ @Azure/azure-sdk-eng
Expand Down
8 changes: 8 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,14 @@
"Nvme"
]
},
{
"filename": "**/sdk/computefleet/**/*.cs",
"words": [
"mbps",
"unattend",
"nvme"
]
},
{
"filename": "**/sdk/confidentialledger/**/*.cs",
"words": [
Expand Down
1 change: 1 addition & 0 deletions eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ known_content_issues:
- ['sdk/storage/Azure.Storage.Common/README.md','azure-sdk-tools/issues/404']
- ['sdk/textanalytics/Azure.AI.TextAnalytics.Legacy.Shared/README.md','https://github.com/Azure/azure-sdk-tools/issues/404']
- ['sdk/webpubsub/Azure.Messaging.WebPubSub/README.md', 'azure-sdk-tools/issues/404 - requires different name for auth section']
- ['sdk/monitor/Azure.Monitor.OpenTelemetry.LiveMetrics/README.md', 'Opt out of sections: https://github.com/Azure/azure-sdk-tools/issues/404']

- ['sdk/anomalydetector/Azure.AI.AnomalyDetector/README.md', '#25936: Needs Examples']
- ['sdk/personalizer/Azure.AI.Personalizer/README.md','#24535: Needs content']
Expand Down
8 changes: 4 additions & 4 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<PackageReference Update="System.Security.Cryptography.Cose" Version="7.0.0" />
<PackageReference Update="System.Threading.Channels" Version="6.0.0" />
<PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Update="System.Text.Json" Version="4.7.2" />
<PackageReference Update="System.Text.Json" Version="6.0.9" />
<PackageReference Update="System.Text.Encodings.Web" Version="6.0.0" />
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
Expand Down Expand Up @@ -129,7 +129,7 @@
<PackageReference Update="Azure.Storage.Queues" Version="12.19.1" />
<PackageReference Update="Azure.Storage.Files.Shares" Version="12.19.1" />
<PackageReference Update="Azure.AI.OpenAI" Version="2.0.0-beta.1" />
<PackageReference Update="Azure.ResourceManager" Version="1.12.0" />
<PackageReference Update="Azure.ResourceManager" Version="1.13.0" />
<PackageReference Update="Azure.ResourceManager.AppConfiguration" Version="1.3.2" />
<PackageReference Update="Azure.ResourceManager.ApplicationInsights" Version="1.0.0" />
<PackageReference Update="Azure.ResourceManager.Authorization" Version="1.1.3" />
Expand Down Expand Up @@ -227,7 +227,7 @@
All should have PrivateAssets="All" set so they don't become package dependencies
-->
<ItemGroup>
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20240818.1" PrivateAssets="All" />
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20240828.1" PrivateAssets="All" />
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20240813.2" PrivateAssets="All" />
<PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="All" />
Expand Down Expand Up @@ -388,7 +388,7 @@
</ItemGroup>

<PropertyGroup>
<TestProxyVersion>1.0.0-dev.20240806.1</TestProxyVersion>
<TestProxyVersion>1.0.0-dev.20240823.1</TestProxyVersion>
</PropertyGroup>

</Project>
46 changes: 46 additions & 0 deletions eng/common/pipelines/templates/steps/save-package-properties.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
parameters:
- name: ServiceDirectory
type: string
default: ""
- name: DiffDirectory
type: string
default: $(Build.ArtifactStagingDirectory)/diff
- name: PackageInfoDirectory
type: string
default: $(Build.ArtifactStagingDirectory)/PackageInfo
- name: TargetPath
type: string
default: $(Build.SourcesDirectory)
- name: ScriptDirectory
type: string
default: eng/common/scripts

steps:
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
- task: Powershell@2
displayName: Generate PR Diff
inputs:
filePath: ${{ parameters.ScriptDirectory }}/Generate-PR-Diff.ps1
arguments: >
-TargetPath '${{ parameters.TargetPath }}'
-ArtifactPath '${{ parameters.DiffDirectory }}'
pwsh: true

- task: Powershell@2
displayName: Save package properties filtered for PR
inputs:
filePath: ${{ parameters.ScriptDirectory }}/Save-Package-Properties.ps1
arguments: >
-PrDiff '${{ parameters.DiffDirectory }}/diff.json'
-OutDirectory '${{ parameters.PackageInfoDirectory }}'
pwsh: true
- ${{ else }}:
- task: Powershell@2
displayName: Save package properties
inputs:
filePath: ${{ parameters.ScriptDirectory }}/Save-Package-Properties.ps1
arguments: >
-ServiceDirectory '${{parameters.ServiceDirectory}}'
-OutDirectory '${{ parameters.PackageInfoDirectory }}'
-AddDevVersion:$${{ eq(variables['SetDevVersion'],'true') }}
pwsh: true
36 changes: 21 additions & 15 deletions eng/common/scripts/Generate-PR-Diff.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,29 @@ The path under which changes will be detected.
#>
[CmdletBinding()]
Param (
[Parameter(Mandatory=$True)]
[Parameter(Mandatory = $True)]
[string] $ArtifactPath,
[Parameter(Mandatory=$True)]
[Parameter(Mandatory = $True)]
[string] $TargetPath
)

. (Join-Path $PSScriptRoot "Helpers" "git-helpers.ps1")

function Get-ChangedServices {
Param (
[Parameter(Mandatory=$True)]
[string[]] $ChangedFiles
)
function Get-ChangedServices
{
Param (
[Parameter(Mandatory = $True)]
[string[]] $ChangedFiles
)

$changedServices = $ChangedFiles | Foreach-Object { if ($_ -match "sdk/([^/]+)") { $matches[1] } } | Sort-Object -Unique
$changedServices = $ChangedFiles | Foreach-Object { if ($_ -match "sdk/([^/]+)") { $matches[1] } } | Sort-Object -Unique

return $changedServices
return $changedServices
}

if (!(Test-Path $ArtifactPath)) {
New-Item -ItemType Directory -Path $ArtifactPath | Out-Null
if (!(Test-Path $ArtifactPath))
{
New-Item -ItemType Directory -Path $ArtifactPath | Out-Null
}

$ArtifactPath = Resolve-Path $ArtifactPath
Expand All @@ -43,9 +45,13 @@ $changedFiles = Get-ChangedFiles -DiffPath $TargetPath
$changedServices = Get-ChangedServices -ChangedFiles $changedFiles

$result = [PSCustomObject]@{
"ChangedFiles" = $changedFiles
"ChangedServices" = $changedServices
"PRNumber" = if ($env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER) { $env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER } else { "-1" }
"ChangedFiles" = $changedFiles
"ChangedServices" = $changedServices
"PRNumber" = if ($env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER) { $env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER } else { "-1" }
}

$result | ConvertTo-Json | Out-File $ArtifactName
$json = $result | ConvertTo-Json
$json | Out-File $ArtifactName

Write-Host "`nGenerated diff.json file at $ArtifactName"
Write-Host " $($json -replace "`n", "`n ")"
21 changes: 14 additions & 7 deletions eng/common/scripts/Package-Properties.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class PackageProps
[boolean]$IsNewSdk
[string]$ArtifactName
[string]$ReleaseStatus
[string[]]$DependentPackages
[string[]]$AdditionalValidationPackages

PackageProps([string]$name, [string]$version, [string]$directoryPath, [string]$serviceDirectory)
{
Expand Down Expand Up @@ -113,7 +113,7 @@ function Get-PrPkgProperties([string]$InputDiffJson) {
$diff = Get-Content $InputDiffJson | ConvertFrom-Json
$targetedFiles = $diff.ChangedFiles

$dependentPackagesForInclusion = @()
$additionalValidationPackages = @()
$lookup = @{}

foreach ($pkg in $allPackageProperties)
Expand All @@ -129,19 +129,26 @@ function Get-PrPkgProperties([string]$InputDiffJson) {
if ($shouldInclude) {
$packagesWithChanges += $pkg

if ($pkg.DependentPackages) {
$dependentPackagesForInclusion += $pkg.DependentPackages
if ($pkg.AdditionalValidationPackages) {
$additionalValidationPackages += $pkg.AdditionalValidationPackages
}
}
}
}

foreach ($addition in $dependentPackagesForInclusion) {
if ($lookup[$addition]) {
$packagesWithChanges += $lookup[$addition]
foreach ($addition in $additionalValidationPackages) {
$key = $addition.Replace($RepoRoot, "").SubString(1)

if ($lookup[$key]) {
$packagesWithChanges += $lookup[$key]
}
}

if ($AdditionalValidationPackagesFromPackageSetFn -and (Test-Path "Function:$AdditionalValidationPackagesFromPackageSetFn"))
{
$packagesWithChanges += &$AdditionalValidationPackagesFromPackageSetFn $packagesWithChanges $diff
}

return $packagesWithChanges
}

Expand Down
Loading

0 comments on commit a879970

Please sign in to comment.