diff --git a/.gitignore b/.gitignore index 82b9e32..a62ccbb 100644 --- a/.gitignore +++ b/.gitignore @@ -230,4 +230,5 @@ _Pvt_Extensions # FAKE - F# Make .fake/ -.angular/ \ No newline at end of file +.angular/ +.idea/ \ No newline at end of file diff --git a/AspNetCore.SpaYarp.sln b/AspNetCore.SpaYarp.sln index 36c6408..b6b30a2 100644 --- a/AspNetCore.SpaYarp.sln +++ b/AspNetCore.SpaYarp.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31612.314 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net7WebApplicationBuilder", "samples\Net7WebApplicationBuilder\Net7WebApplicationBuilder.csproj", "{E3826EDD-0370-4A40-A1F9-1B07ABEBDDFD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net8WebApplicationBuilder", "samples\Net8WebApplicationBuilder\Net8WebApplicationBuilder.csproj", "{E3826EDD-0370-4A40-A1F9-1B07ABEBDDFD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore.SpaYarp", "src\AspNetCore.SpaYarp\AspNetCore.SpaYarp.csproj", "{03DE7E3B-0E21-49B5-8471-7E32E0A2D68C}" EndProject diff --git a/global.json b/global.json index 5bf3e71..391ba3c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.200", + "version": "8.0.100", "rollForward": "latestFeature" } } diff --git a/samples/AspNetMultipleSpaYarp/AspNetMultipleSpasYarp.csproj b/samples/AspNetMultipleSpaYarp/AspNetMultipleSpasYarp.csproj index 21cca81..e544ee2 100644 --- a/samples/AspNetMultipleSpaYarp/AspNetMultipleSpasYarp.csproj +++ b/samples/AspNetMultipleSpaYarp/AspNetMultipleSpasYarp.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable false enable diff --git a/samples/Net7WebApplicationBuilder/ClientApp/.browserslistrc b/samples/Net8WebApplicationBuilder/ClientApp/.browserslistrc similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/.browserslistrc rename to samples/Net8WebApplicationBuilder/ClientApp/.browserslistrc diff --git a/samples/Net7WebApplicationBuilder/ClientApp/.editorconfig b/samples/Net8WebApplicationBuilder/ClientApp/.editorconfig similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/.editorconfig rename to samples/Net8WebApplicationBuilder/ClientApp/.editorconfig diff --git a/samples/Net7WebApplicationBuilder/ClientApp/.gitignore b/samples/Net8WebApplicationBuilder/ClientApp/.gitignore similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/.gitignore rename to samples/Net8WebApplicationBuilder/ClientApp/.gitignore diff --git a/samples/Net7WebApplicationBuilder/ClientApp/.vscode/launch.json b/samples/Net8WebApplicationBuilder/ClientApp/.vscode/launch.json similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/.vscode/launch.json rename to samples/Net8WebApplicationBuilder/ClientApp/.vscode/launch.json diff --git a/samples/Net7WebApplicationBuilder/ClientApp/README.md b/samples/Net8WebApplicationBuilder/ClientApp/README.md similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/README.md rename to samples/Net8WebApplicationBuilder/ClientApp/README.md diff --git a/samples/Net7WebApplicationBuilder/ClientApp/angular.json b/samples/Net8WebApplicationBuilder/ClientApp/angular.json similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/angular.json rename to samples/Net8WebApplicationBuilder/ClientApp/angular.json diff --git a/samples/Net7WebApplicationBuilder/ClientApp/aspnetcore-https.js b/samples/Net8WebApplicationBuilder/ClientApp/aspnetcore-https.js similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/aspnetcore-https.js rename to samples/Net8WebApplicationBuilder/ClientApp/aspnetcore-https.js diff --git a/samples/Net7WebApplicationBuilder/ClientApp/karma.conf.js b/samples/Net8WebApplicationBuilder/ClientApp/karma.conf.js similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/karma.conf.js rename to samples/Net8WebApplicationBuilder/ClientApp/karma.conf.js diff --git a/samples/Net7WebApplicationBuilder/ClientApp/package-lock.json b/samples/Net8WebApplicationBuilder/ClientApp/package-lock.json similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/package-lock.json rename to samples/Net8WebApplicationBuilder/ClientApp/package-lock.json diff --git a/samples/Net7WebApplicationBuilder/ClientApp/package.json b/samples/Net8WebApplicationBuilder/ClientApp/package.json similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/package.json rename to samples/Net8WebApplicationBuilder/ClientApp/package.json diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/app.component.html b/samples/Net8WebApplicationBuilder/ClientApp/src/app/app.component.html similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/app.component.html rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/app.component.html diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/app.component.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/app/app.component.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/app.component.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/app.component.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/app.module.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/app/app.module.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/app.module.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/app.module.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/app.server.module.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/app/app.server.module.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/app.server.module.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/app.server.module.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/counter/counter.component.html b/samples/Net8WebApplicationBuilder/ClientApp/src/app/counter/counter.component.html similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/counter/counter.component.html rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/counter/counter.component.html diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/counter/counter.component.spec.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/app/counter/counter.component.spec.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/counter/counter.component.spec.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/counter/counter.component.spec.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/counter/counter.component.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/app/counter/counter.component.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/counter/counter.component.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/counter/counter.component.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/fetch-data/fetch-data.component.html b/samples/Net8WebApplicationBuilder/ClientApp/src/app/fetch-data/fetch-data.component.html similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/fetch-data/fetch-data.component.html rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/fetch-data/fetch-data.component.html diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/fetch-data/fetch-data.component.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/app/fetch-data/fetch-data.component.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/fetch-data/fetch-data.component.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/fetch-data/fetch-data.component.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/home/home.component.html b/samples/Net8WebApplicationBuilder/ClientApp/src/app/home/home.component.html similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/home/home.component.html rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/home/home.component.html diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/home/home.component.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/app/home/home.component.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/home/home.component.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/home/home.component.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.css b/samples/Net8WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.css similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.css rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.css diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.html b/samples/Net8WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.html similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.html rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.html diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/app/nav-menu/nav-menu.component.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/assets/.gitkeep b/samples/Net8WebApplicationBuilder/ClientApp/src/assets/.gitkeep similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/assets/.gitkeep rename to samples/Net8WebApplicationBuilder/ClientApp/src/assets/.gitkeep diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/environments/environment.prod.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/environments/environment.prod.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/environments/environment.prod.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/environments/environment.prod.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/environments/environment.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/environments/environment.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/environments/environment.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/environments/environment.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/index.html b/samples/Net8WebApplicationBuilder/ClientApp/src/index.html similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/index.html rename to samples/Net8WebApplicationBuilder/ClientApp/src/index.html diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/main.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/main.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/main.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/main.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/polyfills.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/polyfills.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/polyfills.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/polyfills.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/styles.css b/samples/Net8WebApplicationBuilder/ClientApp/src/styles.css similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/styles.css rename to samples/Net8WebApplicationBuilder/ClientApp/src/styles.css diff --git a/samples/Net7WebApplicationBuilder/ClientApp/src/test.ts b/samples/Net8WebApplicationBuilder/ClientApp/src/test.ts similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/src/test.ts rename to samples/Net8WebApplicationBuilder/ClientApp/src/test.ts diff --git a/samples/Net7WebApplicationBuilder/ClientApp/tsconfig.app.json b/samples/Net8WebApplicationBuilder/ClientApp/tsconfig.app.json similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/tsconfig.app.json rename to samples/Net8WebApplicationBuilder/ClientApp/tsconfig.app.json diff --git a/samples/Net7WebApplicationBuilder/ClientApp/tsconfig.json b/samples/Net8WebApplicationBuilder/ClientApp/tsconfig.json similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/tsconfig.json rename to samples/Net8WebApplicationBuilder/ClientApp/tsconfig.json diff --git a/samples/Net7WebApplicationBuilder/ClientApp/tsconfig.spec.json b/samples/Net8WebApplicationBuilder/ClientApp/tsconfig.spec.json similarity index 100% rename from samples/Net7WebApplicationBuilder/ClientApp/tsconfig.spec.json rename to samples/Net8WebApplicationBuilder/ClientApp/tsconfig.spec.json diff --git a/samples/Net7WebApplicationBuilder/Controllers/WeatherForecastController.cs b/samples/Net8WebApplicationBuilder/Controllers/WeatherForecastController.cs similarity index 100% rename from samples/Net7WebApplicationBuilder/Controllers/WeatherForecastController.cs rename to samples/Net8WebApplicationBuilder/Controllers/WeatherForecastController.cs diff --git a/samples/Net7WebApplicationBuilder/Net7WebApplicationBuilder.csproj b/samples/Net8WebApplicationBuilder/Net8WebApplicationBuilder.csproj similarity index 95% rename from samples/Net7WebApplicationBuilder/Net7WebApplicationBuilder.csproj rename to samples/Net8WebApplicationBuilder/Net8WebApplicationBuilder.csproj index d25fd4f..b15365c 100644 --- a/samples/Net7WebApplicationBuilder/Net7WebApplicationBuilder.csproj +++ b/samples/Net8WebApplicationBuilder/Net8WebApplicationBuilder.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable false enable @@ -9,6 +9,7 @@ ClientApp\ https://localhost:44478 npm start + Net8WebApplicationBuilder diff --git a/samples/Net7WebApplicationBuilder/Pages/Error.cshtml b/samples/Net8WebApplicationBuilder/Pages/Error.cshtml similarity index 100% rename from samples/Net7WebApplicationBuilder/Pages/Error.cshtml rename to samples/Net8WebApplicationBuilder/Pages/Error.cshtml diff --git a/samples/Net7WebApplicationBuilder/Pages/Error.cshtml.cs b/samples/Net8WebApplicationBuilder/Pages/Error.cshtml.cs similarity index 100% rename from samples/Net7WebApplicationBuilder/Pages/Error.cshtml.cs rename to samples/Net8WebApplicationBuilder/Pages/Error.cshtml.cs diff --git a/samples/Net7WebApplicationBuilder/Pages/_ViewImports.cshtml b/samples/Net8WebApplicationBuilder/Pages/_ViewImports.cshtml similarity index 100% rename from samples/Net7WebApplicationBuilder/Pages/_ViewImports.cshtml rename to samples/Net8WebApplicationBuilder/Pages/_ViewImports.cshtml diff --git a/samples/Net7WebApplicationBuilder/Program.cs b/samples/Net8WebApplicationBuilder/Program.cs similarity index 100% rename from samples/Net7WebApplicationBuilder/Program.cs rename to samples/Net8WebApplicationBuilder/Program.cs diff --git a/samples/Net7WebApplicationBuilder/Properties/launchSettings.json b/samples/Net8WebApplicationBuilder/Properties/launchSettings.json similarity index 100% rename from samples/Net7WebApplicationBuilder/Properties/launchSettings.json rename to samples/Net8WebApplicationBuilder/Properties/launchSettings.json diff --git a/samples/Net7WebApplicationBuilder/WeatherForecast.cs b/samples/Net8WebApplicationBuilder/WeatherForecast.cs similarity index 100% rename from samples/Net7WebApplicationBuilder/WeatherForecast.cs rename to samples/Net8WebApplicationBuilder/WeatherForecast.cs diff --git a/samples/Net7WebApplicationBuilder/appsettings.Development.json b/samples/Net8WebApplicationBuilder/appsettings.Development.json similarity index 100% rename from samples/Net7WebApplicationBuilder/appsettings.Development.json rename to samples/Net8WebApplicationBuilder/appsettings.Development.json diff --git a/samples/Net7WebApplicationBuilder/appsettings.json b/samples/Net8WebApplicationBuilder/appsettings.json similarity index 100% rename from samples/Net7WebApplicationBuilder/appsettings.json rename to samples/Net8WebApplicationBuilder/appsettings.json diff --git a/samples/Net7WebApplicationBuilder/wwwroot/favicon.ico b/samples/Net8WebApplicationBuilder/wwwroot/favicon.ico similarity index 100% rename from samples/Net7WebApplicationBuilder/wwwroot/favicon.ico rename to samples/Net8WebApplicationBuilder/wwwroot/favicon.ico diff --git a/src/AspNetCore.SpaYarp/AspNetCore.SpaYarp.csproj b/src/AspNetCore.SpaYarp/AspNetCore.SpaYarp.csproj index 8cc9912..52522dc 100644 --- a/src/AspNetCore.SpaYarp/AspNetCore.SpaYarp.csproj +++ b/src/AspNetCore.SpaYarp/AspNetCore.SpaYarp.csproj @@ -1,8 +1,8 @@  - An alternative approach to the new ASP.NET Core SPA templates in .NET 6. It uses YARP as proxy to forward requests to the SPA dev server. - net6.0;net7.0 + An alternative approach to the new ASP.NET Core SPA templates in .NET 6/8. It uses YARP as proxy to forward requests to the SPA dev server. + net6.0;net8.0 enable enable 11 @@ -12,14 +12,14 @@ MIT Bernd Hirschmann Guid.New GmbH - 2.0.1 + 2.1.0 True Readme.md - +