Skip to content

Commit

Permalink
Merge branch 'Azure:main' into users/pahallis/sdk-emitter-pipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
hallipr authored Oct 9, 2024
2 parents 88aa37f + d891541 commit cf9e81c
Show file tree
Hide file tree
Showing 1,148 changed files with 27,687 additions and 7,700 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
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
25 changes: 15 additions & 10 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="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,15 +107,15 @@
<!-- 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.0" />
<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" />
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 Down Expand Up @@ -178,6 +178,11 @@
<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>

<!--
Dependency versions for Track 2, Microsoft.* libraries.
These are dependencies for Track 2 integration packages
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.20241007.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 Down Expand Up @@ -349,7 +354,7 @@
<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.0" />
<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
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
30 changes: 15 additions & 15 deletions eng/emitter-package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/emitter-package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"main": "dist/src/index.js",
"dependencies": {
"@azure-tools/typespec-csharp": "0.2.0-beta.20240926.1"
"@azure-tools/typespec-csharp": "0.2.0-beta.20241007.1"
},
"devDependencies": {
"@azure-tools/typespec-autorest": "0.46.0",
Expand Down
16 changes: 16 additions & 0 deletions sdk/communication/Azure.Communication.Sms/tests.int.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
trigger: none

extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
parameters:
ServiceDirectory: communication
Project: Azure.Communication.Sms
CloudConfig:
Int:
SubscriptionConfigurations:
- $(sub-config-communication-int-test-resources-common)
- $(sub-config-communication-int-test-resources-net)
- $(sub-config-communication-sms-int-test-resources)
Clouds: Int
TestResourceDirectories:
- communication/
10 changes: 4 additions & 6 deletions sdk/communication/Azure.Communication.Sms/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ extends:
Project: Azure.Communication.Sms
CloudConfig:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurations:
- $(sub-config-azure-cloud-test-resources)
- $(sub-config-communication-services-cloud-test-resources-common)
- $(sub-config-communication-services-cloud-test-resources-net)
- $(sub-config-communication-services-sms-cloud-test-resources)
Int:
SubscriptionConfigurations:
- $(sub-config-communication-int-test-resources-common)
- $(sub-config-communication-int-test-resources-net)
- $(sub-config-communication-sms-int-test-resources)
Clouds: Public,Int
Clouds: Public
TestResourceDirectories:
- communication/
Loading

0 comments on commit cf9e81c

Please sign in to comment.