From 36ba422114de5a6a9beb1859e4800831ef3f32fc Mon Sep 17 00:00:00 2001
From: Bruce Haley <v-brucehaley@microsoft.com>
Date: Mon, 3 Oct 2022 16:11:06 -0700
Subject: [PATCH] Cleanup

---
 build/yaml/botbuilder-dotnet-ci.yml    |  2 ++
 build/yaml/ci-api-validation-steps.yml | 28 --------------------------
 build/yaml/ci-post-to-github-steps.yml |  3 +--
 build/yaml/ci-test-steps.yml           |  3 +--
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/build/yaml/botbuilder-dotnet-ci.yml b/build/yaml/botbuilder-dotnet-ci.yml
index d6db6a88cc..17d53f8f85 100644
--- a/build/yaml/botbuilder-dotnet-ci.yml
+++ b/build/yaml/botbuilder-dotnet-ci.yml
@@ -84,6 +84,8 @@ stages:
   jobs:
   - job: generate_multiconfig_var
     steps:
+    - template: sdk_dotnet_v4_org-feed-setup-steps.yml
+
     # Download contract .dlls
     - powershell: |
         # Set up tokens for private sources
diff --git a/build/yaml/ci-api-validation-steps.yml b/build/yaml/ci-api-validation-steps.yml
index 8c097d0227..be50d1c572 100644
--- a/build/yaml/ci-api-validation-steps.yml
+++ b/build/yaml/ci-api-validation-steps.yml
@@ -25,34 +25,6 @@ steps:
     useBaseline: false
   continueOnError: false
 
-- task: SOUTHWORKS.binaries-comparer.custom-build-release-task.binaries-comparer@0
-  displayName: 'Compare Binaries - Contract-to-contract'
-  inputs:
-    contractsRootFolder: '$(System.ArtifactsDirectory)/ContractDlls'
-    contractsFileName: '$(PackageName).dll'
-    implFolder: '$(System.ArtifactsDirectory)/ContractDlls'
-    failOnIssue: false
-    resolveFx: false
-    generateLog: true
-    outputFilename: '$(PackageName).$(ApiContractVersion).CompatResults-c2c.txt'
-    outputFolder: '$(Build.ArtifactStagingDirectory)'
-    useBaseline: false
-  continueOnError: false
-
-- task: SOUTHWORKS.binaries-comparer.custom-build-release-task.binaries-comparer@0
-  displayName: 'Compare Binaries - Implementation-to-implementation'
-  inputs:
-    contractsRootFolder: '$(System.ArtifactsDirectory)/OutputDlls'
-    contractsFileName: '$(PackageName).dll'
-    implFolder: '$(System.ArtifactsDirectory)/OutputDlls'
-    failOnIssue: false
-    resolveFx: false
-    generateLog: true
-    outputFilename: '$(PackageName).$(ApiContractVersion).CompatResults-i2i.txt'
-    outputFolder: '$(Build.ArtifactStagingDirectory)'
-    useBaseline: false
-  continueOnError: false
-
 - powershell: |
     $filePath = "$(Build.ArtifactStagingDirectory)\$(PackageName).$(ApiContractVersion).CompatResults.txt"
     $nugetLink = "compared against [version $(ApiContractVersion)](https://www.nuget.org/packages/$(PackageName)/$(ApiContractVersion)).";
diff --git a/build/yaml/ci-post-to-github-steps.yml b/build/yaml/ci-post-to-github-steps.yml
index 8ad6a2c3bc..e870edc924 100644
--- a/build/yaml/ci-post-to-github-steps.yml
+++ b/build/yaml/ci-post-to-github-steps.yml
@@ -32,8 +32,7 @@ steps:
   condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'), ne(variables['System.PullRequest.IsFork'], 'True'))
 
 - script: |
-   cd ..
-   dir /s
+   dir .. /s
   displayName: 'Dir workspace'
   continueOnError: true
   condition: succeededOrFailed()
diff --git a/build/yaml/ci-test-steps.yml b/build/yaml/ci-test-steps.yml
index 88ccf6fee2..4a376ef3b8 100644
--- a/build/yaml/ci-test-steps.yml
+++ b/build/yaml/ci-test-steps.yml
@@ -92,8 +92,7 @@ steps:
   continueOnError: true
 
 - script: |
-   cd ..
-   dir *.* /s
+   dir .. /s
   displayName: 'Dir workspace'
   continueOnError: true
   condition: succeededOrFailed()