diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 2d290799..4bab0ed2 100644 --- 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 diff --git a/README.md b/README.md index af1bf044..caabbce5 100644 --- 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 diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile index c9ace1e3..f206f1e9 100644 --- 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 diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile index 37034da2..cf9b7fff 100644 --- 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 diff --git a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile index 7f870986..8e3ab1b8 100644 --- 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 diff --git a/global.json b/global.json index 10b65be8..77c776f8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.100", + "version": "7.0.100", "rollForward": "latestFeature" } } diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile index 8d3c75db..2dc679e3 100644 --- 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 diff --git a/services/basket/src/EShopOnAbp.BasketService/Dockerfile b/services/basket/src/EShopOnAbp.BasketService/Dockerfile index da15ab01..0a8d12af 100644 --- 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 diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile index 7f3501e2..db74b4bc 100644 --- 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 diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile index f743486c..967e1726 100644 --- 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 diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile index d0c3944b..d62554dd 100644 --- 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 diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile index 57ba0373..793e3971 100644 --- 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 diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile index 02c6bc73..83b1f36d 100644 --- 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