Merge branch 'main' into 2.0.0

.github/CODEOWNERS

@@ -4,12 +4,14 @@
 
 /runtime/ @boydc2014 @luhan2017 @carlosscastro @benbrown
 
-/Composer/ @cwhitten @boydc2014 @a-b-r-o-w-n @beyackle @srinaath @tonyanziano @geoffcoxmsft @hatpick @benbrown @pavolum @tdurnford
+/Composer/ @cwhitten @boydc2014 @a-b-r-o-w-n @beyackle @srinaath @tonyanziano @geoffcoxmsft @hatpick @benbrown @pavolum @tdurnford @natalgar @vamsimodem
 
 /Composer/packages/adaptive-flow @yeze322 @cwhitten @boydc2014 @a-b-r-o-w-n
 
 /docs/ @cwhitten @boydc2014 @benbrown @geoffcoxmsft
 
-/extensions/azurePublish @benbrown @geoffcoxmsft @hatpick @tonyanziano
+/extensions/azurePublish @benbrown @geoffcoxmsft @hatpick @tonyanziano @natalgar @vamsimodem
 
 /extensions/pvaPublish @benbrown @geoffcoxmsft @hatpick @tonyanziano
+
+/extensions/azurePublishNew @geoffcoxmsft @hatpick @natalgar @vamsimodem

.github/workflows/main.yml

@@ -25,71 +25,31 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 14.15.5
-      #- name: Restore yarn cache
-      #  uses: actions/[email protected]
-      #  with:
-      #    path: ~/.cache/yarn
-      #    key: ${{ runner.os }}-yarn-new-${{ hashFiles(format('{0}{1}', github.workspace, '/Composer/yarn.lock')) }}
-      #    restore-keys: |
-      #      ${{ runner.os }}-yarn-new-
-      - name: Clear global yarn cache
-        run: yarn cache clean
-      - name: yarn --update-checksums
-        run: yarn --update-checksums
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - uses: actions/cache@v2
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - name: yarn
+        run: yarn
       - name: yarn build:dev
         run: yarn build:dev
       - name: yarn lint
         run: yarn lint:ci && yarn lint:extensions
-      - name: yarn test:coverage
-        run: yarn test:coverage
+      - name: yarn test:ci
+        run: yarn test:ci
       - name: Coveralls
         uses: coverallsapp/[email protected]
         continue-on-error: true
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: ./Composer/coverage/lcov.info
           base-path: ./Composer
-
-  botproject:
-    name: BotProject-dotnet
-    runs-on: windows-latest
-    timeout-minutes: 20
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set Dotnet Version
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "3.1.102" # SDK Version to use.
-      - name: dotnet build
-        run: dotnet build
-        working-directory: runtime/dotnet
-      - name: dotnet test
-        run: dotnet test
-        working-directory: runtime/dotnet/tests
-
-  nodejs:
-    name: BotProject-nodejs
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set Node Version
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14.15.5
-      - name: npm install
-        run: npm install
-        working-directory: runtime/node
-      - name: npm build
-        run: npm run build
-        working-directory: runtime/node
-      - name: npm test
-        run: npm run test
-        working-directory: runtime/node
   # docker-build:
   #   name: Docker Build
   #   timeout-minutes: 20

.vscode/settings.json

@@ -7,9 +7,7 @@
   },
   "files.exclude": {
     "**/.git": true,
-    "**/.DS_Store": true,
-    "**/node_modules": true,
-    "**/build": true
+    "**/.DS_Store": true
   },
   "eslint.packageManager": "yarn",
   "eslint.validate": [