Updates tests to add .NET 9 and to use .NET 8 as default

Author: ForestEckhardt

integration/buildpack_yml_test.go

@@ -57,7 +57,7 @@ func testBuildpackYML(t *testing.T, context spec.G, it spec.S) {
 
 			err = os.WriteFile(filepath.Join(source, "buildpack.yml"), []byte(`---
 dotnet-framework:
-  version: 6.0.0
+  version: 8.0.0
 `), 0666)
 			Expect(err).NotTo(HaveOccurred())
 

integration/default_test.go

@@ -77,16 +77,16 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
 				MatchRegexp(fmt.Sprintf(`%s \d+\.\d+\.\d+`, buildpackInfo.Buildpack.Name)),
 				"  Resolving ASP.NET Core Runtime version",
 				"    Candidate version sources (in priority order):",
-				`      runtimeconfig.json -> "6.0.0"`,
+				MatchRegexp(`      runtimeconfig.json -> "\d+\.\d+\.\d+"`),
 				`      <unknown>          -> ""`,
 				"",
 				"    No exact version match found; attempting version roll-forward",
 				"",
-				MatchRegexp(`    Selected ASP.NET Core Runtime version \(using runtimeconfig.json\): 6\.0\.\d+`),
+				MatchRegexp(`    Selected ASP.NET Core Runtime version \(using runtimeconfig.json\): \d+\.\d+\.\d+`),
 			))
 			Expect(logs).To(ContainLines(
 				"  Executing build process",
-				MatchRegexp(`    Installing ASP.NET Core Runtime 6\.0\.\d+`),
+				MatchRegexp(`    Installing ASP.NET Core Runtime \d+\.\d+\.\d+`),
 				MatchRegexp(`      Completed in ([0-9]*(\.[0-9]*)?[a-z]+)+`),
 				"",
 				"  Configuring launch environment",

integration/layer_reuse_test.go

@@ -102,12 +102,12 @@ func testLayerReuse(t *testing.T, context spec.G, it spec.S) {
 			Expect(logs).To(ContainLines(
 				"  Resolving ASP.NET Core Runtime version",
 				"    Candidate version sources (in priority order):",
-				`      runtimeconfig.json -> "6.0.0"`,
+				MatchRegexp(`      runtimeconfig.json -> "\d+\.\d+\.\d+"`),
 				`      <unknown>          -> ""`,
 				"",
 				"    No exact version match found; attempting version roll-forward",
 				"",
-				MatchRegexp(`    Selected ASP.NET Core Runtime version \(using runtimeconfig.json\): 6\.0\.\d+`),
+				MatchRegexp(`    Selected ASP.NET Core Runtime version \(using runtimeconfig.json\): \d+\.\d+\.\d+`),
 			))
 			Expect(logs).To(ContainLines(
 				MatchRegexp(fmt.Sprintf("  Reusing cached layer /layers/%s/dotnet-core-aspnet-runtime", strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_"))),
@@ -193,7 +193,7 @@ func testLayerReuse(t *testing.T, context spec.G, it spec.S) {
 					settings.Buildpacks.BuildPlan.Online,
 				).
 				WithEnv(map[string]string{
-					"BP_DOTNET_FRAMEWORK_VERSION": "6.*",
+					"BP_DOTNET_FRAMEWORK_VERSION": "9.*",
 				}).
 				Execute(name, source)
 			Expect(err).NotTo(HaveOccurred(), logs.String())
@@ -208,8 +208,8 @@ func testLayerReuse(t *testing.T, context spec.G, it spec.S) {
 			Expect(logs).To(ContainLines(
 				"  Resolving ASP.NET Core Runtime version",
 				"    Candidate version sources (in priority order):",
-				`      BP_DOTNET_FRAMEWORK_VERSION -> "6.*"`,
-				`      runtimeconfig.json          -> "6.0.0"`,
+				`      BP_DOTNET_FRAMEWORK_VERSION -> "9.*"`,
+				MatchRegexp(`      runtimeconfig.json          -> "\d+\.\d+\.\d+"`),
 				`      <unknown>                   -> ""`,
 				"",
 				MatchRegexp(`    Selected ASP.NET Core Runtime version \(using BP_DOTNET_FRAMEWORK_VERSION\): \d+\.\d+\.\d+`),

integration/runtimeconfig_noop_test.go

@@ -43,7 +43,7 @@ func testRuntimeconfigNoop(t *testing.T, context spec.G, it spec.S) {
 			source, err = occam.Source(filepath.Join("testdata", "default"))
 			Expect(err).NotTo(HaveOccurred())
 
-			Expect(os.WriteFile(filepath.Join(source, "fde_dotnet_6.runtimeconfig.json"), []byte(`{
+			Expect(os.WriteFile(filepath.Join(source, "default.runtimeconfig.json"), []byte(`{
   "runtimeOptions": {
     "configProperties": {
       "System.GC.Server": true,
@@ -97,7 +97,7 @@ func testRuntimeconfigNoop(t *testing.T, context spec.G, it spec.S) {
 			source, err = occam.Source(filepath.Join("testdata", "default"))
 			Expect(err).NotTo(HaveOccurred())
 
-			Expect(os.Remove(filepath.Join(source, "fde_dotnet_6.runtimeconfig.json"))).To(Succeed())
+			Expect(os.Remove(filepath.Join(source, "default.runtimeconfig.json"))).To(Succeed())
 		})
 
 		it.After(func() {

…mpatible/fde_dotnet_6.runtimeconfig.json …/backwards_compatible.runtimeconfig.jsonintegration/testdata/backwards_compatible/fde_dotnet_6.runtimeconfig.json renamed to integration/testdata/backwards_compatible/backwards_compatible.runtimeconfig.json integration/testdata/backwards_compatible/fde_dotnet_6.runtimeconfig.json renamed to integration/testdata/backwards_compatible/backwards_compatible.runtimeconfig.json

@@ -1,14 +1,14 @@
 {
   "runtimeOptions": {
-    "tfm": "net6.0",
+    "tfm": "net8.0",
     "frameworks": [
       {
         "name": "Microsoft.NETCore.App",
-        "version": "6.0.0"
+        "version": "8.0.0"
       },
       {
         "name": "Microsoft.AspNetCore.App",
-        "version": "6.0.0"
+        "version": "8.0.0"
       }
     ],
     "configProperties": {
@@ -17,4 +17,4 @@
       "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
     }
   }
-}
+}

…/default/fde_dotnet_6.runtimeconfig.json …tdata/default/default.runtimeconfig.jsonintegration/testdata/default/fde_dotnet_6.runtimeconfig.json renamed to integration/testdata/default/default.runtimeconfig.json integration/testdata/default/fde_dotnet_6.runtimeconfig.json renamed to integration/testdata/default/default.runtimeconfig.json

@@ -1,14 +1,14 @@
 {
   "runtimeOptions": {
-    "tfm": "net6.0",
+    "tfm": "net8.0",
     "frameworks": [
       {
         "name": "Microsoft.NETCore.App",
-        "version": "6.0.0"
+        "version": "8.0.0"
       },
       {
         "name": "Microsoft.AspNetCore.App",
-        "version": "6.0.0"
+        "version": "8.0.0"
       }
     ],
     "configProperties": {
@@ -17,4 +17,4 @@
       "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
     }
   }
-}
+}