Skip to content

Update ubuntu version #24650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 27, 2022
Merged

Update ubuntu version #24650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ee7889
Update .vsts-ci.yml
marcpopMSFT Mar 31, 2022
2ab9b8a
Try a different build image
marcpopMSFT Apr 19, 2022
76cc614
Fix tests to include 20.04 ubuntu
marcpopMSFT Apr 19, 2022
d058827
Disable these tests as they are failing on ubuntu 20.04 for some reason.
marcpopMSFT Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,18 @@ stages:

- template: /eng/build.yml
parameters:
agentOs: Ubuntu_18_04
agentOs: Ubuntu_20_04
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
demands: ImageOverride -equals 1es-ubuntu-2004-open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
demands: ImageOverride -equals 1es-ubuntu-2004
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Ubuntu.1804.Amd64.Open
helixTargetQueue: Ubuntu.2004.Amd64.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Ubuntu.1804.Amd64
helixTargetQueue: Ubuntu.2004.Amd64
strategy:
matrix:
Build_Release:
Expand Down
2 changes: 1 addition & 1 deletion src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<TargetFramework>netcoreapp2.2</TargetFramework>
<AssemblyName>dotnet-hello</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
<IsPackable>true</IsPackable>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<TargetFramework>netcoreapp2.2</TargetFramework>
<AssemblyName>dotnet-hello</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
<IsPackable>true</IsPackable>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Assets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Assets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Assets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Assets/TestProjects/AppWithLibraryAndRid/App/App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
<RuntimeIdentifiers>osx.10.11-x64;osx.10.12-x64;osx.10.14-x64;osx.10.15-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.14.04-x64;win10-x64;win81-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>osx.10.11-x64;osx.10.12-x64;osx.10.14-x64;osx.10.15-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;ubuntu.14.04-x64;win10-x64;win81-x64</RuntimeIdentifiers>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>

Expand Down
1 change: 1 addition & 0 deletions src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public static string InvokeNativeCodeAndReturnAString()
{
switch(GetRidStoredInAssemblyDescriptionAttribute())
{
case "'ubuntu.20.04-x64'":
case "'ubuntu.18.04-x64'":
case "'ubuntu.16.04-x64'":
case "'ubuntu.14.04-x64'":
Expand Down
2 changes: 1 addition & 1 deletion src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/LibraryWithRids.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.4</TargetFramework>
<RuntimeIdentifiers>osx.10.11-x64;osx.10.12-x64;osx.10.14-x64;osx.10.15-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.14.04-x64;win10-x64;win81-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>osx.10.11-x64;osx.10.12-x64;osx.10.14-x64;osx.10.15-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;ubuntu.14.04-x64;win10-x64;win81-x64</RuntimeIdentifiers>
<Description>'$(RuntimeIdentifier)'</Description>
</PropertyGroup>
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public static string InvokeNativeCodeAndReturnAString()
{
switch(GetRidStoredInAssemblyDescriptionAttribute())
{
case "'ubuntu.20.04-x64'":
case "'ubuntu.18.04-x64'":
case "'ubuntu.16.04-x64'":
case "'ubuntu.14.04-x64'":
Expand Down
2 changes: 1 addition & 1 deletion src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Tests/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula()
.StartWith(firstTimeNonVerbUseMessage);
}

[Fact]
[WindowsOnlyFact]
public void ItShowsTheAppropriateMessageToTheUser()
{

Expand Down Expand Up @@ -160,7 +160,7 @@ public void ItDoesNotCreateAFirstUseSentinelFileNorAnAspNetCertificateSentinelFi
homeFolder.Should().NotExist();
}

[Fact]
[WindowsOnlyFact]
public void ItShowsTheTelemetryNoticeWhenInvokingACommandAfterInternalReportInstallSuccessHasBeenInvoked()
{
var dotnetFirstTime = new DotNetFirstTime();
Expand Down