Skip to content

Commit f353621

Browse files
TimHessTimHess
committed
Use .NET casing conventions, add run-local settings
- use route params for client api - use primary constructor for GreeterService - add Steeltoe appsettings schema - also only use GA Steeltoe packages
1 parent 93dc9c0 commit f353621

23 files changed

Lines changed: 86 additions & 108 deletions

greeter-messages/.editorconfig renamed to .editorconfig

File renamed without changes.

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ jobs:
2121
dotnet-version: '8.0.x'
2222

2323
- name: Restore dependencies
24-
run: dotnet restore greeter-messages/greeter-messages.csproj
24+
run: dotnet restore Greeter.Messages/Greeter.Messages.csproj
2525

2626
- name: Check code formatting
27-
run: dotnet format --verify-no-changes greeter-messages/
27+
run: dotnet format --verify-no-changes Greeter.Messages/
2828

2929
- name: Build
30-
run: dotnet build greeter-messages/greeter-messages.csproj --no-restore --configuration Release
30+
run: dotnet build Greeter.Messages/Greeter.Messages.csproj --no-restore --configuration Release
3131

3232
- name: Test
33-
run: dotnet test greeter-messages/greeter-messages.csproj --no-build --verbosity normal
33+
run: dotnet test Greeter.Messages/Greeter.Messages.csproj --no-build --verbosity normal
3434

3535
greeter:
3636
runs-on: ubuntu-latest
@@ -46,14 +46,14 @@ jobs:
4646
dotnet-version: '8.0.x'
4747

4848
- name: Restore dependencies
49-
run: dotnet restore greeter/greeter.csproj
49+
run: dotnet restore Greeter/Greeter.csproj
5050

5151
- name: Check code formatting
52-
run: dotnet format --verify-no-changes greeter/
52+
run: dotnet format --verify-no-changes Greeter/
5353

5454
- name: Build
55-
run: dotnet build greeter/greeter.csproj --no-restore --configuration Release
55+
run: dotnet build Greeter/Greeter.csproj --no-restore --configuration Release
5656

5757
- name: Test
58-
run: dotnet test greeter/greeter.csproj --no-build --verbosity normal
58+
run: dotnet test Greeter/Greeter.csproj --no-build --verbosity normal
5959

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*/bin/
22
*/obj/
3+
.vs/
4+
*.user

greeter-messages/greeter-messages.csproj renamed to Greeter.Messages/Greeter.Messages.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<PropertyGroup>
12-
<SteeltoeVersion>4.0.*-*</SteeltoeVersion>
12+
<SteeltoeVersion>4.0.*</SteeltoeVersion>
1313
</PropertyGroup>
1414

1515
<ItemGroup>

greeter-messages/Program.cs renamed to Greeter.Messages/Program.cs

File renamed without changes.

greeter/Properties/launchSettings.json renamed to Greeter.Messages/Properties/launchSettings.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
{
2-
"$schema": "https://json.schemastore.org/launchsettings.json",
32
"profiles": {
43
"http": {
54
"commandName": "Project",
6-
"dotnetRunMessages": true,
75
"launchBrowser": true,
8-
"applicationUrl": "http://localhost:8080",
6+
"launchUrl": "greeting",
97
"environmentVariables": {
108
"ASPNETCORE_ENVIRONMENT": "Development"
11-
}
9+
},
10+
"dotnetRunMessages": true,
11+
"applicationUrl": "http://localhost:8081"
1212
},
1313
"https": {
1414
"commandName": "Project",
15-
"dotnetRunMessages": true,
1615
"launchBrowser": true,
17-
"applicationUrl": "https://localhost:8443;http://localhost:8080",
16+
"launchUrl": "greeting",
1817
"environmentVariables": {
1918
"ASPNETCORE_ENVIRONMENT": "Development"
20-
}
19+
},
20+
"dotnetRunMessages": true,
21+
"applicationUrl": "https://localhost:8444;http://localhost:8081"
2122
}
22-
}
23-
}
23+
},
24+
"$schema": "https://json.schemastore.org/launchsettings.json"
25+
}

‎Greeter.Messages/appsettings.Development.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"$schema": "https://steeltoe.io/schema/latest/schema.json",
3+
"Eureka": {
4+
"Instance": {
5+
"HostName": "localhost"
6+
}
7+
}
8+
}

greeter-messages/appsettings.json renamed to Greeter.Messages/appsettings.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
2+
"$schema": "https://steeltoe.io/schema/latest/schema.json",
23
"Logging": {
34
"LogLevel": {
45
"Default": "Information",
56
"Microsoft.AspNetCore": "Warning"
67
}
78
},
8-
"spring": {
9-
"application": {
10-
"name": "greeter-messages"
9+
"Spring": {
10+
"Application": {
11+
"Name": "greeter-messages"
1112
}
1213
}
1314
}

‎Greeter.slnLaunch‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[
2+
{
3+
"Name": "Greeter",
4+
"Projects": [
5+
{
6+
"Path": "Greeter.Messages\\Greeter.Messages.csproj",
7+
"Action": "Start"
8+
},
9+
{
10+
"Path": "Greeter\\Greeter.csproj",
11+
"Action": "Start"
12+
}
13+
]
14+
}
15+
]

‎Greeter.slnx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<Solution>
2+
<Project Path="Greeter.Messages/Greeter.Messages.csproj" />
3+
<Project Path="Greeter/Greeter.csproj" />
4+
</Solution>

0 commit comments

Comments
 (0)