From a2cdbbe70c797bbe8fa9d748cd4a4db90c6b20c7 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Fri, 3 Apr 2020 14:45:26 -0700 Subject: [PATCH 1/3] get rid of & encode. replace > and < w/ &60; and &62;. --- eng/pipelines/scripts/inject_codesnippets.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/scripts/inject_codesnippets.py b/eng/pipelines/scripts/inject_codesnippets.py index 5155010f666e..6551eb2a5369 100644 --- a/eng/pipelines/scripts/inject_codesnippets.py +++ b/eng/pipelines/scripts/inject_codesnippets.py @@ -19,10 +19,9 @@ EXCLUSION_ARRAY = ["JavadocCodeSnippetCheck.java"] HTML_ESCAPE_TABLE = { - "&": "&", '"': """, - ">": ">", - "<": "<", + ">": ">", + "<": "<", "@": "{@literal @}", "{": "{", "}": "}", From 494178834071e3a7095927ba6d6ec7cb21de0aaa Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Thu, 21 May 2020 19:06:17 -0700 Subject: [PATCH 2/3] ensure doc repo is present everywhere you call archtype-java-release --- eng/pipelines/templates/stages/archetype-sdk-data.yml | 5 +++++ .../templates/stages/archetype-sdk-pom-only.yml | 6 +++++- eng/pipelines/templates/stages/cosmos-sdk-client.yml | 10 ++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-sdk-data.yml b/eng/pipelines/templates/stages/archetype-sdk-data.yml index ae5fda883295..80d91880e239 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-data.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-data.yml @@ -3,6 +3,9 @@ parameters: AdditionalModules: [] SDKType: data ServiceDirectory: not-specified + TargetDocRepoOwner: 'Azure' + TargetDocRepoName: 'azure-docs-sdk-java' + stages: - stage: Build @@ -23,3 +26,5 @@ stages: SDKType: ${{parameters.SDKType}} Artifacts: ${{parameters.Artifacts}} ArtifactName: packages + TargetDocRepoOwner: ${{parameters.TargetDocRepoOwner}} + TargetDocRepoName: ${{parameters.TargetDocRepoName}} \ No newline at end of file diff --git a/eng/pipelines/templates/stages/archetype-sdk-pom-only.yml b/eng/pipelines/templates/stages/archetype-sdk-pom-only.yml index 636a1ae88d77..2f1528973f3b 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-pom-only.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-pom-only.yml @@ -4,7 +4,9 @@ parameters: ServiceDirectory: not-specified Skip.UpdatePackageVersion: true Skip.VersionVerification: true - + TargetDocRepoOwner: 'Azure' + TargetDocRepoName: 'azure-docs-sdk-java' + stages: - stage: Build jobs: @@ -23,3 +25,5 @@ stages: SDKType: ${{parameters.SDKType}} Artifacts: ${{parameters.Artifacts}} ArtifactName: packages + TargetDocRepoOwner: ${{parameters.TargetDocRepoOwner}} + TargetDocRepoName: ${{parameters.TargetDocRepoName}} diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml index 844e08576ac9..20eb4d872c54 100644 --- a/eng/pipelines/templates/stages/cosmos-sdk-client.yml +++ b/eng/pipelines/templates/stages/cosmos-sdk-client.yml @@ -1,7 +1,9 @@ parameters: Artifacts: [] ServiceDirectory: not-specified - + TargetDocRepoOwner: 'Azure' + TargetDocRepoName: 'azure-docs-sdk-java' + stages: - stage: Build jobs: @@ -143,12 +145,12 @@ stages: # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch. - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}: - - template: archetype-java-release.yml + - template: archetype-java-release.yml parameters: DependsOn: Build ServiceDirectory: ${{parameters.ServiceDirectory}} SDKType: ${{parameters.SDKType}} Artifacts: ${{parameters.Artifacts}} ArtifactName: packages - - \ No newline at end of file + TargetDocRepoOwner: ${{parameters.TargetDocRepoOwner}} + TargetDocRepoName: ${{parameters.TargetDocRepoName}} From 58487197eb45d62b7736e60c9c46c7070c76accc Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Tue, 26 May 2020 15:26:48 -0700 Subject: [PATCH 3/3] resolve bad indentation --- eng/pipelines/templates/stages/cosmos-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml index 20eb4d872c54..b54fa96efd38 100644 --- a/eng/pipelines/templates/stages/cosmos-sdk-client.yml +++ b/eng/pipelines/templates/stages/cosmos-sdk-client.yml @@ -145,7 +145,7 @@ stages: # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch. - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}: - - template: archetype-java-release.yml + - template: archetype-java-release.yml parameters: DependsOn: Build ServiceDirectory: ${{parameters.ServiceDirectory}}