Completed upgrading to net7

4 years ago · df3107fa1c
13 changed files with 3 additions and 13 deletions
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@ -16,7 +16,7 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v2
      with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
    - name: Restore dependencies
      run: dotnet restore
    - name: Build
--- a/README.md
+++ b/README.md
@ -16,7 +16,7 @@ You can either run in Visual Studio, or using [Microsoft Tye](https://github.com

 ### Requirements

- .NET 6.0+
+- .NET 7.0+
 - Docker
 - Yarn

--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile
@ -42,7 +42,6 @@ COPY . .
 WORKDIR "/src/apps/public-web/src/EShopOnAbp.PublicWeb"

 RUN dotnet publish -c Release -o /app 
-# Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 

 FROM build AS publish
--- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile
+++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile
@ -41,7 +41,6 @@ COPY . .

 WORKDIR "/src/gateways/web-public/src/EShopOnAbp.WebPublicGateway"
 RUN dotnet publish -c Release -o /app 
-# Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 

 FROM build AS publish
--- a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile
+++ b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile
@ -41,7 +41,6 @@ COPY . .

 WORKDIR "/src/gateways/web/src/EShopOnAbp.WebGateway"
 RUN dotnet publish -c Release -o /app 
-# Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 

 FROM build AS publish
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "6.0.100",
+    "version": "7.0.100",
    "rollForward": "latestFeature"
  }
 }
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile
@ -41,7 +41,6 @@ COPY . .

 WORKDIR "/src/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host"
 RUN dotnet publish -c Release -o /app 
-# Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 

 FROM build AS publish
--- a/services/basket/src/EShopOnAbp.BasketService/Dockerfile
+++ b/services/basket/src/EShopOnAbp.BasketService/Dockerfile
@ -41,7 +41,6 @@ COPY . .

 WORKDIR "/src/services/basket/src/EShopOnAbp.BasketService"
 RUN dotnet publish -c Release -o /app 
-# Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 

 FROM build AS publish
--- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile
+++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile
@ -41,7 +41,6 @@ COPY . .

 WORKDIR "/src/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host"
 RUN dotnet publish -c Release -o /app 
-# Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 

 FROM build AS publish
--- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile
@ -41,7 +41,6 @@ COPY . .

 WORKDIR "/src/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host"
 RUN dotnet publish -c Release -o /app 
-# Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 

 FROM build AS publish
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile
@ -41,7 +41,6 @@ COPY . .

 WORKDIR "/src/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host"
 RUN dotnet publish -c Release -o /app 
-# Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 

 FROM build AS publish
--- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile
+++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile
@ -41,7 +41,6 @@ COPY . .

 WORKDIR "/src/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host"
 RUN dotnet publish -c Release -o /app 
-# Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 

 FROM build AS publish
--- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile
+++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile
@ -41,7 +41,6 @@ COPY . .

 WORKDIR "/src/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host"
 RUN dotnet publish -c Release -o /app 
-# Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 

 FROM build AS publish