Skip to content

Commit 7249a1b

Browse files
committed
Do not crossgen2 anywhere
- also add full Helix matrix to PR validation
1 parent 22709c2 commit 7249a1b

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

.azure/pipelines/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -746,14 +746,14 @@ stages:
746746
steps:
747747
# Build the shared framework
748748
- script: ./eng/build.cmd -ci -nobl -all -pack -arch x64
749-
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
749+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
750750
displayName: Build shared fx
751751
- script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
752-
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
752+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
753753
displayName: Restore interop projects
754754
- script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
755755
/p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
756-
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
756+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
757757
displayName: Run build.cmd helix target
758758
env:
759759
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

.azure/pipelines/helix-matrix.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
# We only want to run full helix matrix on main
2-
pr: none
1+
pr:
2+
autoCancel: true
3+
branches:
4+
include:
5+
- '*'
6+
37
trigger: none
8+
9+
# We only want to run full helix matrix on main and release/5.0
410
schedules:
511
# Cron timezone is UTC.
612
- cron: "0 */12 * * *"
@@ -33,14 +39,14 @@ jobs:
3339
steps:
3440
# Build the shared framework
3541
- script: ./eng/build.cmd -ci -nobl -all -pack -arch x64
36-
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
42+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
3743
displayName: Build shared fx
3844
- script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
39-
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
45+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
4046
displayName: Restore interop projects
4147
- script: .\eng\build.cmd -ci -nobl -noBuildRepoTasks -NoRestore -test -all -noBuildNative -projects eng\helix\helix.proj
4248
/p:IsHelixDaily=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true
43-
/p:RunTemplateTests=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
49+
/p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
4450
displayName: Run build.cmd helix target
4551
env:
4652
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -60,11 +66,11 @@ jobs:
6066
timeoutInMinutes: 480
6167
steps:
6268
- script: ./eng/build.sh --ci --nobl --pack --arch arm64
63-
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
69+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
6470
displayName: Build shared Fx
6571
- script: ./eng/build.sh --ci --nobl --arch arm64 --noBuildRepoTasks --no-build-nodejs --no-restore --test --all
6672
--projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true
67-
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
73+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
6874
displayName: Run build.sh helix arm64 target
6975
env:
7076
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

.azure/pipelines/quarantined-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ jobs:
5757
steps:
5858
# Build the shared framework
5959
- script: ./eng/build.cmd -ci -nobl -all -pack -arch x64
60-
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
60+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
6161
displayName: Build shared fx
6262
- script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
63-
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
63+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
6464
displayName: Restore interop projects
6565
- script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildJava -noBuildNative
6666
-projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true
6767
/p:BuildInteropProjects=true /p:RunTemplateTests=true
68-
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
68+
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
6969
displayName: Run build.cmd helix target
7070
continueOnError: true
7171
env:

0 commit comments

Comments
 (0)