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

Remove .NET 7 tests #1107

Merged
merged 3 commits into from
Jul 3, 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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions integration/source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,10 @@ 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 7", func() {
context("when source app uses .NET 8", func() {
it.Before(func() {
var err error
source, err = occam.Source(filepath.Join("testdata", "source-app-7"))
source, err = occam.Source(filepath.Join("testdata", "source-app-8"))
Expect(err).NotTo(HaveOccurred())
})

Expand All @@ -395,7 +395,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>source_app_7</title>")).OnPort(8080))
Eventually(container).Should(Serve(ContainSubstring("<title>Home Page - source_app_8</title>")).OnPort(8080))

Expect(logs).To(ContainLines(ContainSubstring("Buildpack for .NET Core SDK")))
Expect(logs).To(ContainLines(ContainSubstring("Buildpack for ICU")))
Expand Down Expand Up @@ -423,7 +423,7 @@ func testSource(t *testing.T, context spec.G, it spec.S) {
WithBuildpacks(dotnetCoreBuildpack).
WithPullPolicy("never").
WithEnv(map[string]string{
"BP_DOTNET_PROJECT_PATH": "source_7",
"BP_DOTNET_PROJECT_PATH": "source_8",
}).
Execute(name, source)
Expect(err).NotTo(HaveOccurred(), logs.String())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using core3_1_dependency;
using Microsoft.AspNetCore.Mvc;
using Net6_Dependency;
using source_7_app.Models;
using source_8_app.Models;

namespace source_7_app.Controllers;
namespace source_8_app.Controllers;

public class HomeController : Controller
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace source_7_app.Models;
namespace source_8_app.Models;

public class ErrorViewModel
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - source_7_app</title>
<title>@ViewData["Title"] - source_8_app</title>
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
<link rel="stylesheet" href="~/source_7_app.styles.css" asp-append-version="true" />
<link rel="stylesheet" href="~/source_8_app.styles.css" asp-append-version="true" />
</head>
<body>
<header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<div class="container-fluid">
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">source_7_app</a>
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">source_8_app</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand All @@ -38,7 +38,7 @@

<footer class="border-top footer text-muted">
<div class="container">
&copy; 2022 - source_7_app - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
&copy; 2022 - source_8_app - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</div>
</footer>
<script src="~/lib/jquery/dist/jquery.min.js"></script>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@using source_7_app
@using source_7_app.Models
@using source_8_app
@using source_8_app.Models
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.4.33020.496
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "source_7_app", "source_7\source_7_app.csproj", "{10C0F795-849E-4D31-9919-C33A4E846069}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "source_8_app", "source_8\source_8_app.csproj", "{10C0F795-849E-4D31-9919-C33A4E846069}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.4.33020.496
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "source_7_app", "source_7\source_7_app.csproj", "{10C0F795-849E-4D31-9919-C33A4E846069}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "source_8_app", "source_8\source_8_app.csproj", "{10C0F795-849E-4D31-9919-C33A4E846069}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net6-Dependency", "Net6-Dependency\Net6-Dependency.csproj", "{55F6F57B-D3AA-4336-BA65-54BE53BBD86F}"
EndProject
Expand Down
17 changes: 0 additions & 17 deletions integration/testdata/source-app-7/ClientApp/.browserslistrc

This file was deleted.

19 changes: 0 additions & 19 deletions integration/testdata/source-app-7/ClientApp/.editorconfig

This file was deleted.

40 changes: 0 additions & 40 deletions integration/testdata/source-app-7/ClientApp/.gitignore

This file was deleted.

27 changes: 0 additions & 27 deletions integration/testdata/source-app-7/ClientApp/README.md

This file was deleted.

136 changes: 0 additions & 136 deletions integration/testdata/source-app-7/ClientApp/angular.json

This file was deleted.

33 changes: 0 additions & 33 deletions integration/testdata/source-app-7/ClientApp/aspnetcore-https.js

This file was deleted.

Loading
Loading