Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into Use-WriteCore-conta…
Browse files Browse the repository at this point in the history
…inerservice
  • Loading branch information
melina5656 committed Oct 12, 2024
2 parents 40c41d1 + e79e2b0 commit a741370
Show file tree
Hide file tree
Showing 7,201 changed files with 140,458 additions and 85,389 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
26 changes: 16 additions & 10 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -562,10 +562,10 @@
# ServiceOwners: @Azure/azure-iot-cli-triage

# PRLabel: %KeyVault
/sdk/keyvault/ @heaths @schaabs @JonathanCrd @jsquire @christothes
/sdk/keyvault/ @schaabs @JonathanCrd @jsquire @christothes

# ServiceLabel: %KeyVault
# AzureSdkOwners: @heaths
# AzureSdkOwners: @JonathanCrd
# ServiceOwners: @RandalliLama @jlichwa

# ServiceLabel: %Kubernetes Configuration
Expand Down Expand Up @@ -605,9 +605,9 @@
# ServiceOwners: @Lighthouse-Azure

# PRLabel: %Maps
/sdk/maps/ @dubiety @jecmenicanikola
/sdk/maps/ @dubiety
# ServiceLabel: %Maps
# ServiceOwners: @dubiety @jecmenicanikola
# ServiceOwners: @dubiety

# ServiceLabel: %MariaDB
# ServiceOwners: @ajlam @ambhatna @kummanish
Expand All @@ -628,7 +628,7 @@
# ServiceOwners: @kpiteira

# PRLabel: %Monitor
/sdk/monitor/ci.yml @nisha-bhatia @JoshLove-msft @Azure/azure-sdk-write-monitor-data-plane
/sdk/monitor/* @nisha-bhatia @JoshLove-msft @Azure/azure-sdk-write-monitor-data-plane

# PRLabel: %Monitor
/sdk/monitor/Azure.Monitor.Ingestion/ @nisha-bhatia @JoshLove-msft @Azure/azure-sdk-write-monitor-data-plane
Expand Down Expand Up @@ -723,7 +723,7 @@
# ServiceOwners: @netwatchsuppgithub

# PRLabel: %Network - DNS
/sdk/dns*/ @dnssuppgithub
/sdk/dns/ @dnssuppgithub

# ServiceLabel: %Network - DNS
# ServiceOwnerS: @dnssuppgithub
Expand Down Expand Up @@ -756,10 +756,10 @@
# ServiceOwners: @rhurey @dargilco

# PRLabel: %Microsoft Playwright Testing
/sdk/playwrighttesting/ @shreyaanand @mjmadhu
/sdk/playwrighttesting/ @Sid200026 @puagarwa @ShreyaAnand

# ServiceLabel: %Microsoft Playwright Testing
# ServiceOwners: @shreyaanand @mjmadhu
# ServiceOwners: @Sid200026 @puagarwa @ShreyaAnand

# ServiceLabel: %Policy
# ServiceOwners: @aperezcloud @kenieva
Expand Down Expand Up @@ -840,10 +840,10 @@
# ServiceOwners: @hmlam

# PRLabel: %SignalR
/sdk/signalr/ @sffamily @chenkennt @Y-Sindo
/sdk/signalr/ @chenkennt @vicancy @JialinXin @Y-Sindo

# ServiceLabel: %SignalR
# ServiceOwners: @sffamily @chenkennt @Y-Sindo
# ServiceOwners: @sffamily @chenkennt @vicancy @JialinXin @Y-Sindo

# ServiceLabel: %SQL
# ServiceOwners: @azureSQLGitHub
Expand Down Expand Up @@ -1015,6 +1015,12 @@
# ServiceLabel: %Network - Mobile %Mgmt
# ServiceOwners: @ArthurMa1978

# PRLabel: %Network - DNS Private Resolver
/sdk/dnsresolver/Azure.ResourceManager.*/ @jamesvoongms @jotrivet

# ServiceLabel: %Network - DNS Private Resolver %Mgmt
# ServiceOwners: @jamesvoongms @jotrivet

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

Expand Down
1 change: 0 additions & 1 deletion .github/CODEOWNERS_baseline_errors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ EldertGrootenboer is not a public member of Azure.
QingChenmsft is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
vaishnavk is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
juhacket is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
sffamily is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
chenkennt is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
azureSQLGitHub is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
xgithubtriage is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
Expand Down
9 changes: 9 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
"referer",
"renormalize",
"retriable",
"Servfail",
"setsas",
"signalr",
"signup",
Expand Down Expand Up @@ -908,6 +909,14 @@
"POSIX"
]
},
{
"filename": "**/sdk/maps/Azure.Maps.Weather/**/*.cs",
"words": [
"Actuals",
"Bangla",
"Hecto"
]
},
{
"filename": "**/sdk/mediaservices/**/*.cs",
"words": [
Expand Down
8 changes: 5 additions & 3 deletions eng/Directory.Build.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,12 @@

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<!--
.NET 8 now produces security warnings for nuget packages in dotnet restore. Keep these as warnings in T1 to avoid needing to update T1 library dependencies.
See: https://learn.microsoft.com/en-us/dotnet/core/compatibility/sdk/8.0/dotnet-restore-audit#recommended-action
.NET 8 now produces security warnings for nuget packages in dotnet restore. We want to keep all but critical (NU1904) as warnings and not turn them to errors.
For T1 we want to keep them all as warnings as we cannot easily fix them all currently and plan to remove the libraries in the future.
See: https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904
-->
<WarningsNotAsErrors Condition="'$(IsClientLibrary)' != 'true'">NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
<WarningsNotAsErrors>$(WarningsNotAsErrors);NU1901;NU1902;NU1903</WarningsNotAsErrors>
<WarningsNotAsErrors Condition="'$(IsClientLibrary)' != 'true'">$(WarningsNotAsErrors);NU1904</WarningsNotAsErrors>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>symbols.nupkg</SymbolPackageFormat>
Expand Down
38 changes: 23 additions & 15 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@

<!-- BCL packages -->
<PackageReference Update="System.Buffers" Version="4.5.1" />
<PackageReference Update="System.ClientModel" Version="1.1.0" />
<PackageReference Update="System.ClientModel" Version="1.2.1" />
<PackageReference Update="System.IO.Hashing" Version="6.0.0" />
<PackageReference Update="System.Memory" Version="4.5.5" />
<PackageReference Update="System.Memory.Data" Version="1.0.2" />
<PackageReference Update="System.Memory.Data" Version="6.0.0" />
<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Update="System.Net.Http" Version="4.3.4" />
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
Expand All @@ -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="6.0.9" />
<PackageReference Update="System.Text.Json" Version="6.0.10" />
<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 All @@ -107,18 +107,18 @@
<!-- Azure SDK packages -->
<PackageReference Update="Azure.Communication.Identity" Version="1.3.1" />
<PackageReference Update="Azure.Communication.Common" Version="1.3.0" />
<PackageReference Update="Azure.Core" Version="1.43.0" />
<PackageReference Update="Azure.Core" Version="1.44.1" />
<PackageReference Update="Azure.Core.Amqp" Version="1.3.1" />
<PackageReference Update="Azure.Core.Experimental" Version="0.1.0-preview.35" />
<PackageReference Update="Azure.Core.Experimental" Version="0.1.0-preview.36" />
<PackageReference Update="Azure.Core.Expressions.DataFactory" Version="1.0.0" />
<PackageReference Update="Azure.Data.SchemaRegistry" Version="1.2.0" />
<PackageReference Update="Azure.Data.Tables" Version="12.8.0" />
<PackageReference Update="Azure.Messaging.EventHubs" Version="5.11.5" />
<PackageReference Update="Azure.Messaging.EventGrid" Version="4.21.0" />
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.18.1" />
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.18.2" />
<PackageReference Update="Azure.Messaging.WebPubSub" Version="1.4.0" />
<PackageReference Update="Azure.MixedReality.Authentication" version= "1.2.0" />
<PackageReference Update="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0-beta.1" />
<PackageReference Update="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0-beta.2" />
<PackageReference Update="Azure.Monitor.Query" Version="1.1.0" />
<PackageReference Update="Azure.Identity" Version="1.12.0" />
<PackageReference Update="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
Expand All @@ -128,7 +128,7 @@
<PackageReference Update="Azure.Storage.Blobs" Version="12.21.1" />
<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.6" />
<PackageReference Update="Azure.AI.OpenAI" Version="2.0.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" />
Expand All @@ -141,7 +141,7 @@
<PackageReference Update="Azure.ResourceManager.ManagedServiceIdentities" Version="1.2.3" />
<PackageReference Update="Azure.ResourceManager.OperationalInsights" Version="1.2.2" />
<PackageReference Update="Azure.ResourceManager.PostgreSql" Version="1.2.0-beta.6" />
<PackageReference Update="Azure.ResourceManager.Redis" Version="1.3.3" />
<PackageReference Update="Azure.ResourceManager.Redis" Version="1.4.0" />
<PackageReference Update="Azure.ResourceManager.Resources" Version="1.7.3" />
<PackageReference Update="Azure.ResourceManager.Search" Version="1.3.0-beta.3" />
<PackageReference Update="Azure.ResourceManager.ServiceBus" Version="1.1.0-beta.7" />
Expand Down Expand Up @@ -175,7 +175,12 @@
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.AI.OpenAI'))">
<PackageReference Update="OpenAI" Version="2.0.0-beta.12" />
<PackageReference Update="OpenAI" Version="2.1.0-beta.1" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Developer.MicrosoftPlaywrightTesting'))">
<PackageReference Update="Microsoft.TestPlatform.ObjectModel" Version="17.10.0" />
<PackageReference Update="NUnit" Version="3.13.2" />
</ItemGroup>

<!--
Expand Down Expand Up @@ -209,7 +214,7 @@
<PackageReference Update="Microsoft.AspNetCore.Http.Connections" Version="1.0.15" />
<PackageReference Update="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
<PackageReference Update="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" Version="1.1.0" />
<PackageReference Update="Microsoft.Extensions.Azure" Version="1.7.4" />
<PackageReference Update="Microsoft.Extensions.Azure" Version="1.7.6" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="2.1.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
Expand All @@ -223,7 +228,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.20240926.1" PrivateAssets="All" />
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20241010.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 All @@ -250,7 +255,7 @@
<PackageReference Update="Azure.Identity" Version="1.12.0" />
<PackageReference Update="Azure.Messaging.EventGrid" Version="4.17.0" />
<PackageReference Update="Azure.Messaging.EventHubs.Processor" Version="5.11.3" />
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.18.1" />
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.18.2" />
<PackageReference Update="Azure.ResourceManager.Compute" Version="1.2.0" />
<PackageReference Update="Azure.ResourceManager.CognitiveServices" Version="1.3.0" />
<PackageReference Update="Azure.ResourceManager.KeyVault" Version="1.1.0" />
Expand Down Expand Up @@ -315,7 +320,7 @@
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.2" />
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Update="Microsoft.Data.SqlClient" Version="5.1.3" />
<PackageReference Update="Microsoft.Extensions.Azure" Version="1.7.4" />
<PackageReference Update="Microsoft.Extensions.Azure" Version="1.7.6" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.1.10" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
Expand All @@ -340,13 +345,16 @@
<PackageReference Update="NUnit" Version="3.13.2" />
<PackageReference Update="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Update="OpenTelemetry" Version="1.9.0" />
<PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.9.0" />
<PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.9.0" />
<PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.9.0-beta.1" />
<PackageReference Update="Polly" Version="7.1.0" />
<PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
<PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Update="PublicApiGenerator" Version="10.0.1" />
<PackageReference Update="System.ClientModel" Version="1.1.0" />
<PackageReference Update="System.ClientModel" Version="1.2.1" />
<PackageReference Update="System.Diagnostics.TraceSource" Version="4.3.0" />
<PackageReference Update="System.IO.Compression" Version="4.3.0" />
<PackageReference Update="System.IO.Pipelines" Version="4.5.1" />
Expand Down
4 changes: 2 additions & 2 deletions eng/common/TestResources/New-TestResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -515,9 +515,9 @@ try {

# Try to detect the shell based on the parent process name (e.g. launch via shebang).
$shell, $shellExportFormat = if (($parentProcessName = (Get-Process -Id $PID).Parent.ProcessName) -and $parentProcessName -eq 'cmd') {
'cmd', 'set {0}={1}'
'cmd', 'set {0}=''{1}'''
} elseif (@('bash', 'csh', 'tcsh', 'zsh') -contains $parentProcessName) {
'shell', 'export {0}={1}'
'shell', 'export {0}=''{1}'''
} else {
'PowerShell', '${{env:{0}}} = ''{1}'''
}
Expand Down
31 changes: 31 additions & 0 deletions eng/common/TestResources/deploy-test-resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ parameters:
ServiceConnection: not-specified
ResourceType: test
UseFederatedAuth: false
PersistOidcToken: false

# SubscriptionConfiguration will be splatted into the parameters of the test
# resources script. It should be JSON in the form:
Expand Down Expand Up @@ -41,12 +42,27 @@ steps:

- template: /eng/common/TestResources/setup-environments.yml

- ${{ if eq(parameters.PersistOidcToken, true) }}:
- task: AzureCLI@2
displayName: Set OIDC token
env:
ARM_OIDC_TOKEN: $(ARM_OIDC_TOKEN)
inputs:
azureSubscription: ${{ parameters.ServiceConnection }}
addSpnToEnvironment: true
scriptLocation: inlineScript
scriptType: pscore
inlineScript: |
Write-Host "##vso[task.setvariable variable=ARM_OIDC_TOKEN;issecret=true]$($env:idToken)"
- ${{ if eq('true', parameters.UseFederatedAuth) }}:
- task: AzurePowerShell@5
displayName: 🚀 Deploy test resources
env:
TEMP: $(Agent.TempDirectory)
PoolSubnet: $(PoolSubnet)
${{ if eq(parameters.PersistOidcToken, true) }}:
ARM_OIDC_TOKEN: $(ARM_OIDC_TOKEN)
${{ insert }}: ${{ parameters.EnvVars }}
inputs:
azureSubscription: ${{ parameters.ServiceConnection }}
Expand All @@ -59,6 +75,21 @@ steps:
${{ parameters.SubscriptionConfiguration }}
'@ | ConvertFrom-Json -AsHashtable;
$context = Get-AzContext
$subscriptionConfiguration["Environment"] = $context.Environment.Name
$subscriptionConfiguration["SubscriptionId"] = $context.Subscription.Id
$subscriptionConfiguration["TenantId"] = $context.Subscription.TenantId
$subscriptionConfiguration["TestApplicationId"] = $context.Account.Id
$subscriptionConfiguration["ProvisionerApplicationId"] = $context.Account.Id
$principal = Get-AzADServicePrincipal -ApplicationId $context.Account.Id
$subscriptionConfiguration["TestApplicationOid"] = $principal.Id
$subscriptionConfiguration["ProvisionerApplicationOid"] = $principal.Id
Write-Host ($subscriptionConfiguration | ConvertTo-Json)
# Write the new SubscriptionConfiguration to be used by the remove test resources
Write-Host "##vso[task.setvariable variable=SubscriptionConfiguration;]$($subscriptionConfiguration | ConvertTo-Json -Compress)"
# The subscriptionConfiguration may have ArmTemplateParameters defined, so
# pass those in via the ArmTemplateParameters flag, and handle any
# additional parameters from the pipelines via AdditionalParameters
Expand Down
7 changes: 6 additions & 1 deletion eng/common/scripts/Generate-PR-Diff.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,13 @@ if (!(Test-Path $ArtifactPath))
$ArtifactPath = Resolve-Path $ArtifactPath
$ArtifactName = Join-Path $ArtifactPath "diff.json"

$changedFiles = @()
$changedServices = @()

$changedFiles = Get-ChangedFiles -DiffPath $TargetPath
$changedServices = Get-ChangedServices -ChangedFiles $changedFiles
if ($changedFiles) {
$changedServices = Get-ChangedServices -ChangedFiles $changedFiles
}

$result = [PSCustomObject]@{
"ChangedFiles" = $changedFiles
Expand Down
Loading

0 comments on commit a741370

Please sign in to comment.