Skip to content

Commit e38abbf

Browse files
tjain-mstjain-ms
committed
update Services\Ordering and services\Catalog
1 parent ea24ac5 commit e38abbf

14 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎src/Services/Catalog/Catalog.API/Catalog.API.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<DebugType>portable</DebugType>
66
<PreserveCompilationContext>true</PreserveCompilationContext>
77
<AssemblyName>Catalog.API</AssemblyName>
@@ -56,7 +56,7 @@
5656
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.18.0" />
5757
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="2.0.2-beta2" />
5858
<PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
59-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
59+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-rc.2.22476.2" />
6060
<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.18" />
6161
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.0" />
6262
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />

‎src/Services/Catalog/Catalog.API/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
22
WORKDIR /app
33
EXPOSE 80
44
EXPOSE 443
55

6-
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
6+
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
77
WORKDIR /src
88

99
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles

‎src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

‎src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

‎src/Services/Ordering/Ordering.API/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
5+
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
66
WORKDIR /src
77

88
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles

‎src/Services/Ordering/Ordering.API/Ordering.API.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<UserSecretsId>aspnet-Ordering.API-20161122013547</UserSecretsId>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>

‎src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
5+
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
66
WORKDIR /src
77

88
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles

‎src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<UserSecretsId>dotnet-Ordering.BackgroundTasks-9D3E1DD6-405B-447F-8AAB-1708B36D260E</UserSecretsId>
66
<GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
77
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>

‎src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

0 commit comments

Comments
 (0)