Merge branch 'main' into migrate-to-exec.d

Makefile

@@ -157,16 +157,12 @@ set-experimental:
 
 build-windows-1809: build-windows-packages build-nanoserver-1809 build-dotnet-framework-1809
 
-build-windows-2004: build-windows-packages build-dotnet-framework-2004
-
 build-windows-2022: build-windows-packages build-dotnet-framework-2022
 
 build-nanoserver-1809: build-stack-nanoserver-1809 build-builder-nanoserver-1809 build-buildpacks-nanoserver-1809
 
 build-dotnet-framework-1809: build-stack-dotnet-framework-1809 build-builder-dotnet-framework-1809 build-buildpacks-dotnet-framework-1809
 
-build-dotnet-framework-2004: build-stack-dotnet-framework-2004 build-builder-dotnet-framework-2004 build-buildpacks-dotnet-framework-2004
-
 build-dotnet-framework-2022: build-stack-dotnet-framework-2022 build-builder-dotnet-framework-2022 build-buildpacks-dotnet-framework-2022
 
 build-stack-nanoserver-1809:
@@ -177,10 +173,6 @@ build-stack-dotnet-framework-1809:
 	@echo "> Building 'dotnet-framework-1809' stack..."
 	bash stacks/build-stack.sh stacks/dotnet-framework-1809
 
-build-stack-dotnet-framework-2004:
-	@echo "> Building 'dotnet-framework-2004' stack..."
-	bash stacks/build-stack.sh stacks/dotnet-framework-2004
-
 build-stack-dotnet-framework-2022:
 	@echo "> Building 'dotnet-framework-2022' stack..."
 	bash stacks/build-stack.sh stacks/dotnet-framework-2022
@@ -193,10 +185,6 @@ build-builder-dotnet-framework-1809: build-windows-packages
 	@echo "> Building 'dotnet-framework-1809' builder..."
 	$(PACK_CMD) builder create cnbs/sample-builder:dotnet-framework-1809 --config $(SAMPLES_ROOT)/builders/dotnet-framework-1809/builder.toml $(PULL_POLICY_NEVER)
 
-build-builder-dotnet-framework-2004: build-windows-packages
-	@echo "> Building 'dotnet-framework-2004' builder..."
-	$(PACK_CMD) builder create cnbs/sample-builder:dotnet-framework-2004 --config $(SAMPLES_ROOT)/builders/dotnet-framework-2004/builder.toml $(PULL_POLICY_NEVER)
-
 build-builder-dotnet-framework-2022: build-windows-packages
 	@echo "> Building 'dotnet-framework-2022' builder..."
 	$(PACK_CMD) builder create cnbs/sample-builder:dotnet-framework-2022 --config $(SAMPLES_ROOT)/builders/dotnet-framework-2022/builder.toml $(PULL_POLICY_NEVER)
@@ -212,10 +200,6 @@ build-buildpacks-dotnet-framework-1809: build-sample-root
 	@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-1809' builder..."
 	$(PACK_CMD) build sample-dotnet-framework-app:dotnet-framework-1809 -v --builder cnbs/sample-builder:dotnet-framework-1809 --buildpack $(SAMPLES_ROOT)/buildpacks/dotnet-framework --path apps/aspnet $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
 
-build-buildpacks-dotnet-framework-2004: build-sample-root
-	@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-2004' builder..."
-	$(PACK_CMD) build sample-dotnet-framework-app:dotnet-framework-2004 -v --builder cnbs/sample-builder:dotnet-framework-2004 --buildpack $(SAMPLES_ROOT)/buildpacks/dotnet-framework --path apps/aspnet $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
-
 build-buildpacks-dotnet-framework-2022: build-sample-root
 	@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-2022' builder..."
 	$(PACK_CMD) build sample-dotnet-framework-app:dotnet-framework-2022 -v --builder cnbs/sample-builder:dotnet-framework-2022 --buildpack $(SAMPLES_ROOT)/buildpacks/dotnet-framework --path apps/aspnet $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
@@ -234,14 +218,10 @@ deploy-windows-packages:
 
 deploy-windows-1809: deploy-windows-stacks-1809 deploy-windows-builders-1809
 
-deploy-windows-2004: deploy-windows-stacks-2004 deploy-windows-builders-2004
-
 deploy-windows-2022: deploy-windows-stacks-2022 deploy-windows-builders-2022
 
 deploy-windows-stacks-1809: deploy-windows-stacks-nanoserver-1809 deploy-windows-stacks-dotnet-framework-1809
 
-deploy-windows-stacks-2004: deploy-windows-stacks-dotnet-framework-2004
-
 deploy-windows-stacks-2022: deploy-windows-stacks-dotnet-framework-2022
 
 deploy-windows-stacks-nanoserver-1809:
@@ -255,20 +235,13 @@ deploy-windows-stacks-dotnet-framework-1809:
 	docker push cnbs/sample-stack-run:dotnet-framework-1809
 	docker push cnbs/sample-stack-build:dotnet-framework-1809
 
-deploy-windows-stacks-dotnet-framework-2004:
-	@echo "> Deploying 'dotnet-framework-2004' stack..."
-	docker push cnbs/sample-stack-run:dotnet-framework-2004
-	docker push cnbs/sample-stack-build:dotnet-framework-2004
-
 deploy-windows-stacks-dotnet-framework-2022:
 	@echo "> Deploying 'dotnet-framework-2022' stack..."
 	docker push cnbs/sample-stack-run:dotnet-framework-2022
 	docker push cnbs/sample-stack-build:dotnet-framework-2022
 
 deploy-windows-builders-1809: deploy-windows-builders-nanoserver-1809 deploy-windows-builders-dotnet-framework-1809
 
-deploy-windows-builders-2004: deploy-windows-builders-dotnet-framework-2004
-
 deploy-windows-builders-2022: deploy-windows-builders-dotnet-framework-2022
 
 deploy-windows-builders-nanoserver-1809:
@@ -279,10 +252,6 @@ deploy-windows-builders-dotnet-framework-1809:
 	@echo "> Deploying 'dotnet-framework-1809' builder..."
 	docker push cnbs/sample-builder:dotnet-framework-1809
 
-deploy-windows-builders-dotnet-framework-2004:
-	@echo "> Deploying 'dotnet-framework-2004' builder..."
-	docker push cnbs/sample-builder:dotnet-framework-2004
-
 deploy-windows-builders-dotnet-framework-2022:
 	@echo "> Deploying 'dotnet-framework-2022' builder..."
 	docker push cnbs/sample-builder:dotnet-framework-2022
@@ -296,10 +265,6 @@ clean-windows:
 	@echo "> Removing 'dotnet-framework-1809' stack..."
 	docker rmi cnbs/sample-stack-run:dotnet-framework-1809 || true
 	docker rmi cnbs/sample-stack-build:dotnet-framework-1809 || true
-
-	@echo "> Removing 'dotnet-framework-2004' stack..."
-	docker rmi cnbs/sample-stack-run:dotnet-framework-2004 || true
-	docker rmi cnbs/sample-stack-build:dotnet-framework-2004 || true
 
 	@echo "> Removing 'dotnet-framework-2022' stack..."
 	docker rmi cnbs/sample-stack-run:dotnet-framework-2022 || true
@@ -308,7 +273,6 @@ clean-windows:
 	@echo "> Removing builders..."
 	docker rmi cnbs/sample-builder:nanoserver-1809 || true
 	docker rmi cnbs/sample-builder:dotnet-framework-1809 || true
-	docker rmi cnbs/sample-builder:dotnet-framework-2004 || true
 	docker rmi cnbs/sample-builder:dotnet-framework-2022 || true
 
 	@echo "> Removing 'nanoserver-1809' apps..."
@@ -319,9 +283,6 @@ clean-windows:
 	@echo "> Removing 'dotnet-framework-1809' apps..."
 	docker rmi sample-aspnet-app:dotnet-framework-1809 || true
 
-	@echo "> Removing 'dotnet-framework-2004' apps..."
-	docker rmi sample-aspnet-app:dotnet-framework-2004 || true
-
 	@echo "> Removing 'dotnet-framework-2022' apps..."
 	docker rmi sample-aspnet-app:dotnet-framework-2022 || true
 

buildpacks/dotnet-framework/buildpack.toml

@@ -8,8 +8,5 @@ api = "0.9"
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-1809"
 
-[[stacks]]
-  id = "io.buildpacks.samples.stacks.dotnet-framework-2004"
-
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-2022"

buildpacks/hello-moon-windows/buildpack.toml

@@ -15,8 +15,5 @@ id = "io.buildpacks.samples.stacks.nanoserver-1809"
 [[stacks]]
 id = "io.buildpacks.samples.stacks.dotnet-framework-1809"
 
-[[stacks]]
-  id = "io.buildpacks.samples.stacks.dotnet-framework-2004"
-
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-2022"

buildpacks/hello-moon/bin/detect

@@ -13,8 +13,7 @@ cat >> "${plan_path}" <<EOL
 #
 [[requires]]
 name = "some-world"
-version = "0.1"     # Optional
 
 [requires.metadata]
 world = "Earth-616" # Optional
-EOL
+EOL

buildpacks/hello-world-windows/buildpack.toml

@@ -11,8 +11,5 @@ homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/hello-wor
 [[stacks]]
 id = "io.buildpacks.samples.stacks.nanoserver-1809"
 
-[[stacks]]
-  id = "io.buildpacks.samples.stacks.dotnet-framework-2004"
-
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-2022"