Skip to content

Commit d118d38

Browse files
authored
Merge pull request #41 from damienbod/dev
Update .NET 10, Angular 21
2 parents 46c4b0a + e1810e4 commit d118d38

Some content is hidden

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

44 files changed

+12511
-15124
lines changed

AngularMicrosoftEntraIDMultipleApis/AngularCliMicrosoftEntraID/.browserslistrc

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

AngularMicrosoftEntraIDMultipleApis/AngularCliMicrosoftEntraID/angular.json

Lines changed: 44 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
"prefix": "app",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:browser",
18+
"builder": "@angular/build:application",
1919
"options": {
20-
"outputPath": "dist/angular-cli-azure-ad",
20+
"outputPath": {
21+
"base": "dist/angular-cli-azure-ad"
22+
},
2123
"index": "src/index.html",
22-
"main": "src/main.ts",
23-
"polyfills": "src/polyfills.ts",
24+
"polyfills": [
25+
"src/polyfills.ts"
26+
],
2427
"tsConfig": "tsconfig.app.json",
2528
"assets": [
2629
"src/favicon.ico",
@@ -33,6 +36,7 @@
3336
"node_modules/jquery/dist/jquery.min.js",
3437
"node_modules/bootstrap/dist/js/bootstrap.min.js"
3538
],
39+
"browser": "src/main.ts",
3640
},
3741
"configurations": {
3842
"production": {
@@ -57,9 +61,7 @@
5761
"outputHashing": "all"
5862
},
5963
"development": {
60-
"buildOptimizer": false,
6164
"optimization": false,
62-
"vendorChunk": true,
6365
"extractLicenses": false,
6466
"sourceMap": true,
6567
"namedChunks": true
@@ -68,31 +70,31 @@
6870
"defaultConfiguration": "production"
6971
},
7072
"serve": {
71-
"builder": "@angular-devkit/build-angular:dev-server",
72-
"options": {
73-
"browserTarget": "angular-oidc-oauth2:build",
74-
"sslKey": "certs/dev_localhost.key",
73+
"builder": "@angular/build:dev-server",
74+
"options": {
75+
"sslKey": "certs/dev_localhost.key",
7576
"sslCert": "certs/dev_localhost.pem",
76-
"port": 4200
77+
"port": 4200,
78+
"buildTarget": "angular-oidc-oauth2:build"
7779
},
7880
"configurations": {
7981
"production": {
80-
"browserTarget": "AngularCliAzureAD:build:production"
82+
"buildTarget": "AngularCliAzureAD:build:production"
8183
},
8284
"development": {
83-
"browserTarget": "AngularCliAzureAD:build:development"
85+
"buildTarget": "AngularCliAzureAD:build:development"
8486
}
8587
},
8688
"defaultConfiguration": "development"
8789
},
8890
"extract-i18n": {
89-
"builder": "@angular-devkit/build-angular:extract-i18n",
91+
"builder": "@angular/build:extract-i18n",
9092
"options": {
91-
"browserTarget": "AngularCliAzureAD:build"
93+
"buildTarget": "AngularCliAzureAD:build"
9294
}
9395
},
9496
"test": {
95-
"builder": "@angular-devkit/build-angular:karma",
97+
"builder": "@angular/build:karma",
9698
"options": {
9799
"main": "src/test.ts",
98100
"polyfills": "src/polyfills.ts",
@@ -111,5 +113,30 @@
111113
}
112114
}
113115
},
114-
"defaultProject": "AngularCliAzureAD"
116+
"schematics": {
117+
"@schematics/angular:component": {
118+
"type": "component"
119+
},
120+
"@schematics/angular:directive": {
121+
"type": "directive"
122+
},
123+
"@schematics/angular:service": {
124+
"type": "service"
125+
},
126+
"@schematics/angular:guard": {
127+
"typeSeparator": "."
128+
},
129+
"@schematics/angular:interceptor": {
130+
"typeSeparator": "."
131+
},
132+
"@schematics/angular:module": {
133+
"typeSeparator": "."
134+
},
135+
"@schematics/angular:pipe": {
136+
"typeSeparator": "."
137+
},
138+
"@schematics/angular:resolver": {
139+
"typeSeparator": "."
140+
}
141+
}
115142
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Installing Development Certificates
2+
3+
> [!IMPORTANT]
4+
> The certificate in this folder is for illustrative purposes only. Please use your own certificate.
5+
6+
1. Double-click the `pfx` on a Windows machine and use the password `1234` to install.
7+
1. Add the certificates to the Angular CLI project, for example in the **/certs** folder.
8+
1. Update the `ui\angular.json` file to point to the certificate files:
9+
10+
```json
11+
...
12+
"serve": {
13+
"builder": "@angular/build:dev-server",
14+
"options": {
15+
"sslKey": "certs/dev_localhost.key",
16+
"sslCert": "certs/dev_localhost.pem",
17+
"port": 4201
18+
}
19+
}
20+
...
21+
```
Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
-----BEGIN RSA PRIVATE KEY-----
2-
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
1323
-----END RSA PRIVATE KEY-----
Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICPzCCAaigAwIBAgIIApLJQ1yKNwgwDQYJKoZIhvcNAQELBQAwFDESMBAGA1UEAxMJbG9jYWxo
3-
b3N0MB4XDTI1MDEwMTA5Mjc1N1oXDTM1MDEwMjA5Mjc1N1owFDESMBAGA1UEAxMJbG9jYWxob3N0
4-
MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjQCAk+Otv72o+HPmieLtLIX0NzWDNc5vocj5p
5-
3hU+FNXS74SVWn/XiSAWsF/j+VhQ8RU7AZWPslMYI/KHDr1PbE54ydQkOjoU6mwKWedQspYSWz9s
6-
AwMghV5KxR4bsGCvNYnmAupe/lYUhx3DUOWGJulymcerntDEhhseABUDrQIDAQABo4GZMIGWMBIG
7-
A1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgH+MBQGA1UdEQQNMAuCCWxvY2FsaG9zdDA7
8-
BgNVHSUENDAyBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMDBggrBgEFBQcDBAYIKwYBBQUH
9-
AwgwHQYDVR0OBBYEFInWKVCkc0wgw1x5XUBvFbFcbDPpMA0GCSqGSIb3DQEBCwUAA4GBADhiql/N
10-
FTLa5oQCWt1Ot6xdvTXHEMf9f6okZkpcZ310IJO8OuptMKW+l+NvJNrpB20ef0XatzAxUVUtTdvz
11-
UfbMQTu541Rf8/bdloiPS2ld8TZNQk4xe5kGbX9EegQ1QVseEhba5lQvQvBhefk4zDnK0Ve7TmY7
12-
5geNTUjDEcgC
2+
MIIDRDCCAiygAwIBAgIIdo3zSaJ84eEwDQYJKoZIhvcNAQELBQAwFDESMBAGA1UEAxMJbG9jYWxo
3+
b3N0MB4XDTI1MTAyNzE1MTcwM1oXDTM1MTAyODE1MTcwM1owFDESMBAGA1UEAxMJbG9jYWxob3N0
4+
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0sHiguntn+9A129nFs8SFgkl4rYKvqtK
5+
I4l5E25AQDV2PN4ds2uQBhlUl6izI29zE72r3L6CCKV+mjfuAOs1HjOJa+WdSEC0EIF6w7FomTyT
6+
5jtEI3iCBGFFaK0YcDEC922EVf3tQjOp8uNetIAVOs6Shtj8qmu/MuEt/ttVxjq+OURo7I3kTxrq
7+
Hw2j3eF2YMUfi7soi7MqCww4mxbUGorCP4yfAc0jmIJS96SY9WQiqTZOq4axiTe7chcwTv4nXWkO
8+
rHKRIT/4tQnp+GxlYODK/9dBpL5Le3Rwhw8S4rQxy0GWnlYzsvkzQS/tb9hK/jKUOwj8EBLIxKrL
9+
t8GfjQIDAQABo4GZMIGWMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgH+MBQGA1Ud
10+
EQQNMAuCCWxvY2FsaG9zdDA7BgNVHSUENDAyBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMD
11+
BggrBgEFBQcDBAYIKwYBBQUHAwgwHQYDVR0OBBYEFPDfI5e93Mx1R/PPOon60GjMHLxOMA0GCSqG
12+
SIb3DQEBCwUAA4IBAQCWXcV1GIkvWKGAxe77irty9KZV2yjSMNU5lW9ZEW8iVDxa45qavcTrsu6r
13+
Lp17qu+3+f3JbnueyPhmebQn78tYnK/lZAGD2ZSP9OWO3Mh1BncPlU0C8z78Z5Wfz9K2ZehVdhDb
14+
622E7TY1hixYJazvmp/xZJk/MeR1SZ6wOytnRKceg2Ke71Mq1zG6n5DdBsQDMM29gFfcou8KjpX9
15+
IPvFYz44vI/5gz0e/p5YGSScJitxqgQFvjYMvuwRvLrMoHRInf2n9z57VAePy4yeHTKkuD7DamkL
16+
8OL9OyIETx5z25vRd9SlnHfA23/M/GqTCj+6g3qR0ERnRtwefYEjU86f
1317
-----END CERTIFICATE-----

AngularMicrosoftEntraIDMultipleApis/AngularCliMicrosoftEntraID/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = function (config) {
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage'),
13-
require('@angular-devkit/build-angular/plugins/karma')
13+
1414
],
1515
client: {
1616
jasmine: {

0 commit comments

Comments
 (0)