Merge pull request #7959 from davidwengier/OneBuild

azure-pipelines.yml

@@ -197,20 +197,20 @@ stages:
             env:
               Token: $(dn-bot-dnceng-artifact-feeds-rw)
 
-        - script: eng\CIBuild.cmd
+        - script: eng\cibuild.cmd
+            -configuration $(_BuildConfig)
+            -msbuildEngine vs
+            -prepareMachine
             -restore
             -build
-            -sign
             -pack
             -publish
-            -configuration $(_BuildConfig)
-            -msbuildEngine dotnet
-            -prepareMachine
+            -sign
             $(_BuildArgs)
             $(_PublishArgs)
             $(_InternalRuntimeDownloadArgs)
           name: Build
-          displayName: Build
+          displayName: Build and Deploy
           condition: succeeded()
 
         - task: PublishBuildArtifacts@1
@@ -223,33 +223,6 @@ stages:
               artifactType: Container
               parallel: true
 
-        - script: eng\cibuild.cmd
-            -configuration $(_BuildConfig)
-            -msbuildEngine vs
-            -prepareMachine
-            -restore
-            -build
-            -pack
-            -sign
-            /p:BuildVsix=true
-            /p:BuildProjectReferences=false
-            $(_BuildArgs)
-            $(_PublishArgs)
-            $(_InternalRuntimeDownloadArgs)
-          name: Build_Vsix
-          displayName: Build and Deploy Vsix
-          condition: succeeded()
-
-        - task: PublishBuildArtifacts@1
-          displayName: Upload Build VSIX BinLog
-          condition: always()
-          continueOnError: true
-          inputs:
-              pathtoPublish: artifacts/log/$(_BuildConfig)/Build.binlog
-              artifactName: $(Agent.Os)_$(Agent.JobName) BuildVSIXBinLog
-              artifactType: Container
-              parallel: true
-
         - powershell: eng\SetupVSHive.ps1
           displayName: Setup VS Hive
 

eng/Build.props

@@ -6,9 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectToBuild Condition="'$(OS)'=='WINDOWS_NT' and '$(SdkTaskProjects)'=='' And '$(BuildVsix)' != 'true'" Include="$(MSBuildThisFileDirectory)..\Razor.sln" />
-    <ProjectToBuild Condition="'$(OS)'=='WINDOWS_NT' and '$(SdkTaskProjects)'=='' And '$(BuildVsix)' == 'true'" Include="$(MSBuildThisFileDirectory)..\src\Razor\src\Microsoft.VisualStudio.RazorExtension\Microsoft.VisualStudio.RazorExtension.csproj" />
-    <ProjectToBuild Condition="'$(OS)'=='WINDOWS_NT' and '$(SdkTaskProjects)'=='' And '$(BuildVsix)' == 'true' AND '$(BuildDependencyVsix)' != 'false'" Include="$(MSBuildThisFileDirectory)..\src\Razor\src\Microsoft.VisualStudio.RazorExtension.Dependencies\Microsoft.VisualStudio.RazorExtension.Dependencies.csproj" />
+    <ProjectToBuild Condition="'$(OS)'=='WINDOWS_NT' and '$(SdkTaskProjects)'==''" Include="$(MSBuildThisFileDirectory)..\Razor.sln" />
 
     <!-- Exclude VSIX projects on non-Windows -->
     <ProjectToBuild Condition="'$(OS)'!='WINDOWS_NT' and '$(SdkTaskProjects)'==''" Include="$(MSBuildThisFileDirectory)..\Razor.Slim.slnf" />

eng/pipelines/test-integration-job.yml

@@ -51,7 +51,6 @@ steps:
       -configuration ${{ parameters.configuration }}
       -msbuildEngine vs
       -prepareMachine
-      /p:BuildVsix=true
       /p:BuildDependencyVsix=false
       /p:BuildProjectReferences=false
     name: BuildVSIX

src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/README.md

@@ -2,4 +2,4 @@
 
 ## Running
 
-If you run the integration tests from the command line using something like "dotnet test" they may fail because the Extension was now deployed. To ensure the extension was deployed you can either launch tests through Visual Studio or first run a command like `eng\cibuild.cmd -configuration Debug -msbuildEngine vs -prepareMachine /p:BuildVsix=true`
+If you run the integration tests from the command line using something like "dotnet test" they may fail because the Extension was not deployed. To ensure the extension was deployed you can either launch tests through Visual Studio or first run a command like `eng\cibuild.cmd -configuration Debug -msbuildEngine vs -prepareMachine`