Commit 43f7cc0d authored by mdarocha's avatar mdarocha
Browse files

dotnet-sdk_3: remove 

Also remove all reference to outdated .NET versions.
parent 72a25e7a

doc/languages-frameworks/dotnet.section.md

+45 −24
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ with import <nixpkgs> {}; 
mkShell {

  name = "dotnet-env";

  packages = [

    dotnet-sdk_3

    dotnet-sdk

  ];

}

```
@@ -27,36 +27,57 @@ mkShell { 
  name = "dotnet-env";

  packages = [

    (with dotnetCorePackages; combinePackages [

      sdk_3_1

      sdk_6_0

      sdk_7_0

    ])

  ];

}

```



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:

This will produce a dotnet installation that has the dotnet 6.0 7.0 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output:



```ShellSession

$ dotnet --info

.NET Core SDK (reflecting any global.json):

 Version:   3.1.101

 Commit:    b377529961



...



.NET Core SDKs installed:

  2.1.803 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/sdk]

  3.0.102 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/sdk]

  3.1.101 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/sdk]



.NET Core runtimes installed:

  Microsoft.AspNetCore.All 2.1.15 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.All]

  Microsoft.AspNetCore.App 2.1.15 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.App]

  Microsoft.AspNetCore.App 3.0.2 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.App]

  Microsoft.AspNetCore.App 3.1.1 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.App]

  Microsoft.NETCore.App 2.1.15 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App]

  Microsoft.NETCore.App 3.0.2 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App]

  Microsoft.NETCore.App 3.1.1 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App]

.NET SDK:

 Version:   7.0.202

 Commit:    6c74320bc3



Środowisko uruchomieniowe:

 OS Name:     nixos

 OS Version:  23.05

 OS Platform: Linux

 RID:         linux-x64

 Base Path:   /nix/store/n2pm44xq20hz7ybsasgmd7p3yh31gnh4-dotnet-sdk-7.0.202/sdk/7.0.202/



Host:

  Version:      7.0.4

  Architecture: x64

  Commit:       0a396acafe



.NET SDKs installed:

  6.0.407 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/sdk]

  7.0.202 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/sdk]



.NET runtimes installed:

  Microsoft.AspNetCore.App 6.0.15 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.AspNetCore.App]

  Microsoft.AspNetCore.App 7.0.4 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.AspNetCore.App]

  Microsoft.NETCore.App 6.0.15 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.NETCore.App]

  Microsoft.NETCore.App 7.0.4 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.NETCore.App]



Other architectures found:

  None



Environment variables:

  Not set



global.json file:

  Not found



Learn more:

  https://aka.ms/dotnet/info



Download .NET:

  https://aka.ms/dotnet/download

```



## dotnet-sdk vs dotnetCorePackages.sdk {#dotnet-sdk-vs-dotnetcorepackages.sdk}
@@ -119,8 +140,8 @@ in buildDotnetModule rec { 


  projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure.



  dotnet-sdk = dotnetCorePackages.sdk_3_1;

  dotnet-runtime = dotnetCorePackages.net_6_0;

  dotnet-sdk = dotnetCorePackages.sdk_6.0;

  dotnet-runtime = dotnetCorePackages.runtime_6_0;



  executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`.

  executables = []; # Don't install any executables.

nixos/doc/manual/release-notes/rl-2305.section.md

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ In addition to numerous new and upgraded packages, this release has the followin 
  - Please note that an upgrade from v24 (or older) to v26 directly is not possible. Please upgrade to `nextcloud25` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud25;`](options.html#opt-services.nextcloud.package).

  - It's recommended to use the latest version available (i.e. v26) and to specify that using `services.nextcloud.package`.



- .NET 5.0 was removed due to being end-of-life, use a newer, supported .NET version - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core

- .NET 5.0 and .NET 3.1 were removed due to being end-of-life, use a newer, supported .NET version - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core



- The iputils package, which is installed by default, no longer provides the

  `ninfod`, `rarpd` and `rdisc` tools. See

pkgs/development/compilers/dotnet/build-dotnet.nix

+1 −1
Original line number Diff line number Diff line 
{ type

, version

, srcs

, icu # passing icu as an argument, because dotnet 3.1 has troubles with icu71

, packages ? null

}:
@@ -16,6 +15,7 @@ assert if type == "sdk" then packages != null else true; 
, makeWrapper

, libunwind

, openssl_1_1

, icu

, libuuid

, zlib

, libkrb5

pkgs/development/compilers/dotnet/combine-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ in 
assert lib.assertMsg ((builtins.length dotnetPackages) > 0)

    ''You must include at least one package, e.g

      `with dotnetCorePackages; combinePackages [

          sdk_3_1 aspnetcore_5_0

          sdk_6_0 aspnetcore_7_0

       ];`'' ;

  buildEnv {

    name = "dotnet-core-combined";

pkgs/development/compilers/dotnet/default.nix

+10 −10
Original line number Diff line number Diff line 
/*

How to combine packages for use in development:

dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspnetcore_5_0 ];

dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ];



Hashes and urls below are retrieved from:

Hashes and urls are retrieved from:

https://dotnet.microsoft.com/download/dotnet

*/

{ callPackage, icu70, icu }:

{ callPackage,}:

let

  buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {};

  buildAttrs = {
@@ -14,6 +14,11 @@ let 
    buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; });

  };



  ## Files in versions/ are generated automatically by update.sh ##

  dotnet_6_0 = import ./versions/6.0.nix buildAttrs;

  dotnet_7_0 = import ./versions/7.0.nix buildAttrs;

  dotnet_8_0 = import ./versions/8.0.nix buildAttrs;



  runtimeIdentifierMap = {

    "x86_64-linux" = "linux-x64";

    "aarch64-linux" = "linux-arm64";
@@ -25,12 +30,6 @@ let 


  # Convert a "stdenv.hostPlatform.system" to a dotnet RID

  systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}");



  ## Files in versions/ are generated automatically by update.sh ##

  dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; });

  dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; });

  dotnet_7_0 = import ./versions/7.0.nix (buildAttrs // { inherit icu; });

  dotnet_8_0 = import ./versions/8.0.nix (buildAttrs // { inherit icu; });

in

rec {

  inherit systemToDotnetRid;
@@ -41,5 +40,6 @@ rec { 
  sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)";

  sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)";

  sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)";

  sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)";

  sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)";

} // dotnet_3_1 // dotnet_6_0 // dotnet_7_0 // dotnet_8_0
 
} // dotnet_6_0 // dotnet_7_0 // dotnet_8_0