Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion Apollo.Analysis.Worker/Apollo.Analysis.Worker.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<!-- .NET 11 RC1: the mono toolchain workload manifest no longer defaults these for
browser-wasm projects as the .NET 10 manifest did, and without them no runtime
pack resolves ("$(MicrosoftNetCoreAppRuntimePackDir)=''"). Setting them keeps the
exact .NET 10 configuration: the Mono runtime, self-contained. Remove at GA if the
manifest restores the defaults. -->
<SelfContained>true</SelfContained>
<UseMonoRuntime>true</UseMonoRuntime>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Analysis/Apollo.Analysis.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
12 changes: 11 additions & 1 deletion Apollo.Client/Apollo.Client.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
Expand All @@ -11,6 +11,16 @@
<WasmEnableStreamingResponse>false</WasmEnableStreamingResponse>
</PropertyGroup>

<!-- Trimming is disabled until .NET 11 GA. The RC1 IL trimmer (11.0.0-rc.1.26425.128)
recurses without bound in its DynamicallyAccessedMembers generic dataflow and dies
with a stack overflow, failing publish under the default partial trim mode.
TrimMode=full avoids the crash but strips DI-activated Mythetech.Framework types and
breaks startup. Untrimmed output behaves identically. Remove once the trimmer is fixed. -->
<PropertyGroup>
<PublishTrimmed>false</PublishTrimmed>
</PropertyGroup>


<ItemGroup>
<PackageReference Include="KristofferStrube.Blazor.WebWorkers" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" />
Expand Down
10 changes: 9 additions & 1 deletion Apollo.Compilation.Worker/Apollo.Compilation.Worker.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<OutputType>Exe</OutputType>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<!-- .NET 11 RC1: the mono toolchain workload manifest no longer defaults these for
browser-wasm projects as the .NET 10 manifest did, and without them no runtime
pack resolves ("$(MicrosoftNetCoreAppRuntimePackDir)=''"). Setting them keeps the
exact .NET 10 configuration: the Mono runtime, self-contained. Remove at GA if the
manifest restores the defaults. -->
<SelfContained>true</SelfContained>
<UseMonoRuntime>true</UseMonoRuntime>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Apollo.Compilation/Apollo.Compilation.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Apollo.Compliation</RootNamespace>
Expand All @@ -16,8 +16,6 @@
<PackageReference Include="Microsoft.CodeAnalysis.Razor" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="System.Console" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Components/Apollo.Components.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Company>Mythetech</Company>
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Contracts/Apollo.Contracts.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
10 changes: 9 additions & 1 deletion Apollo.Hosting.Worker/Apollo.Hosting.Worker.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<!-- .NET 11 RC1: the mono toolchain workload manifest no longer defaults these for
browser-wasm projects as the .NET 10 manifest did, and without them no runtime
pack resolves ("$(MicrosoftNetCoreAppRuntimePackDir)=''"). Setting them keeps the
exact .NET 10 configuration: the Mono runtime, self-contained. Remove at GA if the
manifest restores the defaults. -->
<SelfContained>true</SelfContained>
<UseMonoRuntime>true</UseMonoRuntime>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
4 changes: 1 addition & 3 deletions Apollo.Hosting/Apollo.Hosting.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Infrastructure/Apollo.Infrastructure.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Apollo.Test/Apollo.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
21 changes: 9 additions & 12 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageVersion Include="BlazorMonaco" Version="3.3.0" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.13.2" />
<PackageVersion Include="Mythetech.Framework" Version="0.18.1" />
<PackageVersion Include="Mythetech.Framework.WebAssembly" Version="0.18.1" />
<PackageVersion Include="Mythetech.Framework" Version="0.19.0" />
<PackageVersion Include="Mythetech.Framework.WebAssembly" Version="0.19.0" />
<!-- Blazor WebAssembly -->
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.5" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.12" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.12" />
<PackageVersion Include="KristofferStrube.Blazor.FileSystem" Version="0.3.1" />
<PackageVersion Include="KristofferStrube.Blazor.FileSystemAccess" Version="3.2.2" />
<PackageVersion Include="KristofferStrube.Blazor.WebWorkers" Version="0.1.0-alpha.7" />
Expand All @@ -34,15 +34,12 @@
<PackageVersion Include="OmniSharp.Roslyn" Version="1.39.13" />
<PackageVersion Include="OmniSharp.Roslyn.CSharp" Version="1.39.13" />
<!-- Microsoft Extensions -->
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.12" />
<!-- System -->
<PackageVersion Include="System.Console" Version="4.3.1" />
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.0" />
<PackageVersion Include="System.Security.Permissions" Version="10.0.0" />
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.12" />
<PackageVersion Include="System.Security.Permissions" Version="10.0.12" />
<!-- Tools -->
<PackageVersion Include="CSharpier.Core" Version="0.30.6" />
<!-- Testing -->
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "10.0.100",
"version": "11.0.100-rc.1.26425.128",
"rollForward": "latestMinor",
"allowPrerelease": false
"allowPrerelease": true
}
}
}
Loading