Fix tests to include 20.04 ubuntu

marcpopMSFT · marcpopMSFT · commit 76cc61430a4f · 2022-04-19T17:08:51.000-07:00
diff --git a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
@@ -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>
diff --git a/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
@@ -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>
diff --git a/src/Assets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj b/src/Assets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj
@@ -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>
diff --git a/src/Assets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj b/src/Assets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj
@@ -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>
diff --git a/src/Assets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj b/src/Assets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj
@@ -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>
diff --git a/src/Assets/TestProjects/AppWithLibraryAndRid/App/App.csproj b/src/Assets/TestProjects/AppWithLibraryAndRid/App/App.csproj
@@ -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>
 
diff --git a/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs b/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs
@@ -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'":
diff --git a/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/LibraryWithRids.csproj b/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/LibraryWithRids.csproj
@@ -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>
diff --git a/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs b/src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs
@@ -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'":
diff --git a/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ public static string InvokeNativeCodeAndReturnAString()`
`10`	`10`	`{`
`11`	`11`	`switch(GetRidStoredInAssemblyDescriptionAttribute())`
`12`	`12`	`{`
	`13`	`+ case "'ubuntu.20.04-x64'":`
`13`	`14`	`case "'ubuntu.18.04-x64'":`
`14`	`15`	`case "'ubuntu.16.04-x64'":`
`15`	`16`	`case "'ubuntu.14.04-x64'":`