cflinuxfs4 compatible integration tests

- update all general fixtures to use dotnet 6.x as 3.x is not supported
on cflinuxfs4
- Skip 3.x specific tests on cflinuxfs4

fixtures/fsharp/README.md

@@ -1,4 +1,4 @@
-This app was generated with the .NET Core CLI version 3.1.413 by running:
+This app was generated with the .NET Core CLI by running:
 ```
 dotnet new web -lang "F#" -o fsharp
 ```

fixtures/fsharp/fsharp.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

fixtures/source_apps/multiple_projects_msbuild/src/asp_web_app/asp_web_app.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp6.0</TargetFramework>
     <DebugType>portable</DebugType>
     <AssemblyName>asp_web_app</AssemblyName>
     <OutputType>Exe</OutputType>

fixtures/source_apps/multiple_projects_msbuild/src/console_app/console_app.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp6.0</TargetFramework>
     <AssemblyName>console_app</AssemblyName>
   </PropertyGroup>
 

fixtures/source_apps/with_dot_in_name/with_dot_in_name.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp6.0</TargetFramework>
     <AssemblyName>some_other.name</AssemblyName>
   </PropertyGroup>
 

fixtures/supply/dotnet_app/msbuild_self_contained.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp6.0</TargetFramework>
     <AssemblyName>msbuild_self_contained</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>msbuild_self_contained</PackageId>

src/dotnetcore/integration/default_test.go

@@ -2,6 +2,7 @@ package integration_test
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -34,11 +35,14 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 		bpDir, err := cutlass.FindRoot()
 		Expect(err).NotTo(HaveOccurred())
 
-		latest31RuntimeVersion = GetLatestDepVersion(t, "dotnet-runtime", "3.1.x", bpDir)
+		// cflinuxfs4 does not support 3.1
+		if os.Getenv("CF_STACK") != "cflinuxfs4" {
+			latest31RuntimeVersion = GetLatestDepVersion(t, "dotnet-runtime", "3.1.x", bpDir)
 
-		latest31ASPNetVersion = GetLatestDepVersion(t, "dotnet-aspnetcore", "3.1.x", bpDir)
+			latest31ASPNetVersion = GetLatestDepVersion(t, "dotnet-aspnetcore", "3.1.x", bpDir)
 
-		latest31SDKVersion = GetLatestDepVersion(t, "dotnet-sdk", "3.1.x", bpDir)
+			latest31SDKVersion = GetLatestDepVersion(t, "dotnet-sdk", "3.1.x", bpDir)
+		}
 
 		latest6RuntimeVersion = GetLatestDepVersion(t, "dotnet-runtime", "6.0.x", bpDir)
 
@@ -64,6 +68,11 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 		})
 
 		context("with dotnet sdk 3.1 in global json", func() {
+			it.Before(func() {
+				// 3.1 not supported on cflinuxfs4
+				SkipOnCflinuxfs4(t)
+			})
+
 			context("when the sdk exists", func() {
 				it.Before(func() {
 					app = ReplaceFileTemplate(t, filepath.Join(settings.FixturesPath, "source_apps", "simple_global_json"), "global.json", "sdk_version", latest31SDKVersion)
@@ -169,6 +178,8 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 		context("when an app has a Microsoft.AspNetCore.App", func() {
 			context("with version 3.1", func() {
 				it.Before(func() {
+					// 3.1 not supported on cflinuxfs4
+					SkipOnCflinuxfs4(t)
 					app = cutlass.New(filepath.Join(settings.FixturesPath, "source_apps", "aspnet_package_reference"))
 					app.Disk = "2G"
 				})
@@ -201,6 +212,8 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 		context("when the app has Microsoft.AspNetCore.All", func() {
 			context("with version 3.1", func() {
 				it.Before(func() {
+					// 3.1 not supported on cflinuxfs4
+					SkipOnCflinuxfs4(t)
 					app = cutlass.New(filepath.Join(settings.FixturesPath, "source_apps", "source_3.1"))
 					app.Disk = "1G"
 				})
@@ -265,6 +278,8 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 	context("deploying a framework-dependent app", func() {
 		context("with Microsoft.AspNetCore.App 3.1", func() {
 			it.Before(func() {
+				// 3.1 not supported on cflinuxfs4
+				SkipOnCflinuxfs4(t)
 				app = cutlass.New(filepath.Join(settings.FixturesPath, "fdd_apps", "simple"))
 				app.Disk = "2G"
 			})

src/dotnetcore/integration/init_test.go

@@ -167,3 +167,9 @@ func ReplaceFileTemplate(t *testing.T, pathToFixture, file, templateVar, replace
 
 	return cutlass.New(dir)
 }
+
+func SkipOnCflinuxfs4(t *testing.T) {
+	if os.Getenv("CF_STACK") == "cflinuxfs4" {
+		t.Skip("Skipping test not relevant for stack cflinuxfs4")
+	}
+}

src/dotnetcore/integration/supply_test.go

@@ -45,6 +45,8 @@ func testSupply(t *testing.T, context spec.G, it spec.S) {
 	context("with no csproj file", func() {
 		context("the app is pushed once", func() {
 			it.Before(func() {
+				// Staticfile does not support cflinuxfs4 yet
+				SkipOnCflinuxfs4(t)
 				app = cutlass.New(filepath.Join(settings.FixturesPath, "supply", "staticfile_app"))
 				app.Buildpacks = []string{
 					"dotnet_core_buildpack",