chore: Merge 4.14 To Main

.eslintrc.json

@@ -8,6 +8,7 @@
   "plugins": ["prettier"],
   "rules": {
     "prettier/prettier": "error"
-  }
+  },
+  "root": true
 }
 

.gitignore

@@ -384,6 +384,9 @@ experimental/generator-dotnet-yeoman/node_modules
 # Allow the root-level /packages/ directory or it gets confused with NuGet directories
 !/[Pp]ackages/*
 
+# Allow the packages directory under tests
+!/tests/unit/[Pp]ackages/*
+
 # Ignore correct yarn files (no zero install support)
 .yarn/*
 !.yarn/patches

build/yaml/templates/component-template.yml

@@ -33,7 +33,6 @@ stages:
       - job: build_test_dotnet
         displayName: Build and test .csproj with dotnet
         steps:
-        - template: dotnet-install-sdk-steps.yml
         - template: dotnet-build-test-steps.yml
 
   - stage: stage_package_nuget
@@ -46,7 +45,6 @@ stages:
         condition: eq(variables.ComponentType, 'codeExtension')
         steps:
         - template: nuget-versioning-steps.yml
-        - template: dotnet-install-sdk-steps.yml
         - template: dotnet-package-steps.yml
         - template: nuget-signing-steps.yml
       - job: job_pack_nuspec

build/yaml/templates/dotnet-build-test-steps.yml

@@ -1,4 +1,14 @@
 steps:
+- task: UseDotNet@2
+  displayName: 'Use .Net Core sdk 2.1.x'
+  inputs:
+    version: 2.1.x
+
+- task: UseDotNet@2
+  displayName: 'Use .Net Core sdk 3.1.x'
+  inputs:
+    version: 3.1.x
+
 - task: DotNetCoreCLI@2
   displayName: 'Run `dotnet restore`'
   inputs:

build/yaml/templates/dotnet-package-steps.yml

@@ -1,4 +1,9 @@
 steps:  
+- task: UseDotNet@2
+  displayName: 'Use .Net Core sdk 2.1.x'
+  inputs:
+    version: 2.1.x
+
 - task: DotNetCoreCLI@2
   displayName: 'Run `dotnet publish`'
   inputs:

build/yaml/templates/npm-versioning-steps.yml

@@ -13,7 +13,7 @@ steps:
       $deploymentRing = $deploymentRingOverride;
     }
 
-    if ($deploymentRing.ToLowerInvariant() -eq "rc") {
+    if (($deploymentRing.ToLowerInvariant() -eq "rc") -or ($deploymentRing.ToLowerInvariant() -eq "preview")) {
       $releaseCandidateNumber = "$env:RELEASECANDIDATENUMBER";
       "Release Candidate Number = $releaseCandidateNumber";
 

build/yaml/templates/nuget-signing-steps.yml

@@ -2,11 +2,6 @@
 # Extra steps are required to sign the binaries of the code extensions.
 
 steps:
-- task: UseDotNet@2
-  displayName: 'Use .Net Core sdk 2.1.x'
-  inputs:
-    version: 2.1.x
-
 - task: CopyFiles@2
   displayName: 'Copy packages to Signing'
   inputs:

build/yaml/templates/nuget-versioning-steps.yml

@@ -13,7 +13,7 @@ steps:
       $deploymentRing = $deploymentRingOverride;
     }
 
-    if ($deploymentRing.ToLowerInvariant() -eq "rc") {
+    if (($deploymentRing.ToLowerInvariant() -eq "rc") -or ($deploymentRing.ToLowerInvariant() -eq "preview")) {
       $releaseCandidateNumber = "$env:RELEASECANDIDATENUMBER";
       "Release Candidate Number = $releaseCandidateNumber";