diff --git a/Dockerfile b/Dockerfile index 602cb04a..676c18a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base COPY --from=mcr.microsoft.com/dotnet/aspnet:6.0 /usr/share/dotnet/shared /usr/share/dotnet/shared @@ -16,7 +16,7 @@ RUN yarn install --frozen-lockfile COPY ["SW.Bitween.Web/ClientApp/", "./"] RUN yarn build -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY ["SW.Bitween.Web/SW.Bitween.Web.csproj", "SW.Bitween.Web/"] COPY ["SW.Bitween.Api/SW.Bitween.Api.csproj", "SW.Bitween.Api/"] diff --git a/SW.Bitween.Api/SW.Bitween.Api.csproj b/SW.Bitween.Api/SW.Bitween.Api.csproj index 5dbee8c5..6ec83588 100644 --- a/SW.Bitween.Api/SW.Bitween.Api.csproj +++ b/SW.Bitween.Api/SW.Bitween.Api.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 SW.Bitween @@ -21,7 +21,7 @@ - + - + diff --git a/SW.Bitween.MsSql/SW.Bitween.MsSql.csproj b/SW.Bitween.MsSql/SW.Bitween.MsSql.csproj index bb41ca29..bf26e8a3 100644 --- a/SW.Bitween.MsSql/SW.Bitween.MsSql.csproj +++ b/SW.Bitween.MsSql/SW.Bitween.MsSql.csproj @@ -1,13 +1,13 @@ - net8.0 + net10.0 SW.Bitween.MsSql - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SW.Bitween.MySql/SW.Bitween.MySql.csproj b/SW.Bitween.MySql/SW.Bitween.MySql.csproj index 3081064c..e34a0540 100644 --- a/SW.Bitween.MySql/SW.Bitween.MySql.csproj +++ b/SW.Bitween.MySql/SW.Bitween.MySql.csproj @@ -1,13 +1,13 @@ - net8.0 + net10.0 SW.Bitween.MySql - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SW.Bitween.NativeAdapters/SW.Bitween.NativeAdapters.csproj b/SW.Bitween.NativeAdapters/SW.Bitween.NativeAdapters.csproj index 3bbdcaba..007c67b1 100644 --- a/SW.Bitween.NativeAdapters/SW.Bitween.NativeAdapters.csproj +++ b/SW.Bitween.NativeAdapters/SW.Bitween.NativeAdapters.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable enable diff --git a/SW.Bitween.PgSql/SW.Bitween.PgSql.csproj b/SW.Bitween.PgSql/SW.Bitween.PgSql.csproj index 4bfbb7ba..1900129c 100644 --- a/SW.Bitween.PgSql/SW.Bitween.PgSql.csproj +++ b/SW.Bitween.PgSql/SW.Bitween.PgSql.csproj @@ -1,14 +1,14 @@ - net8.0 + net10.0 SW.Bitween.PgSql - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SW.Bitween.SampleConfigurableAdapter/SW.Bitween.SampleConfigurableAdapter.csproj b/SW.Bitween.SampleConfigurableAdapter/SW.Bitween.SampleConfigurableAdapter.csproj index e88ef705..574f6962 100644 --- a/SW.Bitween.SampleConfigurableAdapter/SW.Bitween.SampleConfigurableAdapter.csproj +++ b/SW.Bitween.SampleConfigurableAdapter/SW.Bitween.SampleConfigurableAdapter.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + net10.0 SW.Bitween.SampleConfigurableAdapter diff --git a/SW.Bitween.SampleHandler/SW.Bitween.SampleHandler.csproj b/SW.Bitween.SampleHandler/SW.Bitween.SampleHandler.csproj index e1f52c9c..0a1f988f 100644 --- a/SW.Bitween.SampleHandler/SW.Bitween.SampleHandler.csproj +++ b/SW.Bitween.SampleHandler/SW.Bitween.SampleHandler.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 SW.Bitween.SampleHandler diff --git a/SW.Bitween.SampleMapper/SW.Bitween.SampleMapper.csproj b/SW.Bitween.SampleMapper/SW.Bitween.SampleMapper.csproj index 407d145d..b98f76c9 100644 --- a/SW.Bitween.SampleMapper/SW.Bitween.SampleMapper.csproj +++ b/SW.Bitween.SampleMapper/SW.Bitween.SampleMapper.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 SW.Bitween.SampleMapper diff --git a/SW.Bitween.SampleValidator/SW.Bitween.SampleValidator.csproj b/SW.Bitween.SampleValidator/SW.Bitween.SampleValidator.csproj index 8daa047e..b9dc71af 100644 --- a/SW.Bitween.SampleValidator/SW.Bitween.SampleValidator.csproj +++ b/SW.Bitween.SampleValidator/SW.Bitween.SampleValidator.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 SW.Bitween.SampleValidator diff --git a/SW.Bitween.Sdk/SW.Bitween.Sdk.csproj b/SW.Bitween.Sdk/SW.Bitween.Sdk.csproj index 80b9e875..233fc592 100644 --- a/SW.Bitween.Sdk/SW.Bitween.Sdk.csproj +++ b/SW.Bitween.Sdk/SW.Bitween.Sdk.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 SimplyWorks.Bitween.Sdk SimplyWorks.Bitween.Sdk Simplify9 diff --git a/SW.Bitween.UnitTests/SW.Bitween.UnitTests.csproj b/SW.Bitween.UnitTests/SW.Bitween.UnitTests.csproj index 89c86f40..d0bd3a45 100644 --- a/SW.Bitween.UnitTests/SW.Bitween.UnitTests.csproj +++ b/SW.Bitween.UnitTests/SW.Bitween.UnitTests.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 latest false SW.Bitween.UnitTests @@ -12,10 +12,10 @@ - - + + - + diff --git a/SW.Bitween.Web/SW.Bitween.Web.csproj b/SW.Bitween.Web/SW.Bitween.Web.csproj index d0543c25..c4818cf0 100644 --- a/SW.Bitween.Web/SW.Bitween.Web.csproj +++ b/SW.Bitween.Web/SW.Bitween.Web.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 1.0.0.0 SW.Bitween.Web ClientApp\ @@ -30,15 +30,15 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b9e25c82..40bb33ea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,7 @@ variables: - name: imageName value: 'bitween' - name: version - value: $[format('8.0.{0}', counter('8.0', 0))] + value: $[format('10.0.{0}', counter('10.0', 0))] jobs: @@ -22,10 +22,10 @@ jobs: steps: - task: UseDotNet@2 - displayName: 'Use .NET Core sdk 8.0.x' + displayName: 'Use .NET Core sdk 10.0.x' inputs: packageType: sdk - version: 8.0.x + version: 10.0.x installationPath: $(Agent.ToolsDirectory)/dotnet - task: DotNetCoreCLI@2