diff --git a/.github/workflows/auto-pull-request-checks.yml b/.github/workflows/auto-pull-request-checks.yml index 9884c1c6be1..a3f8a4f57f6 100644 --- a/.github/workflows/auto-pull-request-checks.yml +++ b/.github/workflows/auto-pull-request-checks.yml @@ -17,7 +17,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 10.0.x + global-json-file: global.json - name: Cache NuGet packages uses: actions/cache@v4 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6060be9b53..05ef1b0e101 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET Core SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 10.0.x + global-json-file: global.json - name: Cache NuGet packages uses: actions/cache@v4 diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index b20fdb6f686..5acf38d3fd0 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -20,7 +20,7 @@ jobs: - name: Setup .NET Core SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 10.0.x + global-json-file: global.json - name: Cache NuGet packages uses: actions/cache@v4 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c2789f8cc91..874a103eb6e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: - name: Setup .NET Core SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 10.0.x + global-json-file: global.json - name: Publish wasm run: | diff --git a/Version.props b/Version.props index a39d9af4200..ba81f4b13c8 100644 --- a/Version.props +++ b/Version.props @@ -1,8 +1,8 @@ - net10.0 - net6.0;net7.0;net8.0;net9.0;net10.0 + net11.0 + net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 diff --git a/dotnet-tools.json b/dotnet-tools.json index a54cec9c9af..9c29112b285 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,14 +3,14 @@ "isRoot": true, "tools": { "bootstrapblazor.cssbundler": { - "version": "10.0.0", + "version": "10.0.1", "commands": [ "css-bundler" ], "rollForward": false }, "bootstrapblazor.llmsdocsgenerator": { - "version": "10.0.3", + "version": "10.0.4", "commands": [ "llms-docs" ], diff --git a/global.json b/global.json new file mode 100644 index 00000000000..075bf794af7 --- /dev/null +++ b/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "11.0.100-rc.2.26504.105", + "rollForward": "latestPatch", + "allowPrerelease": true + } +} diff --git a/scripts/linux/deploy-blazor.sh b/scripts/linux/deploy-blazor.sh index cdb3980f08d..e4eef92d49b 100644 --- a/scripts/linux/deploy-blazor.sh +++ b/scripts/linux/deploy-blazor.sh @@ -10,6 +10,6 @@ curl https://www.blazor.zone/api/dispatch?token=BootstrapBlazor-Reboot dotnet publish src/BootstrapBlazor.Server -c Release systemctl stop ba.blazor -\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net10.0/publish/* /usr/local/ba/blazor +\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net11.0/publish/* /usr/local/ba/blazor systemctl start ba.blazor systemctl status ba.blazor -l --no-pager diff --git a/scripts/linux/deploy.sh b/scripts/linux/deploy.sh index 879178e02ed..5ad2746e1d0 100644 --- a/scripts/linux/deploy.sh +++ b/scripts/linux/deploy.sh @@ -49,4 +49,4 @@ sudo dpkg -i packages-microsoft-prod.deb rm packages-microsoft-prod.deb sudo apt-get update && \ - sudo apt-get install -y dotnet-sdk-10.0 + sudo apt-get install -y dotnet-sdk-11.0 diff --git a/src/BootstrapBlazor.Server/Dockerfile b/src/BootstrapBlazor.Server/Dockerfile index 881334f77dc..645f4a4b5a3 100644 --- a/src/BootstrapBlazor.Server/Dockerfile +++ b/src/BootstrapBlazor.Server/Dockerfile @@ -1,7 +1,7 @@ #Depending on the operating system of the host machines(s) that will build or run the containers, the image specified in the FROM statement may need to be changed. #For more information, please see https://aka.ms/containercompat -FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:11.0-preview AS base WORKDIR /app EXPOSE 8080 @@ -11,7 +11,7 @@ RUN apt install -y ./google-chrome-stable_current_amd64.deb RUN rm ./google-chrome-stable_current_amd64.deb RUN apt install -y fonts-wqy-microhei -FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:11.0-preview AS build WORKDIR / COPY . . diff --git a/src/BootstrapBlazor.Server/appsettings.json b/src/BootstrapBlazor.Server/appsettings.json index 695457f9d91..0f2723594a9 100644 --- a/src/BootstrapBlazor.Server/appsettings.json +++ b/src/BootstrapBlazor.Server/appsettings.json @@ -78,7 +78,7 @@ }, "WebsiteOptions": { "ServerUrl": "https://www.blazor.zone", - "TargetFrameworks": [ "NET6.0", "NET7.0", "NET8.0", "NET9.0", "NET10.0" ], + "TargetFrameworks": [ "NET6.0", "NET7.0", "NET8.0", "NET9.0", "NET10.0", "NET11.0" ], "Themes": [ { "key": "bootstrap", diff --git a/src/BootstrapBlazor/Directory.Build.props b/src/BootstrapBlazor/Directory.Build.props index 789d2c09dad..ae91609a5a8 100644 --- a/src/BootstrapBlazor/Directory.Build.props +++ b/src/BootstrapBlazor/Directory.Build.props @@ -27,6 +27,7 @@ 8.0.* 9.0.* 10.0.0 + 11.0.0-rc.* @@ -75,7 +76,16 @@ - + + + + + + + + + +