Fix VSIX deployment in build.cmd scenairos (#6200)

Fix VSIX deployment in build.cmd scenairos

azure-pipelines.yml

@@ -182,27 +182,42 @@ stages:
               arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
             env:
               Token: $(dn-bot-dnceng-artifact-feeds-rw)
-        - script: eng\common\cibuild.cmd
+        - script: eng\CIBuild.cmd
+            -restore
+            -build
+            -sign
+            -pack
+            -publish
             -configuration $(_BuildConfig)
             -msbuildEngine dotnet
             -prepareMachine
-            -integrationTest
             $(_BuildArgs)
             $(_PublishArgs)
             $(_InternalRuntimeDownloadArgs)
           name: Build
           displayName: Build
           condition: succeeded()
-        - script: eng\common\cibuild.cmd
+        - script: eng\cibuild.cmd
             -configuration $(_BuildConfig)
             -prepareMachine
+            -restore
+            -build
+            -pack
             /p:BuildVsix=true
             /p:BuildProjectReferences=false
             $(_BuildArgs)
             $(_PublishArgs)
             $(_InternalRuntimeDownloadArgs)
           name: Build_Vsix
-          displayName: Build Vsix
+          displayName: Build and Deploy Vsix
+          condition: succeeded()
+        - script: eng\CIBuild.cmd
+            -configuration $(_BuildConfig)
+            -prepareMachine
+            -test
+            -integrationTest
+          name: Run_Tests
+          displayName: Run Unit and Integration tests
           condition: succeeded()
         # Run VSCode functional tests
         # - powershell: |

eng/CIBuild.cmd

@@ -0,0 +1,2 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0\common\Build.ps1""" -ci %*"

eng/pipelines/test-integration-job.yml

@@ -9,17 +9,42 @@ parameters:
 steps:
   - ${{ if eq(parameters.shallowCheckout, true) }}:
     - template: checkout-windows-task.yml
+
   - task: NodeTool@0
     displayName: Install Node 10.x
     inputs:
       versionSpec: 10.x
-  - script: eng\common\cibuild.cmd
+
+  - script: eng\cibuild.cmd
+      -configuration ${{ parameters.configuration }}
+      -msbuildEngine dotnet
+      -prepareMachine
+      -restore
+      -build
+      -pack
+      -sign
+      -publish
+    name: Build
+    displayName: Build
+    condition: succeeded()
+
+  - script: eng\cibuild.cmd
+      -configuration ${{ parameters.configuration }}
+      -msbuildEngine dotnet
+      -prepareMachine
+      /p:BuildVsix=true
+      /p:BuildProjectReferences=false
+    name: BuildVSIX
+    displayName: Build and Deploy VSIX
+    condition: succeeded()
+
+  - script: eng\cibuild.cmd
       -configuration ${{ parameters.configuration }}
       -msbuildEngine dotnet
       -prepareMachine
       -integrationTest
-    name: BuildAndTest
-    displayName: Build and Test
+    name: RunIntegrationTests
+    displayName: Run Integration Tests
     condition: succeeded()
 
   - task: PublishTestResults@2

src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/OnEnterRulesTests.cs

@@ -8,7 +8,7 @@ namespace Microsoft.VisualStudio.Razor.IntegrationTests;
 
 public class OnEnterRulesTests : AbstractRazorEditorTest
 {
-    [IdeFact(Skip = "VSIX Deployment issues")]
+    [IdeFact]
     public async Task OnEnterRules_BetweenStartAndEnd()
     {
         // Arrange
@@ -28,7 +28,7 @@ public class OnEnterRulesTests : AbstractRazorEditorTest
 ", HangMitigatingCancellationToken);
     }
 
-    [IdeFact(Skip = "VSIX Deployment issues")]
+    [IdeFact]
     public async Task OnEnterRules_AtEndOfTag()
     {
         // Arrange
@@ -48,7 +48,7 @@ A
 ", HangMitigatingCancellationToken);
     }
 
-    [IdeFact(Skip = "VSIX Deployment issues")]
+    [IdeFact]
     public async Task OnEnterRules_BeforeAttribute()
     {
         // Arrange
@@ -68,7 +68,7 @@ A
 ", HangMitigatingCancellationToken);
     }
 
-    [IdeFact(Skip = "VSIX Deployment issues")]
+    [IdeFact]
     public async Task OnEnterRules_EmptyAttribute()
     {
         // Arrange
@@ -87,7 +87,7 @@ A
 ", HangMitigatingCancellationToken);
     }
 
-    [IdeFact(Skip = "VSIX Deployment issues")]
+    [IdeFact]
     public async Task OnEnterRules_DoubleQuote()
     {
         // Arrange
@@ -106,7 +106,7 @@ A
 ", HangMitigatingCancellationToken);
     }
 
-    [IdeFact(Skip = "VSIX Deployment issues")]
+    [IdeFact]
     public async Task OnEnterRules_DirectiveAttribute()
     {
         // Arrange
@@ -125,7 +125,7 @@ A
 ", HangMitigatingCancellationToken);
     }
 
-    [IdeFact(Skip = "VSIX Deployment issues")]
+    [IdeFact]
     public async Task OnEnterRules_UnfinishedTag()
     {
         // Arrange