File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -210,7 +210,7 @@ extends:
210210 - name : _HelixBuildConfig
211211 value : $(_BuildConfig)
212212 - name : HelixTargetQueues
213- value : Windows.10.Amd64;OSX.15.Amd64;OSX.15.ARM64;Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
213+ value : Windows.10.Amd64;OSX.15.Amd64;OSX.15.ARM64;Ubuntu.2204.Amd64.XL @mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
214214 - name : _HelixAccessToken
215215 # Needed for internal queues
216216 value : $(HelixApiAccessToken)
Original file line number Diff line number Diff line change @@ -152,7 +152,7 @@ stages:
152152 - name : _HelixBuildConfig
153153 value : $(_BuildConfig)
154154 - name : HelixTargetQueues
155- value : Windows.10.Amd64.Open;OSX.15.Amd64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
155+ value : Windows.10.Amd64.Open;OSX.15.Amd64.Open;Ubuntu.2204.Amd64.XL. Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
156156 - name : _HelixAccessToken
157157 value : ' ' # Needed for public queues
158158 steps :
Original file line number Diff line number Diff line change 1717
1818 <PropertyGroup Condition = " '$(SYSTEM_ACCESSTOKEN)' == ''" >
1919 <!-- Local build outside of Azure Pipeline -->
20- <HelixTargetQueues Condition = " '$(HelixTargetQueues)' == ''" >Windows.10.Amd64.Open;OSX.1200.Amd64.Open;OSX.1200.ARM64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64</HelixTargetQueues >
20+ <HelixTargetQueues Condition = " '$(HelixTargetQueues)' == ''" >Windows.10.Amd64.Open;OSX.1200.Amd64.Open;OSX.1200.ARM64.Open;Ubuntu.2204.Amd64.XL. Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64</HelixTargetQueues >
2121 <EnableAzurePipelinesReporter >false</EnableAzurePipelinesReporter >
2222 <HelixSource >efcore/localbuild/</HelixSource >
2323 <HelixBuild >t001</HelixBuild >
6060 </ItemGroup >
6161
6262 <!-- Start SqlServer instance for test projects which uses SqlServer on docker. Also remove other projects as they will be run outside of docker. -->
63- <ItemGroup Condition = " '$(HelixTargetQueue.Contains(`ubuntu-18 .04-helix-sqlserver-amd64`))'" >
63+ <ItemGroup Condition = " '$(HelixTargetQueue.Contains(`ubuntu-22 .04-helix-sqlserver-amd64`))'" >
6464 <XUnitProject Remove =" $(RepoRoot)/test/**/*.csproj" />
6565 <XUnitProject Include =" $(SqlServerTests);$(RepoRoot)/test/EFCore.CrossStore.FunctionalTests/*.csproj" >
6666 <PreCommands >$(PreCommands); export MSSQL_SA_PASSWORD=$(MSSQL_SA_PASSWORD); export Test__SqlServer__DefaultConnection="Server=localhost;;Database=master;;User=sa;;Password=$(MSSQL_SA_PASSWORD);;Connect Timeout=60;;ConnectRetryCount=0;;TrustServerCertificate=True"; /opt/mssql/bin/sqlservr --accept-eula & ; sleep 120; </PreCommands >
6767 </XUnitProject >
6868 </ItemGroup >
6969
7070 <!-- Remove test projects which requires SqlServer from Ubuntu/OSX. -->
71- <ItemGroup Condition = " '$(HelixTargetQueue.StartsWith(`OSX`))' OR '$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.Open' OR '$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64'" >
71+ <ItemGroup Condition = " '$(HelixTargetQueue.StartsWith(`OSX`))' OR '$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.XL. Open' OR '$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.XL '" >
7272 <XUnitProject Remove =" $(SqlServerTests)" />
7373 </ItemGroup >
7474
You can’t perform that action at this time.
0 commit comments