diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-01-24 12:21:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-01-24 12:22:38 +0100 |
| commit | 411405c9f64a74ad124593f17897843ed32c9823 (patch) | |
| tree | d6e3a4a3931012b420a1a6b735aec9a196767c3f /doc | |
| parent | 727e365f0276012d719f0e6c95ba0f0a53c9099a (diff) | |
| parent | 353e2d957c7421cae4e3ab42739a0997ea7e310f (diff) | |
Merge branch 'master' into staging-next
Trivial conflict in release notes, except that the xml/docbook parts are horrible for (semi-)automatic conflict resolution. Fortunately that's generated anyway.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/languages-frameworks/dotnet.section.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index bfb193b1f021a..30a12d4e8ffad 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -28,13 +28,13 @@ mkShell { packages = [ (with dotnetCorePackages; combinePackages [ sdk_3_1 - sdk_5_0 + sdk_6_0 ]) ]; } ``` -This will produce a dotnet installation that has the dotnet 3.1, 3.0, and 2.1 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: +This will produce a dotnet installation that has the dotnet 3.1 6.0 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: ```ShellSession $ dotnet --info @@ -120,7 +120,7 @@ in buildDotnetModule rec { projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-runtime = dotnetCorePackages.net_5_0; + dotnet-runtime = dotnetCorePackages.net_6_0; executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. executables = []; # Don't install any executables. |