Skip to content
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
18 changes: 18 additions & 0 deletions .cfignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# DotNet
bin/
obj/

# user-specific state
*.user

# VS Code
.vscode/
*.code-workspace

# Visual Studio
.vs/

# Common files that don't need to be pushed
manifest.yml
*.md
launchSettings.json
File renamed without changes.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ jobs:
dotnet-version: '8.0.x'

- name: Restore dependencies
run: dotnet restore greeter-messages/greeter-messages.csproj
run: dotnet restore Greeter.Messages/Greeter.Messages.csproj

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

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

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

greeter:
runs-on: ubuntu-latest
Expand All @@ -46,14 +46,14 @@ jobs:
dotnet-version: '8.0.x'

- name: Restore dependencies
run: dotnet restore greeter/greeter.csproj
run: dotnet restore Greeter/Greeter.csproj

- name: Check code formatting
run: dotnet format --verify-no-changes greeter/
run: dotnet format --verify-no-changes Greeter/

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

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

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
*/bin/
*/obj/
.vs/
*.user
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<PropertyGroup>
<SteeltoeVersion>4.0.*-*</SteeltoeVersion>
<SteeltoeVersion>4.0.*</SteeltoeVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:8080",
"launchUrl": "greeting",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"dotnetRunMessages": true,
"applicationUrl": "http://localhost:8081"
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "https://localhost:8443;http://localhost:8080",
"launchUrl": "greeting",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"dotnetRunMessages": true,
"applicationUrl": "https://localhost:8444;http://localhost:8081"
}
}
}
},
"$schema": "https://json.schemastore.org/launchsettings.json"
}
8 changes: 8 additions & 0 deletions Greeter.Messages/appsettings.Development.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"$schema": "https://steeltoe.io/schema/latest/schema.json",
"Eureka": {
"Instance": {
"HostName": "localhost"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"$schema": "https://steeltoe.io/schema/latest/schema.json",
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"spring": {
"application": {
"name": "greeter-messages"
"Spring": {
"Application": {
"Name": "greeter-messages"
}
}
}
15 changes: 15 additions & 0 deletions Greeter.slnLaunch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"Name": "Greeter",
"Projects": [
{
"Path": "Greeter.Messages\\Greeter.Messages.csproj",
"Action": "Start"
},
{
"Path": "Greeter\\Greeter.csproj",
"Action": "Start"
}
]
}
]
4 changes: 4 additions & 0 deletions Greeter.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<Solution>
<Project Path="Greeter.Messages/Greeter.Messages.csproj" />
<Project Path="Greeter/Greeter.csproj" />
</Solution>
2 changes: 1 addition & 1 deletion greeter/greeter.csproj → Greeter/Greeter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<PropertyGroup>
<SteeltoeVersion>4.0.*-*</SteeltoeVersion>
<SteeltoeVersion>4.0.*</SteeltoeVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
9 changes: 9 additions & 0 deletions Greeter/GreeterService.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace Greeter;

public class GreeterService(HttpClient httpClient)
{
public async Task<string?> Greet(string salutation, string name)
{
return await httpClient.GetStringAsync($"https://GREETER-MESSAGES/greeting?salutation={salutation}&name={name}");
}
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "hello?salutation=Hi&name=Frank",
"applicationUrl": "http://localhost:8080",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
Expand All @@ -14,6 +15,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "hello?salutation=Hi&name=Frank",
"applicationUrl": "https://localhost:8443;http://localhost:8080",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
Expand Down
8 changes: 8 additions & 0 deletions Greeter/appsettings.Development.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"$schema": "https://steeltoe.io/schema/latest/schema.json",
"Eureka": {
"Instance": {
"HostName": "localhost"
}
}
}
7 changes: 4 additions & 3 deletions greeter/appsettings.json → Greeter/appsettings.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"$schema": "https://steeltoe.io/schema/latest/schema.json",
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"spring": {
"application": {
"name": "greeter"
"Spring": {
"Application": {
"Name": "greeter"
}
}
}
7 changes: 0 additions & 7 deletions greeter-messages/app.config

This file was deleted.

3 changes: 0 additions & 3 deletions greeter-messages/greeter-messages.slnx

This file was deleted.

44 changes: 0 additions & 44 deletions greeter/.editorconfig

This file was deleted.

16 changes: 0 additions & 16 deletions greeter/GreeterService.cs

This file was deleted.

7 changes: 0 additions & 7 deletions greeter/app.config

This file was deleted.

3 changes: 0 additions & 3 deletions greeter/greeter.slnx

This file was deleted.

12 changes: 9 additions & 3 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,20 @@ applications:
random-route: true
memory: 64M
buildpack: dotnet_core_buildpack
path: greeter-messages
path: Greeter.Messages
services:
- greeter-service-registry

env:
DOTNET_CLI_TELEMETRY_OPTOUT: "true"
DOTNET_NOLOGO: "true"

- name: greeter
random-route: true
memory: 64M
buildpack: dotnet_core_buildpack
path: greeter
path: Greeter
services:
- greeter-service-registry
env:
DOTNET_CLI_TELEMETRY_OPTOUT: "true"
DOTNET_NOLOGO: "true"