Skip to content

Commit

Permalink
Merge remote-tracking branch 'Azure/master' into keyvault-admin/backu…
Browse files Browse the repository at this point in the history
…pClient
  • Loading branch information
sadasant committed Sep 4, 2020
2 parents 7e393c2 + ab6907c commit f3a134b
Show file tree
Hide file tree
Showing 348 changed files with 21,872 additions and 4,113 deletions.
241 changes: 215 additions & 26 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions common/smoke-test/Initialize-SmokeTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ foreach ($entry in $manifest) {

}
catch {
OutputWarning "Failed to deploy $($entry.Name) $($_Exception.Message)"
OutputWarning "Failed to deploy $($entry.Name) $($_.Exception.Message)"
Write-Warning "Failed to deploy $($entry.Name)"
Write-Host $_Exception.Message
Write-Host $_.Exception.Message
continue
}

Expand Down
4 changes: 2 additions & 2 deletions common/tools/dev-tool/src/commands/samples/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ export const commandInfo = makeCommandInfo(
async function runSingle(name: string, accumulatedErrors: Array<[string, string]>) {
log("Running", name);
try {
if (/.*\/samples\/.*/.exec(name)) {
if (/.*[\\\/]samples[\\\/].*/.exec(name)) {
// This is an un-prepared sample, so just require it and it will run.
await import(name);
} else if (!/.*\/dist-samples\/.*/.exec(name)) {
} else if (!/.*[\\\/]dist-samples[\\\/].*/.exec(name)) {
// This is not an unprepared or a prepared sample
log.warn("Executing a file that is neither in samples nor dist-samples.");
} else {
Expand Down
84 changes: 44 additions & 40 deletions dataplane.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -2,158 +2,162 @@
"folders": [
{
"name": "abort-controller",
"path": "sdk\\core\\abort-controller"
"path": "sdk/core/abort-controller"
},
{
"name": "anomaly-detector",
"path": "sdk\\anomalydetector\\ai-anomaly-detector"
"path": "sdk/anomalydetector/ai-anomaly-detector"
},
{
"name": "app-configuration",
"path": "sdk\\appconfiguration\\app-configuration"
"path": "sdk/appconfiguration/app-configuration"
},
{
"name": "core-amqp",
"path": "sdk\\core\\core-amqp"
"path": "sdk/core/core-amqp"
},
{
"name": "core-arm",
"path": "sdk\\core\\core-arm"
"path": "sdk/core/core-arm"
},
{
"name": "core-asynciterator-polyfill",
"path": "sdk\\core\\core-asynciterator-polyfill"
"path": "sdk/core/core-asynciterator-polyfill"
},
{
"name": "core-auth",
"path": "sdk\\core\\core-auth"
"path": "sdk/core/core-auth"
},
{
"name": "core-client",
"path": "sdk\\core\\core-client"
"path": "sdk/core/core-client"
},
{
"name": "core-http",
"path": "sdk\\core\\core-http"
"path": "sdk/core/core-http"
},
{
"name": "core-https",
"path": "sdk\\core\\core-https"
"path": "sdk/core/core-https"
},
{
"name": "core-lro",
"path": "sdk\\core\\core-lro"
"path": "sdk/core/core-lro"
},
{
"name": "core-paging",
"path": "sdk\\core\\core-paging"
"path": "sdk/core/core-paging"
},
{
"name": "core-tracing",
"path": "sdk\\core\\core-tracing"
"path": "sdk/core/core-tracing"
},
{
"name": "core-xml",
"path": "sdk\\core\\core-xml"
"path": "sdk/core/core-xml"
},
{
"name": "cosmos",
"path": "sdk\\cosmosdb\\cosmos"
"path": "sdk/cosmosdb/cosmos"
},
{
"name": "event-hubs",
"path": "sdk\\eventhub\\event-hubs"
"path": "sdk/eventhub/event-hubs"
},
{
"name": "eventhubs-checkpointstore-blob",
"path": "sdk\\eventhub\\eventhubs-checkpointstore-blob"
"path": "sdk/eventhub/eventhubs-checkpointstore-blob"
},
{
"name": "event-processor-host",
"path": "sdk\\eventhub\\event-processor-host"
"path": "sdk/eventhub/event-processor-host"
},
{
"name": "form-recognizer",
"path": "sdk\\formrecognizer\\ai-form-recognizer"
"path": "sdk/formrecognizer/ai-form-recognizer"
},
{
"name": "testhub",
"path": "sdk\\eventhub\\testhub"
"path": "sdk/eventhub/testhub"
},
{
"name": "identity",
"path": "sdk\\identity\\identity"
"path": "sdk/identity/identity"
},
{
"name": "keyvault-certificates",
"path": "sdk\\keyvault\\keyvault-certificates"
"path": "sdk/keyvault/keyvault-certificates"
},
{
"name": "keyvault-keys",
"path": "sdk\\keyvault\\keyvault-keys"
"path": "sdk/keyvault/keyvault-keys"
},
{
"name": "keyvault-secrets",
"path": "sdk\\keyvault\\keyvault-secrets"
"path": "sdk/keyvault/keyvault-secrets"
},
{
"name": "logger",
"path": "sdk\\core\\logger"
"path": "sdk/core/logger"
},
{
"name": "search",
"path": "sdk\\search\\search-documents"
"path": "sdk/search/search-documents"
},
{
"name": "service-bus",
"path": "sdk\\servicebus\\service-bus"
"path": "sdk/servicebus/service-bus"
},
{
"name": "storage-blob",
"path": "sdk\\storage\\storage-blob"
"path": "sdk/storage/storage-blob"
},
{
"name": "storage-blob-changefeed",
"path": "sdk\\storage\\storage-blob-changefeed"
"path": "sdk/storage/storage-blob-changefeed"
},
{
"name": "storage-file-datalake",
"path": "sdk\\storage\\storage-file-datalake"
"path": "sdk/storage/storage-file-datalake"
},
{
"name": "storage-file-share",
"path": "sdk\\storage\\storage-file-share"
"path": "sdk/storage/storage-file-share"
},
{
"name": "storage-queue",
"path": "sdk\\storage\\storage-queue"
"path": "sdk/storage/storage-queue"
},
{
"name": "tables",
"path": "sdk\\tables\\data-tables"
"path": "sdk/tables/data-tables"
},
{
"name": "text analytics",
"path": "sdk\\textanalytics\\ai-text-analytics"
"path": "sdk/textanalytics/ai-text-analytics"
},
{
"name": "monitor",
"path": "sdk/monitor/monitor-opentelemetry-exporter"
},
{
"name": "test recorder",
"path": "sdk\\test-utils\\recorder"
"path": "sdk/test-utils/recorder"
},
{
"name": "template",
"path": "sdk\\template\\template"
"path": "sdk/template/template"
},
{
"name": "eslint plugin",
"path": "common\\tools\\eslint-plugin-azure-sdk"
"path": "common/tools/eslint-plugin-azure-sdk"
},
{
"name": "perfstress",
"path": "sdk\\test-utils\\perfstress"
"path": "sdk/test-utils/perfstress"
},
{
"path": "sdk\\digitaltwins\\digitaltwins"
"path": "sdk/digitaltwins/digitaltwins"
}
],
"settings": {
Expand All @@ -180,7 +184,7 @@
"**/*.d.ts": true,
"**/test-browser/*": true
},
"typescript.tsdk": "core-http\\node_modules\\typescript\\lib"
"typescript.tsdk": "core-http/node_modules/typescript/lib"
},
"extensions": {
"recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
Expand Down
1 change: 1 addition & 0 deletions eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ omitted_paths:
- sdk/eventhub/*/test/README.md
- sdk/search/*/test/README.md
- sdk/servicebus/*/test/README.md
- sdk/schemaregistry/README.md
- sdk/servicebus/service-bus/samples-v1/*
- sdk/storage/*/test/README.md
- sdk/storage/storage-internal-avro/*
Expand Down
4 changes: 4 additions & 0 deletions eng/common/pipelines/templates/steps/publish-blobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ parameters:
TargetLanguage: ''
BlobName: ''
ScriptPath: ''
ArtifactLocation: ''
RepoId: $(Build.Repository.Name)

steps:
- pwsh: |
Expand All @@ -21,6 +23,8 @@ steps:
-SASKey "${{ parameters.BlobSASKey }}"
-Language "${{ parameters.TargetLanguage }}"
-BlobName "${{ parameters.BlobName }}"
-PublicArtifactLocation "${{ parameters.ArtifactLocation }}"
-RepoReplaceRegex "(https://github.com/${{ parameters.RepoId }}/(?:blob|tree)/)master"
pwsh: true
workingDirectory: $(Pipeline.Workspace)
displayName: Copy Docs to Blob
Expand Down
Loading

0 comments on commit f3a134b

Please sign in to comment.