Update last bits to net10.0

This commit is contained in:
Lisandro Crespo
2026-06-25 08:33:10 -05:00
parent 7bbdd0fdde
commit cda92ff3a4
4 changed files with 18 additions and 49 deletions
@@ -1,56 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<!-- If you encounter:
"error NETSDK1084: There is no application host available for the specified RuntimeIdentifier 'wasi-wasm'."
Try:
`dotnet workload install wasi-experimental` -->
<TargetFramework>net10.0</TargetFramework>
<RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PublishTrimmed>true</PublishTrimmed>
<SelfContained>true</SelfContained>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
<RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json;https://api.nuget.org/v3/index.json;$(RestoreAdditionalProjectSources)</RestoreAdditionalProjectSources>
<!-- ignore naming conventions, we're trying to match Rust 1:1 -->
<NoWarn>$(NoWarn);CS8981;IDE1006</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(EXPERIMENTAL_WASM_AOT)' == '1'">
<TargetFramework>net10.0</TargetFramework>
<DefineConstants>$(DefineConstants);EXPERIMENTAL_WASM_AOT</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SpacetimeDB.Runtime" Version="2.7.*" />
</ItemGroup>
<PropertyGroup Condition="'$(EXPERIMENTAL_WASM_AOT)' == '1'">
<PublishTrimmed>true</PublishTrimmed>
<SelfContained>true</SelfContained>
<WasmEnableThreads>false</WasmEnableThreads>
</PropertyGroup>
<Target Name="UseWasiRuntimeOverlayWithoutComponentWit"
Condition="'$(EXPERIMENTAL_WASM_AOT)' == '1'"
AfterTargets="SetupProperties"
BeforeTargets="LinkNativeLlvm">
<PropertyGroup>
<_OriginalIlcSdkPath>$(IlcSdkPath)</_OriginalIlcSdkPath>
<_WasiRuntimeOverlayDir>$(IntermediateOutputPath)native-hidden-no-wit\</_WasiRuntimeOverlayDir>
</PropertyGroup>
<ItemGroup>
<_WasiRuntimeOverlaySource Include="$(IlcFrameworkNativePath)**\*" Exclude="$(IlcFrameworkNativePath)**\*.wit" />
</ItemGroup>
<RemoveDir Directories="$(_WasiRuntimeOverlayDir)" />
<MakeDir Directories="$(_WasiRuntimeOverlayDir)" />
<Copy SourceFiles="@(_WasiRuntimeOverlaySource)"
DestinationFiles="@(_WasiRuntimeOverlaySource->'$(_WasiRuntimeOverlayDir)%(RecursiveDir)%(Filename)%(Extension)')" />
<PropertyGroup>
<IlcFrameworkNativePath>$(_WasiRuntimeOverlayDir)</IlcFrameworkNativePath>
<IlcSdkPath>$(_OriginalIlcSdkPath)</IlcSdkPath>
</PropertyGroup>
</Target>
<ItemGroup Condition="'$(EXPERIMENTAL_WASM_AOT)' == '1'">
<PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-*" />
<PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-*" />
</ItemGroup>
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+9 -5
View File
@@ -1,11 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Only needed when referencing local dependencies as projects. For published packages, these are imported automatically. -->
<Import Project="../crates/bindings-csharp/Runtime/build/SpacetimeDB.Runtime.props" />
<PropertyGroup>
<TargetName>StdbModule</TargetName>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework Condition="'$(EXPERIMENTAL_WASM_AOT)' == '1'">net10.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
@@ -15,4 +11,12 @@
<!-- ignore naming conventions, we're trying to match Rust 1:1 -->
<NoWarn>$(NoWarn);CS8981;IDE1006</NoWarn>
</PropertyGroup>
<!-- Only needed when referencing local dependencies as projects. For published packages, these are imported automatically. -->
<Import Project="../crates/bindings-csharp/Runtime/build/SpacetimeDB.Runtime.props" />
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-*" GeneratePathProperty="true" />
<PackageReference Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-*" />
</ItemGroup>
</Project>
@@ -10,7 +10,7 @@
<SelfContained>true</SelfContained>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
<RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json;https://api.nuget.org/v3/index.json</RestoreAdditionalProjectSources>
<RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json;https://api.nuget.org/v3/index.json;$(RestoreAdditionalProjectSources)</RestoreAdditionalProjectSources>
</PropertyGroup>
<ItemGroup>