Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates buildpacks in buildpack.toml #1195

Merged
merged 11 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,41 +29,41 @@ api = "0.8"
[[order.group]]
id = "paketo-buildpacks/vsdbg"
optional = true
version = "0.3.29"
version = "0.3.32"

[[order.group]]
id = "paketo-buildpacks/dotnet-core-sdk"
optional = true
version = "0.15.12"
version = "1.0.0"

[[order.group]]
id = "paketo-buildpacks/icu"
optional = true
version = "0.7.25"
version = "0.7.28"

[[order.group]]
id = "paketo-buildpacks/node-engine"
optional = true
version = "4.1.15"
version = "5.0.4"

[[order.group]]
id = "paketo-buildpacks/dotnet-publish"
optional = true
version = "0.12.44"
version = "1.0.0"

[[order.group]]
id = "paketo-buildpacks/dotnet-core-aspnet-runtime"
optional = true
version = "0.5.10"
version = "1.0.0"

[[order.group]]
id = "paketo-buildpacks/dotnet-execute"
version = "0.14.45"
version = "1.0.0"

[[order.group]]
id = "paketo-buildpacks/procfile"
optional = true
version = "5.10.0"
version = "5.10.1"

[[order.group]]
id = "paketo-buildpacks/environment-variables"
Expand Down
1 change: 0 additions & 1 deletion integration.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"builders": [
"paketobuildpacks/builder:buildpackless-base",
"paketobuildpacks/builder-jammy-buildpackless-base"
]
}
7 changes: 4 additions & 3 deletions integration/source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,11 @@ func testSource(t *testing.T, context spec.G, it spec.S) {
Expect(logs).NotTo(ContainLines(ContainSubstring("Buildpack for Image Labels")))
})
})
context("when source app uses .NET 8", func() {

context("when source app uses .NET 9", func() {
it.Before(func() {
var err error
source, err = occam.Source(filepath.Join("testdata", "source-app-8"))
source, err = occam.Source(filepath.Join("testdata", "source-app-9"))
Expect(err).NotTo(HaveOccurred())
})

Expand All @@ -395,7 +396,7 @@ func testSource(t *testing.T, context spec.G, it spec.S) {
Execute(image.ID)
Expect(err).NotTo(HaveOccurred())

Eventually(container).Should(Serve(ContainSubstring("<title>Home Page - source_app_8</title>")).OnPort(8080))
Eventually(container).Should(Serve(ContainSubstring("<title>Home Page - source_app_9</title>")).OnPort(8080))

Expect(logs).To(ContainLines(ContainSubstring("Buildpack for .NET Core SDK")))
Expect(logs).To(ContainLines(ContainSubstring("Buildpack for ICU")))
Expand Down
3 changes: 1 addition & 2 deletions integration/testdata/ca-cert-apps/fdd-app/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Generating this fixture

1. Install .NET SDK (6.0.200)
1. `dotnet publish $(pwd)/../source-app --configuration Release --runtime ubuntu.18.04-x64 --self-contained false --output $(pwd)`
1. `dotnet publish $(pwd)/../source-app --runtime linux-x64 --self-contained false --output $(pwd)`
1. `rm ./source_https_app`

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v6.0/ubuntu.18.04-x64",
"name": ".NETCoreApp,Version=v8.0/linux-x64",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {},
".NETCoreApp,Version=v6.0/ubuntu.18.04-x64": {
".NETCoreApp,Version=v8.0": {},
".NETCoreApp,Version=v8.0/linux-x64": {
"source_https_app/1.0.0": {
"runtime": {
"source_https_app.dll": {}
Expand Down
Binary file modified integration/testdata/ca-cert-apps/fdd-app/source_https_app.dll
Binary file not shown.
Binary file modified integration/testdata/ca-cert-apps/fdd-app/source_https_app.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
11 changes: 11 additions & 0 deletions integration/testdata/ca-cert-apps/fdd-app/web.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<location path="." inheritInChildApplications="false">
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath="dotnet" arguments=".\source_https_app.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
</configuration>
3 changes: 1 addition & 2 deletions integration/testdata/ca-cert-apps/fde-app/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Generating this fixture

1. Install .NET SDK (6.0.200)
1. `dotnet publish $(pwd)/../source-app --configuration Release --runtime ubuntu.18.04-x64 --self-contained false --output $(pwd)`
1. `dotnet publish $(pwd)/../source-app --runtime linux-x64 --self-contained false --output $(pwd)`

Binary file modified integration/testdata/ca-cert-apps/fde-app/source_https_app
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v6.0/ubuntu.18.04-x64",
"name": ".NETCoreApp,Version=v8.0/linux-x64",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {},
".NETCoreApp,Version=v6.0/ubuntu.18.04-x64": {
".NETCoreApp,Version=v8.0": {},
".NETCoreApp,Version=v8.0/linux-x64": {
"source_https_app/1.0.0": {
"runtime": {
"source_https_app.dll": {}
Expand Down
Binary file modified integration/testdata/ca-cert-apps/fde-app/source_https_app.dll
Binary file not shown.
Binary file modified integration/testdata/ca-cert-apps/fde-app/source_https_app.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
11 changes: 11 additions & 0 deletions integration/testdata/ca-cert-apps/fde-app/web.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<location path="." inheritInChildApplications="false">
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath="dotnet" arguments=".\source_https_app.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
</configuration>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Generating this fixture

1. Install .NET SDK (6.0.200)
1. `dotnet publish $(pwd)/../source-app --configuration Release --runtime ubuntu.18.04-x64 --self-contained true --output $(pwd)`
1. `dotnet publish $(pwd)/../source-app --runtime linux-x64 --self-contained true --output $(pwd)`

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading