Skip to content

Commit

Permalink
Updated sample to latest package versions
Browse files Browse the repository at this point in the history
  • Loading branch information
fancyDevelopment committed Jun 11, 2024
1 parent 1b4502d commit 517eef1
Show file tree
Hide file tree
Showing 53 changed files with 222 additions and 224 deletions.
17 changes: 10 additions & 7 deletions src/Sample.FlightManagement/Sample.FlightManagement.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand All @@ -14,12 +14,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.*" />
<PackageReference Include="Fancy.ResourceLinker.Hateoas" Version="0.0.5" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
<PackageReference Include="Fancy.ResourceLinker.Hateoas" Version="0.0.9" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Sample.FlightManagement/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"AllowedHosts": "*",

"ConnectionStrings": {
"database": "Server=.;Database=FlightManagement;User Id=sa;Password=SA@sqlserver;TrustServerCertificate=True"
"database": "Server=.;Database=FlightManagement_sample;User Id=sa;Password=SA@sqlserver;TrustServerCertificate=True"
},

"Authentication": {
Expand Down
16 changes: 8 additions & 8 deletions src/Sample.FlightShopping/Sample.FlightShopping.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.11" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.11" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Fancy.ResourceLinker.Hateoas" Version="0.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<PackageReference Include="Fancy.ResourceLinker.Hateoas" Version="0.0.9" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Sample.FlightShopping/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"AllowedHosts": "*",

"ConnectionStrings": {
"database": "Server=.;Database=FlightShopping;User Id=sa;Password=SA@sqlserver;TrustServerCertificate=True"
"database": "Server=.;Database=FlightShopping_sample;User Id=sa;Password=SA@sqlserver;TrustServerCertificate=True"
},

"Authentication": {
Expand Down
18 changes: 9 additions & 9 deletions src/Sample.Gateway/Sample.Gateway.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.11" />
<PackageReference Include="OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper" Version="1.0.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.1-beta.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Fancy.ResourceLinker.Gateway" Version="0.0.5" />
<PackageReference Include="Fancy.ResourceLinker.Hateoas" Version="0.0.5" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
<PackageReference Include="OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<PackageReference Include="Fancy.ResourceLinker.Gateway" Version="0.0.9" />
<PackageReference Include="Fancy.ResourceLinker.Hateoas" Version="0.0.9" />
</ItemGroup>

</Project>
16 changes: 12 additions & 4 deletions src/Sample.Gateway/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,30 @@
"FlightManagement": {
"BaseUrl": "http://localhost:5000",
"PathMatch": "api/flight-management/{**path}",
"EnforceAuthentication": true
"Authentication": {
"Strategy": "TokenPassThrough"
}
},
"FlightShopping": {
"BaseUrl": "http://localhost:5001",
"PathMatch": "api/flight-shopping/{**path}",
"EnforceAuthentication": true
"Authentication": {
"Strategy": "TokenPassThrough"
}
},
"LegacyApp": {
"BaseUrl": "http://localhost:4300",
"PathMatch": "Sample.LegacyApp/{**path}",
"EnforceAuthentication": true
"Authentication": {
"Strategy": "TokenPassThrough"
}
},
"Frontend": {
"BaseUrl": "http://localhost:4200",
"PathMatch": "{**path}",
"EnforceAuthentication": true
"Authentication": {
"Strategy": "TokenPassThrough"
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Sample.LegacyApp/Content/bootstrap-grid.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Sample.LegacyApp/Content/bootstrap-grid.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Sample.LegacyApp/Content/bootstrap-grid.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Sample.LegacyApp/Content/bootstrap-grid.min.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Sample.LegacyApp/Content/bootstrap-grid.rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Sample.LegacyApp/Content/bootstrap-grid.rtl.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Sample.LegacyApp/Content/bootstrap-grid.rtl.min.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Sample.LegacyApp/Content/bootstrap-reboot.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Sample.LegacyApp/Content/bootstrap-reboot.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Sample.LegacyApp/Content/bootstrap-reboot.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Sample.LegacyApp/Content/bootstrap-reboot.min.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Sample.LegacyApp/Content/bootstrap-reboot.rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Sample.LegacyApp/Content/bootstrap-reboot.rtl.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit 517eef1

Please sign in to comment.