Skip to content

Commit 68ee69f

Browse files
committed
merge
2 parents 8510b25 + 8b96068 commit 68ee69f

2,889 files changed

Lines changed: 137232 additions & 291817 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
/sdk/keyvault/ @mccoyp
179179

180180
# PRLabel: %Load Test Service
181-
/sdk/loadtesting/azure-developer-loadtesting/ @msyyc @iscai-msft
181+
/sdk/loadtesting/azure-developer-loadtesting/ @prativen @mitsha-microsoft @ninallam
182182

183183
# PRLabel: %Monitor
184184
/sdk/loganalytics/azure-loganalytics/ @azmonapplicationinsights @pvaneck
@@ -299,27 +299,26 @@
299299

300300
# ServiceLabel: %Maps
301301
# PRLabel: %Maps
302-
/sdk/maps/ @dubiety
302+
/sdk/maps/ @dubiety @andykao1213
303303

304304
# ServiceLabel: %Mixed Reality
305305
# PRLabel: %Mixed Reality
306306
/sdk/mixedreality/azure-mixedreality-authentication/ @RamonArguelles
307307
/sdk/remoterendering/ @FlorianBorn71
308308

309-
# AzureSdkOwners: @kristapratico
310309
# ServiceLabel: %OpenAI
311310
# ServiceOwners: @trrwilson
312311

313312
# PRLabel: %OpenAI
314-
/sdk/openai/ @kristapratico @glecaros
313+
/sdk/openai/ @trrwilson
315314

316315
# ServiceLabel: %Operator Nexus - Network Cloud
317316
# PRLabel: %Operator Nexus - Network Cloud
318317
/sdk/networkcloud/ @Azure/azure-sdk-write-networkcloud
319318

320319
# ServiceLabel: %Purview
321320
# PRLabel: %Purview
322-
/sdk/purview/ @saxenarahulMs
321+
/sdk/purview/ @saxenarahulMs @adyabansal-ms
323322

324323
# ServiceLabel: %Recovery Services
325324
# ServiceOwners: @Daya-Patil @Sharmistha-Rai

.vscode/cspell.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"sdk/ai/azure-ai-inference/samples/hello_how_are_you.mp3",
3737
"sdk/ai/azure-ai-inference/tests/hello_how_are_you.mp3",
3838
"sdk/ai/azure-ai-projects/samples/agents/nifty_500_quarterly_results.csv",
39+
"sdk/ai/azure-ai-projects/samples/agents/tripadvisor_openapi.json",
3940
"/sdk/ai/azure-ai-projects/samples/evaluations/async_samples/data/**",
4041
"/sdk/ai/azure-ai-projects/samples/evaluations/data/**",
4142
"sdk/ai/azure-ai-resources/azure/ai/resources/_index/_langchain/vendor/**",
@@ -1344,6 +1345,10 @@
13441345
{
13451346
"filename": "sdk/ai/azure-ai-projects/**",
13461347
"words": [
1348+
"coso",
1349+
"longtitude",
1350+
"abbrev",
1351+
"accommodations",
13471352
"ENTRAID",
13481353
"entraid",
13491354
"aiservices",

doc/dev/ai/ai_prompt_workflow.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# AI Prompt Workflow
2+
3+
4+
1. In Copilot **Agent** mode, click on `Add Context` and select `prompt` from the dropdown.
5+
6+
*Note*: Agent mode is currently only available in [VSCode Insiders](https://code.visualstudio.com/insiders/).
7+
8+
![Agent Mode](step1.png)
9+
10+
2. Select `next-pylint.prompt.md` or associated prompt for your task.
11+
12+
![Select Prompt](step2.png)
13+
14+
3. Send the prompt to the agent. Follow the instructions provided by the agent to complete the task.
15+
16+
![Hit Enter!](step3.png)

doc/dev/ai/step1.png

233 KB
Loading

doc/dev/ai/step2.png

17.5 KB
Loading

doc/dev/ai/step3.png

20.6 KB
Loading

eng/apiview_reqs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ tomli==2.2.1
1414
tomlkit==0.13.2
1515
typing_extensions==4.12.2
1616
wrapt==1.17.2
17-
apiview-stub-generator==0.3.17
17+
apiview-stub-generator==0.3.18

eng/common/TestResources/New-TestResources.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,7 @@ $serialized
657657
'`@ | ConvertFrom-Json -AsHashtable
658658
# Set global variables that aren't always passed as parameters
659659
`$ResourceGroupName = `$parameters.ResourceGroupName
660+
`$AdditionalParameters = `$parameters.AdditionalParameters
660661
`$DeploymentOutputs = `$parameters.DeploymentOutputs
661662
$postDeploymentScript `@parameters
662663
"@

eng/common/TestResources/deploy-test-resources.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ steps:
122122
scriptLocation: inlineScript
123123
scriptType: pscore
124124
inlineScript: |
125+
eng/common/scripts/Import-AzModules.ps1 # Support post scripts using az powershell instead of az cli
125126
$env:ARM_OIDC_TOKEN = $env:idToken
126127
$scriptPath = '$(Agent.TempDirectory)/${{ parameters.SelfContainedPostScript }}'
127128
Write-Host "Executing self contained test resources post script '$scriptPath'"

eng/common/pipelines/templates/archetype-typespec-emitter.yml

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ parameters:
6767
type: object
6868
default: []
6969

70+
- name: EmitterPackageJsonPath
71+
type: string
72+
default: ""
73+
7074
extends:
7175
template: /eng/pipelines/templates/stages/1es-redirect.yml
7276
parameters:
@@ -189,26 +193,25 @@ extends:
189193
ServiceEndpointUrl: https://api.esrp.microsoft.com
190194
MainPublisher: ESRPRELPACMANTEST
191195

192-
- task: PowerShell@2
193-
displayName: Create emitter-package.json
194-
inputs:
195-
pwsh: true
196-
filePath: ./eng/common/scripts/typespec/New-EmitterPackageJson.ps1
197-
arguments: >
198-
-PackageJsonPath '$(buildArtifactsPath)/lock-files/package.json'
199-
-OverridesPath '$(buildArtifactsPath)/overrides.json'
200-
-OutputDirectory '$(Build.ArtifactStagingDirectory)'
201-
workingDirectory: $(Build.SourcesDirectory)
196+
- pwsh: |
197+
npm install -g @azure-tools/typespec-client-generator-cli@latest
198+
displayName: Install tsp-client
202199
203-
- task: PowerShell@2
204-
displayName: Create emitter-package-lock.json
205-
inputs:
206-
pwsh: true
207-
filePath: ./eng/common/scripts/typespec/New-EmitterPackageLock.ps1
208-
arguments: >
209-
-EmitterPackageJsonPath '$(Build.ArtifactStagingDirectory)/emitter-package.json'
210-
-OutputDirectory '$(Build.ArtifactStagingDirectory)'
211-
workingDirectory: $(Build.SourcesDirectory)
200+
- pwsh: |
201+
if (Test-Path -Path '$(buildArtifactsPath)/overrides.json') {
202+
Write-Host "Using overrides.json to generate emitter-package.json"
203+
tsp-client generate-config-files `
204+
--package-json '$(buildArtifactsPath)/lock-files/package.json' `
205+
--output-dir '$(Build.ArtifactStagingDirectory)' `
206+
--emitter-package-json-path '${{ parameters.EmitterPackageJsonPath }}' `
207+
--overrides '$(buildArtifactsPath)/overrides.json'
208+
} else {
209+
tsp-client generate-config-files `
210+
--package-json '$(buildArtifactsPath)/lock-files/package.json' `
211+
--output-dir '$(Build.ArtifactStagingDirectory)' `
212+
--emitter-package-json-path '${{ parameters.EmitterPackageJsonPath }}'
213+
}
214+
displayName: Generate emitter-package.json and emitter-package-lock files
212215
213216
- template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml
214217
parameters:

0 commit comments

Comments
 (0)