diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b03ca7c..d6a8401 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 10.0.x + global-json-file: global.json - name: Install .NET WASM workload run: dotnet workload install wasm-tools diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index e3dcd67..764bd12 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -1,7 +1,7 @@ # Simple workflow for deploying static content to GitHub Pages name: Deploy Apollo env: - PUBLISH_DIR: Apollo.Client/bin/Release/net10.0/publish/wwwroot + PUBLISH_DIR: Apollo.Client/bin/Release/net11.0/publish/wwwroot on: # Runs on pushes targeting the default branch and PRs @@ -40,7 +40,7 @@ jobs: - name: Get latest .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: "10.0.x" + global-json-file: global.json - name: Install .Net WASM workload run: dotnet workload install wasm-tools @@ -70,7 +70,7 @@ jobs: - name: Get latest .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: "10.0.x" + global-json-file: global.json - name: Install .Net WASM workload run: dotnet workload install wasm-tools diff --git a/Apollo.Analysis.Worker/Apollo.Analysis.Worker.csproj b/Apollo.Analysis.Worker/Apollo.Analysis.Worker.csproj index a22f681..a977fd6 100644 --- a/Apollo.Analysis.Worker/Apollo.Analysis.Worker.csproj +++ b/Apollo.Analysis.Worker/Apollo.Analysis.Worker.csproj @@ -1,9 +1,17 @@ - net10.0 + net11.0 browser-wasm Exe true + + + true + true enable enable diff --git a/Apollo.Analysis/Apollo.Analysis.csproj b/Apollo.Analysis/Apollo.Analysis.csproj index d2745ae..31ae09b 100644 --- a/Apollo.Analysis/Apollo.Analysis.csproj +++ b/Apollo.Analysis/Apollo.Analysis.csproj @@ -1,7 +1,7 @@  - net10.0 + net11.0 enable enable diff --git a/Apollo.Client/Apollo.Client.csproj b/Apollo.Client/Apollo.Client.csproj index f9b066b..fcb897c 100644 --- a/Apollo.Client/Apollo.Client.csproj +++ b/Apollo.Client/Apollo.Client.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 enable enable service-worker-assets.js @@ -11,6 +11,16 @@ false + + + false + + + diff --git a/Apollo.Compilation.Worker/Apollo.Compilation.Worker.csproj b/Apollo.Compilation.Worker/Apollo.Compilation.Worker.csproj index 3db86b9..fafa837 100644 --- a/Apollo.Compilation.Worker/Apollo.Compilation.Worker.csproj +++ b/Apollo.Compilation.Worker/Apollo.Compilation.Worker.csproj @@ -1,12 +1,20 @@  - net10.0 + net11.0 Exe browser-wasm enable enable true + + + true + true diff --git a/Apollo.Compilation/Apollo.Compilation.csproj b/Apollo.Compilation/Apollo.Compilation.csproj index 81d3222..63beef2 100644 --- a/Apollo.Compilation/Apollo.Compilation.csproj +++ b/Apollo.Compilation/Apollo.Compilation.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 enable enable Apollo.Compliation @@ -16,8 +16,6 @@ - - diff --git a/Apollo.Components/Apollo.Components.csproj b/Apollo.Components/Apollo.Components.csproj index 0e1dbc1..8adbb5f 100644 --- a/Apollo.Components/Apollo.Components.csproj +++ b/Apollo.Components/Apollo.Components.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 enable enable Mythetech diff --git a/Apollo.Contracts/Apollo.Contracts.csproj b/Apollo.Contracts/Apollo.Contracts.csproj index d7b2a6c..3e617d4 100644 --- a/Apollo.Contracts/Apollo.Contracts.csproj +++ b/Apollo.Contracts/Apollo.Contracts.csproj @@ -1,7 +1,7 @@  - net10.0 + net11.0 enable enable diff --git a/Apollo.Hosting.Worker/Apollo.Hosting.Worker.csproj b/Apollo.Hosting.Worker/Apollo.Hosting.Worker.csproj index 4d720b6..643040e 100644 --- a/Apollo.Hosting.Worker/Apollo.Hosting.Worker.csproj +++ b/Apollo.Hosting.Worker/Apollo.Hosting.Worker.csproj @@ -1,9 +1,17 @@  - net10.0 + net11.0 browser-wasm Exe true + + + true + true enable enable diff --git a/Apollo.Hosting/Apollo.Hosting.csproj b/Apollo.Hosting/Apollo.Hosting.csproj index e667805..24cb501 100644 --- a/Apollo.Hosting/Apollo.Hosting.csproj +++ b/Apollo.Hosting/Apollo.Hosting.csproj @@ -1,14 +1,12 @@  - net10.0 + net11.0 enable enable - - diff --git a/Apollo.Infrastructure/Apollo.Infrastructure.csproj b/Apollo.Infrastructure/Apollo.Infrastructure.csproj index 891fdcc..5aacff8 100644 --- a/Apollo.Infrastructure/Apollo.Infrastructure.csproj +++ b/Apollo.Infrastructure/Apollo.Infrastructure.csproj @@ -1,7 +1,7 @@  - net10.0 + net11.0 enable enable diff --git a/Apollo.Test/Apollo.Test.csproj b/Apollo.Test/Apollo.Test.csproj index 435dd0f..830cfcc 100644 --- a/Apollo.Test/Apollo.Test.csproj +++ b/Apollo.Test/Apollo.Test.csproj @@ -1,7 +1,7 @@  - net10.0 + net11.0 enable enable diff --git a/Directory.Packages.props b/Directory.Packages.props index 2896bd6..508798d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,11 +7,11 @@ - - + + - - + + @@ -34,15 +34,12 @@ - - - - - + + + - - - + + diff --git a/global.json b/global.json index 69e101b..9e46b8b 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "10.0.100", + "version": "11.0.100-rc.1.26425.128", "rollForward": "latestMinor", - "allowPrerelease": false + "allowPrerelease": true } -} \ No newline at end of file +}