Makes changes needed for 1.0 release

Author: ForestEckhardt

build.go

@@ -8,7 +8,6 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/Masterminds/semver"
 	"github.com/paketo-buildpacks/packit/v2"
 	"github.com/paketo-buildpacks/packit/v2/cargo"
 	"github.com/paketo-buildpacks/packit/v2/chronos"
@@ -86,40 +85,15 @@ func Build(
 
 		logger.Process("Resolving ASP.NET Core Runtime version")
 
-		// Convert dotnet-runtime and dotnet-aspnetcore BuildpackPlanEntries into
-		// dotnet-core-aspnet-runtime entries and then print a warning
-		var warn bool
-		for i := range context.Plan.Entries {
-			if context.Plan.Entries[i].Name == "dotnet-runtime" || context.Plan.Entries[i].Name == "dotnet-aspnetcore" {
-				warn = true
-				context.Plan.Entries[i].Name = "dotnet-core-aspnet-runtime"
-			}
-		}
-
-		if warn {
-			nextMajorVersion := semver.MustParse(context.BuildpackInfo.Version).IncMajor()
-			logger.Subprocess("WARNING: Requiring dotnet-runtime or dotnet-aspnetcore in your build plan will be deprecated soon in .NET Core Buildpack v%s.", nextMajorVersion.String())
-			logger.Subprocess("Please require dotnet-core-aspnet-runtime in your build plan going forward.")
-			logger.Break()
-		}
-
 		priorities := []interface{}{
 			"BP_DOTNET_FRAMEWORK_VERSION",
-			"buildpack.yml",
 			"runtimeconfig.json",
 			regexp.MustCompile(`.*\.(cs)|(fs)|(vb)proj`),
 		}
+
 		entry, sortedEntries := entries.Resolve("dotnet-core-aspnet-runtime", context.Plan.Entries, priorities)
 		logger.Candidates(sortedEntries)
 
-		source, _ := entry.Metadata["version-source"].(string)
-		if source == "buildpack.yml" {
-			nextMajorVersion := semver.MustParse(context.BuildpackInfo.Version).IncMajor()
-			logger.Subprocess("WARNING: Setting the .NET Framework version through buildpack.yml will be deprecated soon in .NET Core ASP.NET Core Runtime Buildpack v%s.", nextMajorVersion.String())
-			logger.Subprocess("Please specify the version through the $BP_DOTNET_FRAMEWORK_VERSION environment variable instead. See docs for more information.")
-			logger.Break()
-		}
-
 		dependency, err := versionResolver.Resolve(filepath.Join(context.CNBPath, "buildpack.toml"), entry, context.Stack)
 		if err != nil {
 			return packit.BuildResult{}, err

build_test.go

@@ -370,116 +370,6 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		})
 	})
 
-	context("when the backwards compatible api is being used", func() {
-		it("returns a result that installs the dotnet aspnet runtime libraries and prints a warning", func() {
-			result, err := build(packit.BuildContext{
-				WorkingDir: workingDir,
-				CNBPath:    cnbDir,
-				Stack:      "some-stack",
-				BuildpackInfo: packit.BuildpackInfo{
-					Name:        "Some Buildpack",
-					Version:     "1.2.3",
-					SBOMFormats: []string{sbom.CycloneDXFormat, sbom.SPDXFormat},
-				},
-				Platform: packit.Platform{Path: "platform"},
-				Plan: packit.BuildpackPlan{
-					Entries: []packit.BuildpackPlanEntry{
-						{
-							Name: "dotnet-runtime",
-							Metadata: map[string]interface{}{
-								"version-source": "BP_DOTNET_FRAMEWORK_VERSION",
-								"version":        "2.5.x",
-								"launch":         true,
-							},
-						},
-						{
-							Name: "dotnet-aspnetcore",
-							Metadata: map[string]interface{}{
-								"launch": true,
-							},
-						},
-					},
-				},
-				Layers: packit.Layers{Path: layersDir},
-			})
-			Expect(err).NotTo(HaveOccurred())
-
-			Expect(result.Layers).To(HaveLen(1))
-			layer := result.Layers[0]
-
-			Expect(layer.Name).To(Equal("dotnet-core-aspnet-runtime"))
-			Expect(layer.Path).To(Equal(filepath.Join(layersDir, "dotnet-core-aspnet-runtime")))
-
-			Expect(entryResolver.ResolveCall.Receives.BuildpackPlanEntrySlice).To(Equal([]packit.BuildpackPlanEntry{
-				{
-					Name: "dotnet-core-aspnet-runtime",
-					Metadata: map[string]interface{}{
-						"version":        "some-version",
-						"version-source": "runtimeconfig.json",
-					},
-				},
-				{
-					Name: "dotnet-core-aspnet-runtime",
-					Metadata: map[string]interface{}{
-						"version-source": "BP_DOTNET_FRAMEWORK_VERSION",
-						"version":        "2.5.x",
-						"launch":         true,
-					},
-				},
-				{
-					Name: "dotnet-core-aspnet-runtime",
-					Metadata: map[string]interface{}{
-						"launch": true,
-					},
-				},
-			}))
-
-			Expect(buffer.String()).To(ContainSubstring("WARNING: Requiring dotnet-runtime or dotnet-aspnetcore in your build plan will be deprecated soon in .NET Core Buildpack v2.0.0."))
-			Expect(buffer.String()).To(ContainSubstring("Please require dotnet-core-aspnet-runtime in your build plan going forward."))
-		})
-	})
-
-	context("when version-source of the selected entry is buildpack.yml", func() {
-		it.Before(func() {
-			entryResolver.ResolveCall.Returns.BuildpackPlanEntry = packit.BuildpackPlanEntry{
-				Name: "dotnet-core-aspnet-runtime",
-				Metadata: map[string]interface{}{
-					"version-source": "buildpack.yml",
-					"version":        "2.5.x",
-					"launch":         true,
-				},
-			}
-		})
-
-		it("chooses the specified version and emits a warning", func() {
-			_, err := build(packit.BuildContext{
-				WorkingDir: workingDir,
-				CNBPath:    cnbDir,
-				Stack:      "some-stack",
-				BuildpackInfo: packit.BuildpackInfo{
-					Name:    "Some Buildpack",
-					Version: "1.2.3",
-				},
-				Plan: packit.BuildpackPlan{
-					Entries: []packit.BuildpackPlanEntry{
-						{
-							Name: "dotnet-core-aspnet-runtime",
-							Metadata: map[string]interface{}{
-								"version-source": "buildpack.yml",
-								"version":        "2.5.x",
-							},
-						},
-					},
-				},
-				Layers: packit.Layers{Path: layersDir},
-			})
-			Expect(err).NotTo(HaveOccurred())
-
-			Expect(buffer.String()).To(ContainSubstring("WARNING: Setting the .NET Framework version through buildpack.yml will be deprecated soon in .NET Core ASP.NET Core Runtime Buildpack v2.0.0."))
-			Expect(buffer.String()).To(ContainSubstring("Please specify the version through the $BP_DOTNET_FRAMEWORK_VERSION environment variable instead. See docs for more information."))
-		})
-	})
-
 	context("failure cases", func() {
 		context("when the config parser fails", func() {
 			it.Before(func() {

buildpack_yml_parser.go

@@ -1,22 +1,15 @@
 package dotnetcoreaspnetruntime
 
 import (
-	"path/filepath"
-
 	"github.com/paketo-buildpacks/packit/v2"
 )
 
-//go:generate faux --interface VersionParser --output fakes/version_parser.go
-type VersionParser interface {
-	ParseVersion(path string) (version string, err error)
-}
-
 type Environment struct {
 	DotnetRollForward      string `env:"BP_DOTNET_ROLL_FORWARD"`
 	DotnetFrameworkVersion string `env:"BP_DOTNET_FRAMEWORK_VERSION"`
 }
 
-func Detect(environment Environment, versionParser VersionParser) packit.DetectFunc {
+func Detect(environment Environment) packit.DetectFunc {
 	return func(context packit.DetectContext) (packit.DetectResult, error) {
 		var requirements []packit.BuildPlanRequirement
 
@@ -30,22 +23,6 @@ func Detect(environment Environment, versionParser VersionParser) packit.DetectF
 			})
 		}
 
-		// check if the version is set in the buildpack.yml
-		version, err := versionParser.ParseVersion(filepath.Join(context.WorkingDir, "buildpack.yml"))
-		if err != nil {
-			return packit.DetectResult{}, err
-		}
-
-		if version != "" {
-			requirements = append(requirements, packit.BuildPlanRequirement{
-				Name: "dotnet-core-aspnet-runtime",
-				Metadata: map[string]interface{}{
-					"version-source": "buildpack.yml",
-					"version":        version,
-				},
-			})
-		}
-
 		return packit.DetectResult{
 			Plan: packit.BuildPlan{
 				Provides: []packit.BuildPlanProvision{