File tree Expand file tree Collapse file tree 3 files changed +2
-12
lines changed Expand file tree Collapse file tree 3 files changed +2
-12
lines changed Original file line number Diff line number Diff line change @@ -140,7 +140,7 @@ stages:
140140 parallel : true
141141
142142 - job : Helix
143- timeoutInMinutes : 180
143+ timeoutInMinutes : 300
144144 pool :
145145 name : $(DncEngPublicBuildPool)
146146 demands : ImageOverride -equals 1es-windows-2022-open
@@ -169,5 +169,4 @@ stages:
169169 HelixAccessToken : $(_HelixAccessToken)
170170 SYSTEM_ACCESSTOKEN : $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
171171 MSSQL_SA_PASSWORD : " PLACEHOLDER"
172- COMPlus_EnableWriteXorExecute : 0 # Work-around for https://github.com/dotnet/runtime/issues/70758
173172 DotNetBuildsInternalReadSasToken : $(dotnetbuilds-internal-container-read-token)
Original file line number Diff line number Diff line change @@ -219,7 +219,7 @@ extends:
219219 path : artifacts/TestResults/$(_BuildConfig)/
220220 artifact : $(Agent.Os)_$(Agent.JobName) TestResults
221221 - job : Helix
222- timeoutInMinutes : 180
222+ timeoutInMinutes : 300
223223 pool :
224224 name : $(DncEngInternalBuildPool)
225225 demands : ImageOverride -equals 1es-windows-2022
@@ -262,8 +262,6 @@ extends:
262262 # We need to set this env var to publish helix results to Azure Dev Ops
263263 SYSTEM_ACCESSTOKEN : $(System.AccessToken)
264264 MSSQL_SA_PASSWORD : " PLACEHOLDER"
265- # Work-around for https://github.com/dotnet/runtime/issues/70758
266- COMPlus_EnableWriteXorExecute : 0
267265 DotNetBuildsInternalReadSasToken : $(dotnetbuilds-internal-container-read-token)
268266 - ${{ if notin(variables['Build.Reason'], 'PullRequest') }} :
269267 - template : /eng/common/templates-official/post-build/post-build.yml@self
Original file line number Diff line number Diff line change 4545 <XUnitProject Remove =" $(RepoRoot)/test/EFCore.NativeAotTests/*.csproj" />
4646 </ItemGroup >
4747
48- <!-- Work-around for https://github.com/dotnet/runtime/issues/70758 -->
49- <ItemGroup Condition = " '$(HelixTargetQueue.StartsWith(`OSX`))'" >
50- <XUnitProject Update =" $(RepoRoot)/test/EFCore.InMemory.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.Sqlite.FunctionalTests/*.csproj;$(RepoRoot)/test/ef.Tests/*.csproj" >
51- <PreCommands >$(PreCommands); export COMPlus_EnableWriteXorExecute=0</PreCommands >
52- </XUnitProject >
53- </ItemGroup >
54-
5548 <!-- Start LocalDb instance for test projects which uses SqlServer on windows -->
5649 <ItemGroup Condition = " '$(HelixTargetQueue.StartsWith(`Windows`))'" >
5750 <XUnitProject Update =" $(SqlServerTests);$(RepoRoot)/test/EFCore.CrossStore.FunctionalTests/*.csproj" >
You can’t perform that action at this time.
0 commit comments