Skip to content

Commit 42d314b

Browse files
i4004i4004
committed
[up] Upgrade to .NET 9
[up] Upgrade Angular template front-end dependencies to Angular 18 [up] WindowsServiceApi Microsoft.AspNetCore bump to 2.3 [edit] Upgrade Angular template back-end app to new SpaProxy and app [fix] Scheduler install script typo [spec] Upgrade to .NET 9
1 parent 42ca77d commit 42d314b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+14448
-15173
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
os: [ubuntu-latest, windows-latest]
16+
include:
17+
- os: ubuntu-latest
18+
test-framework-command: --framework net9.0
1619

1720
steps:
1821
- name: Code Checkout
1922
uses: actions/checkout@v4.1.1
2023

2124
- name: Install DotNet
2225
uses: actions/setup-dotnet@v4
26+
with:
27+
dotnet-version: "9.0.x"
2328

2429
- name: Restore Dependencies
2530
run: dotnet restore Simplify.Web.Templates.csproj

‎.vscode/launch.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "coreclr",
77
"request": "launch",
88
"preLaunchTask": "Build",
9-
"program": "${workspaceFolder}/src/templates/MyProject.Angular/bin/Debug/net8.0/MyProject.Angular.dll",
9+
"program": "${workspaceFolder}/src/templates/MyProject.Angular/bin/Debug/net9.0/MyProject.Angular.dll",
1010
"cwd": "${workspaceFolder}/src/templates/MyProject.Angular",
1111
"internalConsoleOptions": "openOnSessionStart",
1212
"serverReadyAction": {
@@ -23,7 +23,7 @@
2323
"type": "coreclr",
2424
"request": "launch",
2525
"preLaunchTask": "Build",
26-
"program": "${workspaceFolder}/src/templates/MyProject.Angular/bin/Debug/net8.0/MyProject.Angular.dll",
26+
"program": "${workspaceFolder}/src/templates/MyProject.Angular/bin/Debug/net9.0/MyProject.Angular.dll",
2727
"cwd": "${workspaceFolder}/src/templates/MyProject.Angular",
2828
"internalConsoleOptions": "openOnSessionStart",
2929
"serverReadyAction": {
@@ -41,8 +41,8 @@
4141
"type": "coreclr",
4242
"request": "launch",
4343
"preLaunchTask": "Build",
44-
"program": "${workspaceFolder}/src/templates/MyProject.Api/bin/Debug/net8.0/MyProject.Api.dll",
45-
"cwd": "${workspaceFolder}/src/templates/MyProject.Api/bin/Debug/net8.0/",
44+
"program": "${workspaceFolder}/src/templates/MyProject.Api/bin/Debug/net9.0/MyProject.Api.dll",
45+
"cwd": "${workspaceFolder}/src/templates/MyProject.Api/bin/Debug/net9.0/",
4646
"internalConsoleOptions": "openOnSessionStart",
4747
"serverReadyAction": {
4848
"action": "openExternally",
@@ -58,8 +58,8 @@
5858
"type": "coreclr",
5959
"request": "launch",
6060
"preLaunchTask": "Build",
61-
"program": "${workspaceFolder}/src/templates/MyProject.Minimal/bin/Debug/net8.0/MyProject.Minimal.dll",
62-
"cwd": "${workspaceFolder}/src/templates/MyProject.Minimal/bin/Debug/net8.0/",
61+
"program": "${workspaceFolder}/src/templates/MyProject.Minimal/bin/Debug/net9.0/MyProject.Minimal.dll",
62+
"cwd": "${workspaceFolder}/src/templates/MyProject.Minimal/bin/Debug/net9.0/",
6363
"internalConsoleOptions": "openOnSessionStart",
6464
"serverReadyAction": {
6565
"action": "openExternally",
@@ -75,8 +75,8 @@
7575
"type": "coreclr",
7676
"request": "launch",
7777
"preLaunchTask": "Build",
78-
"program": "${workspaceFolder}/src/templates/MyProject.SchedulerApi/bin/Debug/net8.0/MyProject.SchedulerApi.dll",
79-
"cwd": "${workspaceFolder}/src/templates/MyProject.SchedulerApi/bin/Debug/net8.0/",
78+
"program": "${workspaceFolder}/src/templates/MyProject.SchedulerApi/bin/Debug/net9.0/MyProject.SchedulerApi.dll",
79+
"cwd": "${workspaceFolder}/src/templates/MyProject.SchedulerApi/bin/Debug/net9.0/",
8080
"internalConsoleOptions": "openOnSessionStart",
8181
"serverReadyAction": {
8282
"action": "openExternally",

‎.vscode/settings.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"cSpell.words": [
3+
"appsettings",
34
"ASPNETCORE",
5+
"Bootstrapper",
46
"HOSTINGSTARTUPASSEMBLIES",
57
"HSTS",
68
"proxying"

‎src/CHANGELOG.md‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
11
# Changelog
22

3+
## [1.5.0] - 2025-03-14
4+
5+
### Dependencies
6+
7+
- Upgrade to .NET 9
8+
- Upgrade Angular template front-end dependencies to Angular 18
9+
- WindowsServiceApi Microsoft.AspNetCore bump to 2.3
10+
11+
### Changed
12+
13+
- Upgrade Angular template back-end app to new SpaProxy and app
14+
15+
### Fixed
16+
17+
- Scheduler install script typo
18+
319
## [1.4.0] - 2024-12-16
420

521
### Dependencies
622

723
- Simplify.Web bump to 5.1 with floating version set
8-
- Upgrade Angular template front ent dependencies to Angular 17.3
24+
- Upgrade Angular template front-end dependencies to Angular 17.3
925

1026
## [1.3.0] - 2024-06-07
1127

@@ -41,14 +57,14 @@
4157
### Dependencies
4258

4359
- Upgrade to .NET 8
44-
- Upgrade Angular template front ent dependencies to latest (Angular 17)
60+
- Upgrade Angular template front-end dependencies to latest (Angular 17)
4561

4662
## [1.1] - 2022-11-24
4763

4864
### Dependencies
4965

5066
- Upgrade to .NET 7
51-
- Upgrade Angular template front ent dependencies to latest (Angular 15)
67+
- Upgrade Angular template front-end dependencies to latest (Angular 15)
5268

5369
## [1.0.2] - 2022-02-27
5470

@@ -60,7 +76,7 @@ Upgrade Angular package-lock
6076

6177
### Dependencies
6278

63-
Upgrade Angular template front ent dependencies to latest (Angular 13.1.2)
79+
Upgrade Angular template front-end dependencies to latest (Angular 13.1.2)
6480

6581
## [1.0.0] - 2022-01-16
6682

‎src/Simplify.Web.Templates.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<IsPackable>true</IsPackable>
55

6-
<PackageVersion>1.4</PackageVersion>
6+
<PackageVersion>1.5</PackageVersion>
77

88
<Title>Simplify.Web project templates</Title>
99
<Description>The Simplify.Web web framework project templates collection.</Description>

‎src/templates/MyProject.Angular/ClientApp/.browserslistrc‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/templates/MyProject.Angular/ClientApp/.editorconfig‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# Editor configuration, see https://editorconfig.org
2-
root = true
3-
4-
[*]
5-
charset = utf-8
6-
indent_style = space
7-
indent_size = 2
8-
insert_final_newline = true
9-
trim_trailing_whitespace = true
10-
11-
[*.ts]
12-
quote_type = single
13-
14-
[*.md]
15-
max_line_length = off
16-
trim_trailing_whitespace = false
1+
# Editor configuration, see https://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.ts]
12+
quote_type = single
13+
14+
[*.md]
15+
max_line_length = off
16+
trim_trailing_whitespace = false

‎src/templates/MyProject.Angular/ClientApp/.gitignore‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
2-
3-
# compiled output
4-
/dist
5-
/dist-server
6-
/tmp
7-
/out-tsc
8-
9-
# dependencies
10-
/node_modules
11-
12-
# IDEs and editors
13-
/.idea
14-
.project
15-
.classpath
16-
.c9/
17-
*.launch
18-
.settings/
19-
*.sublime-workspace
20-
21-
# IDE - VSCode
22-
.vscode/*
23-
!.vscode/settings.json
24-
!.vscode/tasks.json
25-
!.vscode/launch.json
26-
!.vscode/extensions.json
27-
28-
# misc
29-
/.sass-cache
30-
/connect.lock
31-
/coverage
32-
/libpeerconnection.log
33-
npm-debug.log
34-
yarn-error.log
35-
testem.log
36-
/typings
37-
38-
# System Files
39-
.DS_Store
40-
Thumbs.db
1+
# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
2+
3+
# Compiled output
4+
/dist
5+
/tmp
6+
/out-tsc
7+
/bazel-out
8+
9+
# Node
10+
/node_modules
11+
npm-debug.log
12+
yarn-error.log
13+
14+
# IDEs and editors
15+
.idea/
16+
.project
17+
.classpath
18+
.c9/
19+
*.launch
20+
.settings/
21+
*.sublime-workspace
22+
23+
# Visual Studio Code
24+
.vscode/*
25+
!.vscode/settings.json
26+
!.vscode/tasks.json
27+
!.vscode/launch.json
28+
!.vscode/extensions.json
29+
.history/*
30+
31+
# Miscellaneous
32+
/.angular/cache
33+
.sass-cache/
34+
/connect.lock
35+
/coverage
36+
/libpeerconnection.log
37+
testem.log
38+
/typings
39+
40+
# System files
41+
.DS_Store
42+
Thumbs.db

‎src/templates/MyProject.Angular/ClientApp/CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
This file explains how Visual Studio created the project.
2+
3+
The following tools were used to generate this project:
4+
- Angular CLI (ng)
5+
6+
The following steps were used to generate this project:
7+
- Create Angular project with ng: `ng new MyProject.Angular --defaults --skip-install --skip-git --no-standalone `.
8+
- Add `proxy.conf.js` to proxy calls to the backend ASP.NET server.
9+
- Add `aspnetcore-https.js` script to install https certs.
10+
- Update `package.json` to call `aspnetcore-https.js` and serve with https.
11+
- Update `angular.json` to point to `proxy.conf.js`.
12+
- Update `app.component.ts` component to fetch and display weather information.
13+
- Modify `app.component.spec.ts` with updated tests.
14+
- Update `app.module.ts` to import the HttpClientModule.
15+
- Update package.json to add `jest-editor-support`.
16+
- Update package.json to add `run-script-os`.
17+
- Add `karma.conf.js` for unit tests.
18+
- Update `angular.json` to point to `karma.conf.js`.
19+
- Add project to solution.
20+
- Update proxy endpoint to be the backend server endpoint.
21+
- Add project to the startup projects list.
22+
- Write this file.

‎src/templates/MyProject.Angular/ClientApp/README.md‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
# MyProject.Angular
2-
3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.0.2.
4-
5-
## Development server
6-
7-
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
8-
9-
## Code scaffolding
10-
11-
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
12-
13-
## Build
14-
15-
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
16-
17-
## Running unit tests
18-
19-
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
20-
21-
## Running end-to-end tests
22-
23-
Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
24-
25-
## Further help
26-
27-
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
1+
# MyProject.Angular
2+
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 18.0.2.
4+
5+
## Development server
6+
7+
Run `ng serve` for a dev server. Navigate to `https://localhost:10900/`. The application will automatically reload if you change any of the source files.
8+
9+
## Code scaffolding
10+
11+
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
12+
13+
## Build
14+
15+
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
16+
17+
## Running unit tests
18+
19+
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
20+
21+
## Running end-to-end tests
22+
23+
Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
24+
25+
## Further help
26+
27+
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.

0 commit comments

Comments
 (0)