Skip to content

Commit 8fb56ff

Browse files
committed
Update buildtools container.
1 parent 0b17ca4 commit 8fb56ff

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

azure-pipelines-public.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ stages:
151151
- name: _HelixBuildConfig
152152
value: $(_BuildConfig)
153153
- name: HelixTargetQueues
154-
value: Windows.10.Amd64.Open;OSX.13.Amd64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-sqlserver-amd64
154+
value: Windows.10.Amd64.Open;OSX.13.Amd64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
155155
- name: _HelixAccessToken
156156
value: '' # Needed for public queues
157157
steps:

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ extends:
230230
- name: _HelixBuildConfig
231231
value: $(_BuildConfig)
232232
- name: HelixTargetQueues
233-
value: Windows.10.Amd64;OSX.13.Amd64;OSX.13.ARM64;Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-sqlserver-amd64
233+
value: Windows.10.Amd64;OSX.13.Amd64;OSX.13.ARM64;Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
234234
- name: _HelixAccessToken
235235
# Needed for internal queues
236236
value: $(HelixApiAccessToken)

eng/helix.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
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-20.04-helix-sqlserver-amd64</HelixTargetQueues>
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>
2121
<EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
2222
<HelixSource>efcore/localbuild/</HelixSource>
2323
<HelixBuild>t001</HelixBuild>
@@ -60,7 +60,7 @@
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 &amp;; sleep 120; </PreCommands>

0 commit comments

Comments
 (0)