Skip to content

Commit 3b84d02

Browse files
jsturtevantjsturtevant
authored
Merge pull request #82 from jsturtevant/update-to-use-net10
Use dotnet 10 preview sdk
2 parents 820764e + 2408b02 commit 3b84d02

File tree

25 files changed

+32
-32
lines changed

25 files changed

+32
-32
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Build on ${{ matrix.os }} with Dotnet ${{ matrix.dotnet }}
1717
strategy:
1818
matrix:
19-
dotnet: [ '9.x']
19+
dotnet: [ '10.x']
2020
os: [ubuntu-latest, windows-latest]
2121
steps:
2222
- uses: actions/checkout@v4
@@ -51,5 +51,5 @@ jobs:
5151
name: nuget-packages
5252
path: artifacts/*.nupkg
5353
if-no-files-found: error
54-
if: ${{ matrix.dotnet == '9.x' && matrix.os == 'windows-latest' }}
54+
if: ${{ matrix.dotnet == '10.x' && matrix.os == 'windows-latest' }}
5555

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup .NET
2929
uses: actions/setup-dotnet@v4
3030
with:
31-
dotnet-version: 9.x
31+
dotnet-version: 10.x
3232
- name: Download artifacts
3333
uses: actions/download-artifact@v4
3434
with:

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<NoWarn>$(NoWarn);NU1507</NoWarn>
1010

1111
<!-- tool versions -->
12-
<WasmToolsVersion>1.227.0</WasmToolsVersion>
12+
<WasmToolsVersion>1.227.1</WasmToolsVersion>
1313
<WacVersion>v0.6.1</WacVersion>
14-
<PrebuiltWitBindgenVersion>0.40.0</PrebuiltWitBindgenVersion>
14+
<PrebuiltWitBindgenVersion>0.41.0</PrebuiltWitBindgenVersion>
1515
<PrebuildWkgVersion>0.10.0</PrebuildWkgVersion>
1616

1717
<!-- test artifacts -->

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<!-- find latest versions at https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-experimental by name of package -->
7-
<PackageVersion Include="Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-alpha.1.25118.1" />
8-
<PackageVersion Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-alpha.1.25118.1" />
7+
<PackageVersion Include="Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-alpha.1.25162.1" />
8+
<PackageVersion Include="runtime.$(NETCoreSdkPortableRuntimeIdentifier).Microsoft.DotNet.ILCompiler.LLVM" Version="10.0.0-alpha.1.25162.1" />
99

1010
<!-- Tests -->
1111
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.12.0,)" />

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ With this package, you can add one NuGet reference. The build output is fully AO
2424

2525
### 1. Set up SDKs
2626

27-
If you don't already have it, install [.NET 9+ SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0)
27+
If you don't already have it, install [.NET 10+ preview SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
2828

2929
### 2. Install template and build
3030

@@ -39,7 +39,7 @@ dotnet build MyApp
3939
If you have a recent version of [wasmtime](https://github.com/bytecodealliance/wasmtime/releases) on your path, you can now run
4040

4141
```bash
42-
wasmtime ./MyApp/bin/Debug/net9.0/wasi-wasm/publish/MyApp.wasm
42+
wasmtime ./MyApp/bin/Debug/net10.0/wasi-wasm/publish/MyApp.wasm
4343
Hello world from compontize-dotnet!
4444
```
4545

@@ -200,7 +200,7 @@ By default the project will find all wit files and execute wit-bindgen against e
200200

201201
### Configuring location of generaged wit files
202202

203-
By default the wit files are generated under the itermediate path `$(IntermediateOutputPath)wit_bindgen` which is by default at a location like `\obj\Debug\net9.0\wit_bindgen`. This means you can't really see the files and they will be ignored and not checked in to source by default (assuming you have a standard .net `.gitignore`) but intillisense will work.
203+
By default the wit files are generated under the itermediate path `$(IntermediateOutputPath)wit_bindgen` which is by default at a location like `\obj\Debug\net10.0\wit_bindgen`. This means you can't really see the files and they will be ignored and not checked in to source by default (assuming you have a standard .net `.gitignore`) but intillisense will work.
204204

205205
If you would like to have the files in a more discoverable place and potentially check the source files in you can configure the output location with a folder name and location of your choice, for example the following will create a folder `genererated/wit/` at the root of your project and put all the files in there.
206206

‎samples/calculator/Adder/Adder.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<PropertyGroup>
77
<OutputType>Library</OutputType>
8-
<TargetFramework>net9.0</TargetFramework>
8+
<TargetFramework>net10.0</TargetFramework>
99
<ImplicitUsings>enable</ImplicitUsings>
1010
<Nullable>enable</Nullable>
1111

‎samples/calculator/CalculatorComposed/CalculatorComposed.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- and express a dependency on the two implementation components. -->
88

99
<PropertyGroup>
10-
<TargetFramework>net9.0</TargetFramework>
10+
<TargetFramework>net10.0</TargetFramework>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

‎samples/calculator/CalculatorHost/CalculatorHost.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<PropertyGroup>
77
<OutputType>Exe</OutputType>
8-
<TargetFramework>net9.0</TargetFramework>
8+
<TargetFramework>net10.0</TargetFramework>
99
<ImplicitUsings>enable</ImplicitUsings>
1010
<Nullable>enable</Nullable>
1111

‎src/WasmComponent.Sdk/WasmComponent.Sdk.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageTags>webassembly, .net, wasm</PackageTags>
1212
<PackageReleaseNotes>https://github.com/bytecodealliance/componentize-dotnet/releases/tag/$(PackageVersion)</PackageReleaseNotes>
1313

14-
<TargetFramework>net9.0</TargetFramework>
14+
<TargetFramework>net10.0</TargetFramework>
1515
<ImplicitUsings>enable</ImplicitUsings>
1616
<Nullable>enable</Nullable>
1717
<IsPackable>true</IsPackable>

‎src/WitBindgen/WitBindgen.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageTags>webassembly, .net, wasm</PackageTags>
1212
<PackageReleaseNotes>https://github.com/bytecodealliance/componentize-dotnet/releases/tag/$(PackageVersion)</PackageReleaseNotes>
1313

14-
<TargetFramework>net9.0</TargetFramework>
14+
<TargetFramework>net10.0</TargetFramework>
1515
<ImplicitUsings>enable</ImplicitUsings>
1616
<Nullable>enable</Nullable>
1717
<IsPackable>true</IsPackable>

0 commit comments

Comments
 (0)