Added missing PgoTerm logic for Directory.Build.props. Fix AoT worklo…

…ad line with buildConfiguration. Trying to fix TemplateEngine test project specification.
dotnet · ViktorHofer · May 22, 2024 · May 3, 2024 · May 3, 2024 · May 3, 2024
commit a9343314a0813595b4f68c3f37bf53d08f1453ed
@@ -85,10 +85,7 @@ extends:
         image: 1es-windows-2022
         os: windows
       componentgovernance:
-        # Setting to Critical as aspnet templates currently cause a High alert (default alert level is High).
-        # See: https://dev.azure.com/dnceng/internal/_componentGovernance/dotnet-sdk/alert/9439021?typeId=6422467
         # Refdoc: https://docs.opensource.microsoft.com/tools/cg/component-detection/variables/
-        # alertWarningLevel: Critical
         ignoreDirectories: artifacts, .packages
 
     stages:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -56,6 +56,11 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(PgoInstrument)' == 'true'">
+    <SkipBuildingInstallers>true</SkipBuildingInstallers>
+    <PgoTerm>-pgo</PgoTerm>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateProgramFile>false</GenerateProgramFile>

@@ -109,14 +109,14 @@ jobs:
     - ${{ if eq(parameters.runTests, true) }}:
       - ${{ if eq(parameters.runAoTTests, true) }}:
         # For the reason this is here, see: https://github.com/dotnet/sdk/issues/22655
-        - script: $(Build.SourcesDirectory)/artifacts/bin/redist-installer/$(_BuildConfig)/dotnet/dotnet workload install wasm-tools --skip-manifest-update
+        - script: $(Build.SourcesDirectory)/artifacts/bin/redist-installer/$(buildConfiguration)/dotnet/dotnet workload install wasm-tools --skip-manifest-update
           displayName: Install wasm-tools Workload
       - ${{ if eq(parameters.pool.os, 'windows') }}:
         # TODO: Change _CustomHelixTargetQueue name
         - powershell: eng/common/build.ps1
             -restore -test -ci -prepareMachine -nativeToolsOnMachine
             -configuration $(buildConfiguration)
-            -projects "${{ parameters.testProjects }}"
+            -projects ${{ parameters.testProjects }}
             /p:Architecture=${{ parameters.buildArchitecture }}
             ${{ parameters.runtimeSourceProperties }}
             /p:_CustomHelixTargetQueue=${{ parameters.helixTargetQueue }}
@@ -132,7 +132,7 @@ jobs:
         - script: eng/common/build.sh
             -restore -test -ci -prepareMachine
             -configuration $(buildConfiguration)
-            -projects "${{ parameters.testProjects }}"
+            -projects ${{ parameters.testProjects }}
             /p:Architecture=${{ parameters.buildArchitecture }}
             /p:Rid=${{ parameters.runtimeIdentifier }}
             ${{ parameters.osProperties }}

@@ -9,7 +9,4 @@ variables:
   _SignType: test
   _TeamName: DotNetCore
   # This ends up being set by the DotNet-HelixApi-Access variable group when running internally.
-  HelixApiAccessToken: ''
-
-  ############### OTHER ###############
-  # Codeql.ExcludePathPatterns: artifacts, .packages
+  HelixApiAccessToken: ''