From ec83b6649519ebf57098788692c5cd3cae09c7aa Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Sun, 8 Dec 2024 22:26:15 -0400 Subject: [PATCH 1/6] dotnet: set sandbox profile in source-built sdk/runtime --- pkgs/development/compilers/dotnet/packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index e8819a14611cc..935a7f42b3b28 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -25,6 +25,11 @@ let + '' ln -s ${vmr.man} $man ''; + propagatedSandboxProfile = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + (allow file-read* (subpath "/private/var/db/mds/system")) + (allow mach-lookup (global-name "com.apple.SecurityServer") + (global-name "com.apple.system.opendirectoryd.membership")) + ''; } ) ); From 4f45dde3e24e33c6820ce79b01cc5a7a00858ee8 Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Sun, 22 Dec 2024 15:08:20 -0400 Subject: [PATCH 2/6] dotnet: make native binaries executable in packages --- pkgs/development/compilers/dotnet/packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index 935a7f42b3b28..a82b5c3f62f01 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -71,8 +71,12 @@ let version=''${version,,} mkdir -p "$out"/share/nuget/packages/"$id" cp -r . "$out"/share/nuget/packages/"$id"/"$version" - chmod +w "$out"/share/nuget/packages/"$id"/"$version" - echo {} > "$out"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata + cd "$out"/share/nuget/packages/"$id"/"$version" + chmod +w . + for dir in tools runtimes/*/native; do + [[ ! -d "$dir" ]] || chmod -R +x "$dir" + done + echo {} > .nupkg.metadata ) popd From 5c655b7c03e4e7b97c8d0cb8daa88a2c00c73400 Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Sun, 22 Dec 2024 15:08:42 -0400 Subject: [PATCH 3/6] dotnet/wrapper: add ready-to-run sdk test --- pkgs/development/compilers/dotnet/wrapper.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index 90b520519f942..39ae75cc78697 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -194,6 +194,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { run = checkConsoleOutput "$src/bin/test"; }; + ready-to-run = mkDotnetTest { + name = "ready-to-run"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime -p:PublishReadyToRun=true -o $out/bin"; + run = checkConsoleOutput "$src/bin/test"; + }; + web = mkDotnetTest { name = "web"; template = "web"; From 0c326670cc00bfcf760edbee604ff7c8bcbeda08 Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Sun, 22 Sep 2024 23:36:05 -0300 Subject: [PATCH 4/6] dotnet: default to source-built sdk/runtimes --- .../misc/avalonia-ilspy/default.nix | 4 +- pkgs/by-name/al/alcom/package.nix | 3 ++ .../by-name/al/alttpr-opentracker/package.nix | 2 +- pkgs/by-name/am/am2rlauncher/package.nix | 2 +- pkgs/by-name/av/avalonia/package.nix | 4 +- .../be/beatsabermodmanager/package.nix | 6 +-- pkgs/by-name/bi/bicep/package.nix | 2 +- pkgs/by-name/bi/bililiverecorder/package.nix | 4 +- pkgs/by-name/bo/boogie/package.nix | 2 +- pkgs/by-name/da/dafny/package.nix | 2 +- pkgs/by-name/fo/formula/package.nix | 4 +- pkgs/by-name/gh/gh-gei/package.nix | 2 +- pkgs/by-name/in/inklecate/package.nix | 4 +- pkgs/by-name/kn/knossosnet/package.nix | 2 +- pkgs/by-name/ms/msbuild/package.nix | 2 +- pkgs/by-name/na/naps2/package.nix | 2 +- pkgs/by-name/ne/networkminer/package.nix | 2 +- pkgs/by-name/pa/pablodraw/package.nix | 4 +- pkgs/by-name/ro/roslyn-ls/package.nix | 2 +- pkgs/by-name/ro/roslyn/package.nix | 2 +- pkgs/by-name/ry/ryujinx/package.nix | 2 +- pkgs/by-name/so/sonarr/package.nix | 4 +- pkgs/by-name/wa/wasabibackend/package.nix | 4 +- .../compilers/dotnet/8/default.nix | 2 +- .../compilers/dotnet/9/default.nix | 2 +- .../compilers/dotnet/combine-packages.nix | 2 +- pkgs/development/compilers/dotnet/default.nix | 50 ++++++++++++------- .../python-modules/clr-loader/default.nix | 6 +-- pkgs/development/tools/ilspycmd/default.nix | 4 +- pkgs/games/openra/build-engine.nix | 4 +- pkgs/servers/nosql/eventstore/default.nix | 4 +- pkgs/top-level/all-packages.nix | 12 ++--- 32 files changed, 85 insertions(+), 68 deletions(-) diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix index 4413f853b0118..1145210d14472 100644 --- a/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -74,8 +74,8 @@ buildDotnetModule rec { ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy ''; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_6_0-bin; projectFile = "ILSpy/ILSpy.csproj"; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index 11120d87ade35..9a3509d7cc021 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -106,6 +106,9 @@ rustPlatform.buildRustPackage { -p:Deterministic=true ''; + # NuGet.targets(156,5): error : Unable to load the service index for source https://api.nuget.org/v3/index.json. + NuGetAudit = "false"; + passthru = { inherit (dotnetBuild) fetch-deps; }; diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix index 485f286e173e3..8a5fa175764a4 100644 --- a/pkgs/by-name/al/alttpr-opentracker/package.nix +++ b/pkgs/by-name/al/alttpr-opentracker/package.nix @@ -28,7 +28,7 @@ buildDotnetModule rec { patches = [./remove-project.patch]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index fb8d60d225f80..97fd3e3349258 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -55,7 +55,7 @@ buildDotnetModule { hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj"; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 0484dd665c426..3bea156c1c91b 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -26,8 +26,8 @@ let dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0_1xx - runtime_6_0 + sdk_7_0_1xx-bin + runtime_6_0-bin ]; npmDepsFile = ./npm-deps.nix; diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index 486dd4217b77a..51e6b983ec192 100644 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -21,11 +21,11 @@ buildDotnetModule rec { }; dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0 - sdk_6_0 + sdk_7_0-bin + sdk_6_0-bin ]; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0-bin; projectFile = [ "BeatSaberModManager/BeatSaberModManager.csproj" ]; diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index dc3c3cb908a87..4a824fea8da04 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -26,7 +26,7 @@ buildDotnetModule rec { nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix index 3efa80e687eae..af7b1b432a362 100644 --- a/pkgs/by-name/bi/bililiverecorder/package.nix +++ b/pkgs/by-name/bi/bililiverecorder/package.nix @@ -9,8 +9,8 @@ let pname = "bililiverecorder"; dotnet = with dotnetCorePackages; combinePackages [ - runtime_6_0 - aspnetcore_6_0 + runtime_6_0-bin + aspnetcore_6_0-bin ]; version = "2.13.0"; diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 4aa6d5c45076a..71ef9beadd799 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -17,7 +17,7 @@ buildDotnetModule rec { hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; projectFile = [ "Source/Boogie.sln" ]; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index d0fd3c1db9350..9bcbe862774a9 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -41,7 +41,7 @@ buildDotnetModule rec { --replace-warn "netstandard2.0;net452" net6.0 ''; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; nativeBuildInputs = [ jdk11 ]; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix index df3141e0184e8..7211f96da2fa0 100644 --- a/pkgs/by-name/fo/formula/package.nix +++ b/pkgs/by-name/fo/formula/package.nix @@ -11,14 +11,14 @@ buildDotnetModule rec { sha256 = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; nugetDeps = ./nuget.json; projectFile = "Src/CommandLine/CommandLine.csproj"; postFixup = if stdenv.hostPlatform.isLinux then '' mv $out/bin/CommandLine $out/bin/formula '' else lib.optionalString stdenv.hostPlatform.isDarwin '' - makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \ + makeWrapper ${dotnetCorePackages.runtime_6_0-bin}/bin/dotnet $out/bin/formula \ --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native ''; diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 0f3fa3aefe4fe..4b4152312fce1 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -15,7 +15,7 @@ buildDotnetModule rec { hash = "sha256-6lEEeAYrMB9wwATsORuaS21wLOB+gq/od88FobSse50="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; projectFile = "src/gei/gei.csproj"; nugetDeps = ./deps.json; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`. diff --git a/pkgs/by-name/in/inklecate/package.nix b/pkgs/by-name/in/inklecate/package.nix index 26f3c153e1134..a768135d41209 100644 --- a/pkgs/by-name/in/inklecate/package.nix +++ b/pkgs/by-name/in/inklecate/package.nix @@ -22,8 +22,8 @@ buildDotnetModule rec { nugetDeps = ./deps.json; executables = [ "inklecate" ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_6_0-bin; meta = with lib; { description = "Compiler for ink, inkle's scripting language"; diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index 90667c645c270..af5c643c1c552 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -19,7 +19,7 @@ buildDotnetModule rec { patches = [ ./targetframework.patch ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; nugetDeps = ./deps.json; executables = [ "Knossos.NET" ]; diff --git a/pkgs/by-name/ms/msbuild/package.nix b/pkgs/by-name/ms/msbuild/package.nix index 2df76c8722647..a694aa765bf7a 100644 --- a/pkgs/by-name/ms/msbuild/package.nix +++ b/pkgs/by-name/ms/msbuild/package.nix @@ -2,7 +2,7 @@ let - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; xplat = fetchurl { url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip"; diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index 216df3c3cf16c..ed72a25dbf76e 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -33,7 +33,7 @@ buildDotnetModule rec { inherit (combinePackages [ sdk_8_0 - sdk_6_0 + sdk_6_0-bin ]) packages targetPackages diff --git a/pkgs/by-name/ne/networkminer/package.nix b/pkgs/by-name/ne/networkminer/package.nix index ff5d917ad7ace..88918a1b11158 100644 --- a/pkgs/by-name/ne/networkminer/package.nix +++ b/pkgs/by-name/ne/networkminer/package.nix @@ -21,7 +21,7 @@ buildDotnetModule rec { sha256 = "1n2312acq5rq0jizlcfk0crslx3wgcsd836p47nk3pnapzw0cqvv"; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; nativeBuildInputs = [ unzip diff --git a/pkgs/by-name/pa/pablodraw/package.nix b/pkgs/by-name/pa/pablodraw/package.nix index 1354061a838f8..7de1cf2e797f7 100644 --- a/pkgs/by-name/pa/pablodraw/package.nix +++ b/pkgs/by-name/pa/pablodraw/package.nix @@ -30,8 +30,8 @@ buildDotnetModule rec { executables = [ "PabloDraw" ]; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_7_0-bin; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 571b7da8b6d51..2e4b2281d3e4d 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -20,7 +20,7 @@ let sdk_8_0 # NOTE: we should be able to remove net6.0 after upstream removes from here: # https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20 - sdk_6_0 + sdk_6_0-bin ]) packages targetPackages diff --git a/pkgs/by-name/ro/roslyn/package.nix b/pkgs/by-name/ro/roslyn/package.nix index 8811b92fbdc65..a69fa5fb2ad8e 100644 --- a/pkgs/by-name/ro/roslyn/package.nix +++ b/pkgs/by-name/ro/roslyn/package.nix @@ -17,7 +17,7 @@ buildDotnetModule rec { hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ]; diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 5ef0aa8bdb12e..c5531501898ae 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -34,7 +34,7 @@ buildDotnetModule rec { enableParallelBuilding = false; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index c4a7cf65d357c..77c4a82d1aae8 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -69,8 +69,8 @@ buildDotnetModule { runtimeDeps = [ sqlite ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.aspnetcore_6_0-bin; doCheck = true; diff --git a/pkgs/by-name/wa/wasabibackend/package.nix b/pkgs/by-name/wa/wasabibackend/package.nix index b398f25f9ad47..7b9d2d0077647 100644 --- a/pkgs/by-name/wa/wasabibackend/package.nix +++ b/pkgs/by-name/wa/wasabibackend/package.nix @@ -22,8 +22,8 @@ buildDotnetModule rec { projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj"; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0-bin; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0-bin; buildInputs = [(lib.getLib stdenv.cc.cc) zlib]; diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8/default.nix index a660ac97f84a8..cbfe98c3207fd 100644 --- a/pkgs/development/compilers/dotnet/8/default.nix +++ b/pkgs/development/compilers/dotnet/8/default.nix @@ -5,5 +5,5 @@ releaseInfoFile = ./release-info.json; bootstrapSdkFile = ./bootstrap-sdk.nix; depsFile = ./deps.nix; - fallbackTargetPackages = dotnetCorePackages.sdk_8_0.targetPackages; + fallbackTargetPackages = dotnetCorePackages.sdk_8_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix index c641543ad521a..77ce5f5395e88 100644 --- a/pkgs/development/compilers/dotnet/9/default.nix +++ b/pkgs/development/compilers/dotnet/9/default.nix @@ -6,5 +6,5 @@ bootstrapSdkFile = ./bootstrap-sdk.nix; allowPrerelease = true; depsFile = ./deps.nix; - fallbackTargetPackages = dotnetCorePackages.sdk_9_0.targetPackages; + fallbackTargetPackages = dotnetCorePackages.sdk_9_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 6528fb3d56a1e..a90f5b6da415d 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -18,7 +18,7 @@ in assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' You must include at least one package, e.g `with dotnetCorePackages; combinePackages [ - sdk_6_0 aspnetcore_7_0 + sdk_6_0-bin aspnetcore_7_0-bin ];`''; mkWrapper "sdk" (buildEnv { name = "dotnet-combined"; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 90c474f6ae20d..a9ddd7263e3f6 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,6 +1,6 @@ /* How to combine packages for use in development: - dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; + dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0-bin aspnetcore_7_0-bin ]; Hashes and urls are retrieved from: https://dotnet.microsoft.com/download/dotnet @@ -33,10 +33,14 @@ makeScopeWithSplicing' { }; ## Files in versions/ are generated automatically by update.sh ## - dotnet_6_0 = buildDotnetSdk ./versions/6.0.nix; - dotnet_7_0 = buildDotnetSdk ./versions/7.0.nix; - dotnet_8_0 = buildDotnetSdk ./versions/8.0.nix; - dotnet_9_0 = buildDotnetSdk ./versions/9.0.nix; + dotnet-bin = lib.mergeAttrsList ( + map buildDotnetSdk [ + ./versions/6.0.nix + ./versions/7.0.nix + ./versions/8.0.nix + ./versions/9.0.nix + ] + ); runtimeIdentifierMap = { "x86_64-linux" = "linux-x64"; @@ -48,7 +52,19 @@ makeScopeWithSplicing' { }; in - { + lib.optionalAttrs config.allowAliases ( + { + # EOL + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + } + // dotnet-bin + ) + // lib.mapAttrs' (k: v: lib.nameValuePair "${k}-bin" v) dotnet-bin + // rec { inherit callPackage fetchNupkg buildDotnetSdk; # Convert a "stdenv.hostPlatform.system" to a dotnet RID @@ -69,18 +85,16 @@ makeScopeWithSplicing' { dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); + + sdk_8_0 = dotnet_8.sdk; + sdk_8_0_1xx = dotnet_8.sdk; + runtime_8_0 = dotnet_8.runtime; + aspnetcore_8_0 = dotnet_8.aspnetcore; + + sdk_9_0 = dotnet_9.sdk; + sdk_9_0_1xx = dotnet_9.sdk; + runtime_9_0 = dotnet_9.runtime; + aspnetcore_9_0 = dotnet_9.aspnetcore; } - // lib.optionalAttrs config.allowAliases { - # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - } - // dotnet_6_0 - // dotnet_7_0 - // dotnet_8_0 - // dotnet_9_0 ); } diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix index 87316f6deeaa2..fb59fec5fcaa6 100644 --- a/pkgs/development/python-modules/clr-loader/default.nix +++ b/pkgs/development/python-modules/clr-loader/default.nix @@ -29,7 +29,7 @@ let "example/example.csproj" ]; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; }; in buildPythonPackage { @@ -37,13 +37,13 @@ buildPythonPackage { format = "pyproject"; - buildInputs = dotnetCorePackages.sdk_6_0.packages ++ dotnet-build.nugetDeps; + buildInputs = dotnetCorePackages.sdk_6_0-bin.packages ++ dotnet-build.nugetDeps; nativeBuildInputs = [ setuptools setuptools-scm wheel - dotnetCorePackages.sdk_6_0 + dotnetCorePackages.sdk_6_0-bin ]; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix index 8527fb7dfdfc0..62ee387356702 100644 --- a/pkgs/development/tools/ilspycmd/default.nix +++ b/pkgs/development/tools/ilspycmd/default.nix @@ -26,8 +26,8 @@ buildDotnetModule rec { # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) env.LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive"; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_6_0-bin; projectFile = "ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj"; nugetDeps = ./deps.json; diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix index 85644fadef065..956ed7750e816 100644 --- a/pkgs/games/openra/build-engine.nix +++ b/pkgs/games/openra/build-engine.nix @@ -17,8 +17,8 @@ buildDotnetModule rec { nugetDeps = engine.deps; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_6_0-bin; useAppHost = false; diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 04290e420d700..b142fa6152a28 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -27,8 +27,8 @@ buildDotnetModule rec { # Fixes application reporting 0.0.0.0 as its version. MINVERVERSIONOVERRIDE = version; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.aspnetcore_6_0-bin; nativeBuildInputs = [ git glibcLocales bintools ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cdea10b3d90a..fba8c9a2ec724 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -413,18 +413,18 @@ with pkgs; dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); - dotnet-sdk_6 = dotnetCorePackages.sdk_6_0; - dotnet-sdk_7 = dotnetCorePackages.sdk_7_0; + dotnet-sdk_6 = dotnetCorePackages.sdk_6_0-bin; + dotnet-sdk_7 = dotnetCorePackages.sdk_7_0-bin; dotnet-sdk_8 = dotnetCorePackages.sdk_8_0; dotnet-sdk_9 = dotnetCorePackages.sdk_9_0; - dotnet-runtime_6 = dotnetCorePackages.runtime_6_0; - dotnet-runtime_7 = dotnetCorePackages.runtime_7_0; + dotnet-runtime_6 = dotnetCorePackages.runtime_6_0-bin; + dotnet-runtime_7 = dotnetCorePackages.runtime_7_0-bin; dotnet-runtime_8 = dotnetCorePackages.runtime_8_0; dotnet-runtime_9 = dotnetCorePackages.runtime_9_0; - dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0; - dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0; + dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0-bin; + dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0-bin; dotnet-aspnetcore_8 = dotnetCorePackages.aspnetcore_8_0; dotnet-aspnetcore_9 = dotnetCorePackages.aspnetcore_9_0; From 86b7a83d00bf35e2e89617740bad4fca06effcc1 Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Fri, 27 Dec 2024 15:30:48 -0400 Subject: [PATCH 5/6] fixup! dotnet: default to source-built sdk/runtimes --- pkgs/servers/jackett/default.nix | 7 +- pkgs/servers/jackett/deps.json | 895 ------------------------------- 2 files changed, 6 insertions(+), 896 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 5b3a3b4beabf8..d9e2f3359431e 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -26,7 +26,12 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnetInstallFlags = [ "-p:TargetFramework=net8.0" ]; + dotnetInstallFlags = [ "--framework" "net8.0" ]; + + postPatch = '' + substituteInPlace ${projectFile} ${testProjectFile} \ + --replace-fail '<TargetFrameworks>net8.0;net462' '<TargetFrameworks>net8.0' + ''; runtimeDeps = [ openssl ]; diff --git a/pkgs/servers/jackett/deps.json b/pkgs/servers/jackett/deps.json index efca90b06c935..9ada7826fc282 100644 --- a/pkgs/servers/jackett/deps.json +++ b/pkgs/servers/jackett/deps.json @@ -49,361 +49,46 @@ "version": "6.12.1", "hash": "sha256-R/Fi9eee6T8t8JECxL9+HFd8jAxRMkCg18j+fAQLNqM=" }, - { - "pname": "Microsoft.AspNetCore", - "version": "2.2.0", - "hash": "sha256-yZUh/m5s/tgGZOKGylcbPaZ67AHi/mM0xE/bqhk8W28=" - }, - { - "pname": "Microsoft.AspNetCore.Antiforgery", - "version": "2.2.0", - "hash": "sha256-NBUF/oT5TYVvuUW4/lws//1OfX8ldrAxY4+CLnmT3Ag=" - }, - { - "pname": "Microsoft.AspNetCore.Authentication", - "version": "2.2.0", - "hash": "sha256-9lUsjz9egaM7QwDh7FLvrhzKtA/LvrTMrNcXjEH7Dns=" - }, - { - "pname": "Microsoft.AspNetCore.Authentication.Abstractions", - "version": "2.2.0", - "hash": "sha256-0JcJYAoU+AEM0dWaXk2qnqxrVM0Ak9/ntCU1MC90R24=" - }, - { - "pname": "Microsoft.AspNetCore.Authentication.Cookies", - "version": "2.2.0", - "hash": "sha256-rVy2jwHGg67zaUheYz/JYewtnSnrSRWEQ/AWvGs78XQ=" - }, - { - "pname": "Microsoft.AspNetCore.Authentication.Core", - "version": "2.2.0", - "hash": "sha256-EE2zKcwPHzm05R+9f7iDvdXE8PuwMUJZmu3EVl0h9vE=" - }, - { - "pname": "Microsoft.AspNetCore.Authorization", - "version": "2.2.0", - "hash": "sha256-PaMYICjQ0rprUv53Uza/jQvvWTcbPjGLMMp12utF+NY=" - }, - { - "pname": "Microsoft.AspNetCore.Authorization.Policy", - "version": "2.2.0", - "hash": "sha256-onFYB+jtCbGyfZsIglReCPRdDMmwah2EDMhJN4uBP7Q=" - }, - { - "pname": "Microsoft.AspNetCore.Connections.Abstractions", - "version": "2.2.0", - "hash": "sha256-MoieWAe7zT/0a7PAn3gMKO8YpHTbOtiGIwF/sFAmieY=" - }, - { - "pname": "Microsoft.AspNetCore.Cors", - "version": "2.2.0", - "hash": "sha256-TB+sGspJ9kmKco1R0ecMQi3PmMLe4U7ncpOceNBfU2M=" - }, - { - "pname": "Microsoft.AspNetCore.Cryptography.Internal", - "version": "2.2.0", - "hash": "sha256-WzP/Rs5oBzdmLzkx3knpZcgdNWVGw9xeo4esgroTjwY=" - }, { "pname": "Microsoft.AspNetCore.Cryptography.Internal", "version": "8.0.10", "hash": "sha256-zR9xbcGD4yU/oo/c9dQ4AKTMFT+HSBsfu0oNV6bjPNo=" }, - { - "pname": "Microsoft.AspNetCore.DataProtection", - "version": "2.2.0", - "hash": "sha256-/aEB1KEQDlBdB2MXG9q/YsOLnGv49uV6D753gsBdnyY=" - }, { "pname": "Microsoft.AspNetCore.DataProtection", "version": "8.0.10", "hash": "sha256-JYzSF9NxaGA0tXobfaV2ODQdcVCbQBGtcILCRUgcKiY=" }, - { - "pname": "Microsoft.AspNetCore.DataProtection.Abstractions", - "version": "2.2.0", - "hash": "sha256-3zGsOkU/9QrXI96cREJfIni38IazRVNpcS3nqvWFJL4=" - }, { "pname": "Microsoft.AspNetCore.DataProtection.Abstractions", "version": "8.0.10", "hash": "sha256-Fa3PLGFHOvIvAkpTRls1iESyg9ZxqY1/I5Q4elmA2SE=" }, - { - "pname": "Microsoft.AspNetCore.Diagnostics", - "version": "2.2.0", - "hash": "sha256-YSW+mjK2ZsLSvoO7yYidV5s62NDityXKIOGICaDQBUM=" - }, - { - "pname": "Microsoft.AspNetCore.Diagnostics.Abstractions", - "version": "2.2.0", - "hash": "sha256-oOYGMhmHhUrHjJjAtOQg56K+kZmP1QizC07wAiVsLBg=" - }, - { - "pname": "Microsoft.AspNetCore.HostFiltering", - "version": "2.2.0", - "hash": "sha256-g3Tm1j/54w/CiZlOHm7Lo0prDzWEoGd+94kTAdd8ixs=" - }, - { - "pname": "Microsoft.AspNetCore.Hosting", - "version": "2.2.0", - "hash": "sha256-Hcp+bQfnsoIaXSKb0GIvQPKvgSgStH7IHTETdWQNZto=" - }, - { - "pname": "Microsoft.AspNetCore.Hosting.Abstractions", - "version": "2.1.1", - "hash": "sha256-tZZ4Ka0H0TJb+m5ntO7YN7tlcrDz5hJhvX1sh5Vl1PI=" - }, - { - "pname": "Microsoft.AspNetCore.Hosting.Abstractions", - "version": "2.2.0", - "hash": "sha256-GzqYrTqCCVy41AOfmgIRY1kkqxekn5T0gFC7tUMxcxA=" - }, - { - "pname": "Microsoft.AspNetCore.Hosting.Server.Abstractions", - "version": "2.1.1", - "hash": "sha256-13BN1yOL4y2/emMObr3Wb9Q21LbqkPeGvir3A+H+jX4=" - }, - { - "pname": "Microsoft.AspNetCore.Hosting.Server.Abstractions", - "version": "2.2.0", - "hash": "sha256-8PnZFCkMwAeEHySmmjJOnQvOyx2199PesYHBnfka51s=" - }, - { - "pname": "Microsoft.AspNetCore.Html.Abstractions", - "version": "2.2.0", - "hash": "sha256-O3j05VLAwWTOX0QywPWK6nq5jnSES9/9zpcnmNaftPw=" - }, - { - "pname": "Microsoft.AspNetCore.Http", - "version": "2.1.22", - "hash": "sha256-r6vBdzoF0pHOcZzVwfCdi+W/ZgVBTfJxWoAni4YsFiY=" - }, - { - "pname": "Microsoft.AspNetCore.Http", - "version": "2.2.0", - "hash": "sha256-+ARZomTXSD1m/PR3TWwifXb67cQtoqDVWEqfoq5Tmbk=" - }, { "pname": "Microsoft.AspNetCore.Http", "version": "2.2.2", "hash": "sha256-iIlNsdylaZUyVsc1+VmcjhrSs0oUP7ta+tT7hu+WryY=" }, - { - "pname": "Microsoft.AspNetCore.Http.Abstractions", - "version": "2.1.1", - "hash": "sha256-2s8Vb62COXBvJrJ2yQdjzt+G9lS3fGfzzuBLtyZ8Wgo=" - }, { "pname": "Microsoft.AspNetCore.Http.Abstractions", "version": "2.2.0", "hash": "sha256-y3j3Wo9Xl7kUdGkfnUc8Wexwbc2/vgxy7c3fJk1lSI8=" }, - { - "pname": "Microsoft.AspNetCore.Http.Extensions", - "version": "2.2.0", - "hash": "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U=" - }, - { - "pname": "Microsoft.AspNetCore.Http.Features", - "version": "2.1.1", - "hash": "sha256-bXB9eARdVnjptjj02ubs81ljH8Ortj3Je9d6x4uCLm4=" - }, { "pname": "Microsoft.AspNetCore.Http.Features", "version": "2.2.0", "hash": "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc=" }, - { - "pname": "Microsoft.AspNetCore.HttpOverrides", - "version": "2.2.0", - "hash": "sha256-xsscB33I0DhRGWbksHpU82w1WEOIYuUxcfnR2D+rdd0=" - }, - { - "pname": "Microsoft.AspNetCore.JsonPatch", - "version": "2.2.0", - "hash": "sha256-ApJHL7yy/YJEf/IkRTOsxyxwJW8sx20FeVtNrMuCkR0=" - }, { "pname": "Microsoft.AspNetCore.JsonPatch", "version": "8.0.10", "hash": "sha256-1MUbEqkePx6A4JkUu7bffBuuYmiP8BVTmJ3aDqwa8nk=" }, - { - "pname": "Microsoft.AspNetCore.Localization", - "version": "2.2.0", - "hash": "sha256-BzrYpQXLWRxcLxOYI4ls7Sziq/F/raVLi8wfz8BhdiI=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc", - "version": "2.2.0", - "hash": "sha256-LG2M3+XPgPXUiaX99qMaEhre+0M3lAIlyaRN7tmMWZo=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.Abstractions", - "version": "2.2.0", - "hash": "sha256-C0zyeeqBcP/rnTqLup4jy9ir9/Spd+T3CSWFduMh5CY=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.Analyzers", - "version": "2.2.0", - "hash": "sha256-LkHqzbsaCpPweCjWv+zbgm093V9E2QjLF/D9BcAvJ60=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.ApiExplorer", - "version": "2.2.0", - "hash": "sha256-6vKZ/f3SdPMopYA3v5tWa8dGYS1kY3Iizc+B0Wpo0Oc=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.Core", - "version": "2.2.0", - "hash": "sha256-FfgVtIWGocm+w/ZzcvRMj3HmLH58Sb8/02Wqn+ab1Mw=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.Cors", - "version": "2.2.0", - "hash": "sha256-mITcLm/0nJnKirHA3mV8TBtt58+gvHKMJjmXCWyX+xw=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.DataAnnotations", - "version": "2.2.0", - "hash": "sha256-hvrGSIrAXLR4u3npETWCkO/bDYZ1zxfOO18RmJVssG0=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.Formatters.Json", - "version": "2.2.0", - "hash": "sha256-KhkAsq4uaeJkPwHfX0QfeXExIo1DBIoD+kahLxxzQRA=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.Localization", - "version": "2.2.0", - "hash": "sha256-hj1+wKnsgDafmcp4L/+DZfhLsnjmZ82UPHJkzXPsRzQ=" - }, { "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson", "version": "8.0.10", "hash": "sha256-PYFjjSZjehd9R3J6wUK+OKfvTzMw6IqC+gJKocfXJbs=" }, - { - "pname": "Microsoft.AspNetCore.Mvc.Razor", - "version": "2.2.0", - "hash": "sha256-+GQvxmGcJs0YNRLO865pwjnZ2hkeznsbHNJt7/J52Bk=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.Razor.Extensions", - "version": "2.2.0", - "hash": "sha256-rKcOpp0yYCRflpTxCo+UT6n4kiASECrxVLOe/RfeShI=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.RazorPages", - "version": "2.2.0", - "hash": "sha256-deGOWu6VR9egzZ3WmEAYuJxo1Y2gQZa8w5MO+rvDHn8=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.TagHelpers", - "version": "2.2.0", - "hash": "sha256-kaJ/ZCi/k+9IlfHCjEocYNZiKkNh3NqABVFcHdDMV5k=" - }, - { - "pname": "Microsoft.AspNetCore.Mvc.ViewFeatures", - "version": "2.2.0", - "hash": "sha256-9sS9JwZQ6dOAU6128NfqSpA2v67b07YtdrY4B9amTsc=" - }, - { - "pname": "Microsoft.AspNetCore.Razor", - "version": "2.2.0", - "hash": "sha256-4H6U3qOsJMJonF328ZbQy4h8+pYp4eaA4jaVqHe+yws=" - }, - { - "pname": "Microsoft.AspNetCore.Razor.Design", - "version": "2.2.0", - "hash": "sha256-xmp6h+NHngykeQU3axYb2NKIFTsLofIUBAVwXxdr7A4=" - }, - { - "pname": "Microsoft.AspNetCore.Razor.Language", - "version": "2.2.0", - "hash": "sha256-n/SNZ4Yw63n8yuvGtLYmzm4+WbRq1Add9bx4fmPDqFg=" - }, - { - "pname": "Microsoft.AspNetCore.Razor.Runtime", - "version": "2.2.0", - "hash": "sha256-JRnPViWEWt3dtn324/Sh+obHmxGOVW7TuK9UGyUsMtk=" - }, - { - "pname": "Microsoft.AspNetCore.ResponseCaching.Abstractions", - "version": "2.2.0", - "hash": "sha256-ZzyrjN7tN2+ie5tz5T9L7CRGsy1vsxo4Xcayt0QUVwc=" - }, - { - "pname": "Microsoft.AspNetCore.ResponseCompression", - "version": "2.2.0", - "hash": "sha256-5F9k0dsJ8BGhVEkH6Qd9H8JI8VdLbHbYpUqUI9K0TVU=" - }, - { - "pname": "Microsoft.AspNetCore.Rewrite", - "version": "2.2.0", - "hash": "sha256-TiUkuLanNAuWKwekR8Z7G+oWHIbbJlW+66zvyU3aQTg=" - }, - { - "pname": "Microsoft.AspNetCore.Routing", - "version": "2.2.0", - "hash": "sha256-mvsF973Cm48XUB6lPBiGp7U7vkfBjB3oILdnIQUwe4o=" - }, - { - "pname": "Microsoft.AspNetCore.Routing.Abstractions", - "version": "2.1.1", - "hash": "sha256-8aUd2zQdVPTL18uRiQaxszNXP8S6a4CD36STMbUXvRE=" - }, - { - "pname": "Microsoft.AspNetCore.Routing.Abstractions", - "version": "2.2.0", - "hash": "sha256-nqJjxKXkdPAY1XvQjIRNW2y855Xi+LAX1S5AncPnPDU=" - }, - { - "pname": "Microsoft.AspNetCore.Server.IIS", - "version": "2.2.0", - "hash": "sha256-c9brbUYLhJ5l3WUYV5LsBOqTchUH2Hxk3m+aLDvi/jE=" - }, - { - "pname": "Microsoft.AspNetCore.Server.IISIntegration", - "version": "2.2.0", - "hash": "sha256-7NaCUiWkPlkGCpC2GXHEtx/aG0i3r/CYS08A6Bkys7Y=" - }, - { - "pname": "Microsoft.AspNetCore.Server.Kestrel", - "version": "2.2.0", - "hash": "sha256-LofHjJaXkCye9IzTblOL+tmIR2etlwZy0h2nmICDB3I=" - }, - { - "pname": "Microsoft.AspNetCore.Server.Kestrel.Core", - "version": "2.2.0", - "hash": "sha256-+aTIllcBnMkUHoAwaZPPWMV309aLIPeBvuhyiHRzrhw=" - }, - { - "pname": "Microsoft.AspNetCore.Server.Kestrel.Https", - "version": "2.2.0", - "hash": "sha256-DOm2ebBGpa4SFeYxzphPT5+Q7ShDq1pposP/lfkh5CM=" - }, - { - "pname": "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", - "version": "2.2.0", - "hash": "sha256-y+2Dx2p2dE5p/CB6IyMQgbyZohIbeZ1D919/4n9JciE=" - }, - { - "pname": "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", - "version": "2.2.0", - "hash": "sha256-ZaaJbCZWsKSG5z/9L4O1MD/mHG2vfRYQE1+LsK1jEW4=" - }, - { - "pname": "Microsoft.AspNetCore.StaticFiles", - "version": "2.2.0", - "hash": "sha256-8lrbOXoPrOEQggbiXQO37PSRIzPLL4plCFGhbq9/764=" - }, - { - "pname": "Microsoft.AspNetCore.WebUtilities", - "version": "2.1.1", - "hash": "sha256-+z46dL+HhGDfg2uyVz1U+YQIHgMJg+4UPeIvAth4hJw=" - }, { "pname": "Microsoft.AspNetCore.WebUtilities", "version": "2.2.0", @@ -429,151 +114,31 @@ "version": "8.0.0", "hash": "sha256-fBvDSXDSIYMzTa8+A+98KqhEXYP6E17wLo+UNwlyf4U=" }, - { - "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "1.1.0", - "hash": "sha256-7KrZfK3kUbmeT82eVadvHurZcaFq3FDj4qkIIeExJiM=" - }, - { - "pname": "Microsoft.CodeAnalysis.Common", - "version": "2.8.0", - "hash": "sha256-ksCgE7YQaWMQywT3pY26bYIEAqtEp3kTxBRloF0gkDw=" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "2.8.0", - "hash": "sha256-3LhgErOul0ndBvY57ipiN6uXxzWdyLC577Y6AQPfPVw=" - }, - { - "pname": "Microsoft.CodeAnalysis.Razor", - "version": "2.2.0", - "hash": "sha256-poFN+Jh3ZWm3ZT78DM17czL4zedafPdztdr2blVLlQ0=" - }, { "pname": "Microsoft.CodeCoverage", "version": "17.10.0", "hash": "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g=" }, - { - "pname": "Microsoft.CSharp", - "version": "4.5.0", - "hash": "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY=" - }, { "pname": "Microsoft.CSharp", "version": "4.7.0", "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" }, - { - "pname": "Microsoft.DiaSymReader.Native", - "version": "1.7.0", - "hash": "sha256-tjvIswyubNy+rJgDlbiZgOb5G4aBdFyBiPa2k28fXFA=" - }, - { - "pname": "Microsoft.DotNet.PlatformAbstractions", - "version": "2.1.0", - "hash": "sha256-vrZhYp94SjycUMGaVYCFWJ4p7KBKfqVyLWtIG73fzeM=" - }, - { - "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "2.2.0", - "hash": "sha256-osgeoVggP5UqGBG7GbrZmsVvBJmA47aCgsqJclthHUI=" - }, - { - "pname": "Microsoft.Extensions.Caching.Memory", - "version": "2.2.0", - "hash": "sha256-u5W1RY7IG7+ZGu18aijpNohFLY2dgLaM4QZptYvV+S8=" - }, - { - "pname": "Microsoft.Extensions.Configuration", - "version": "2.1.0", - "hash": "sha256-ou/T+Gtw5FcT5nkBGtdf2lAMriTGvb+ulDJkytGgMhM=" - }, - { - "pname": "Microsoft.Extensions.Configuration", - "version": "2.2.0", - "hash": "sha256-dGJjKmio5BNFdwhK09NxJyCBapwVtO3eWxjLoTMGRQg=" - }, { "pname": "Microsoft.Extensions.Configuration", "version": "8.0.0", "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "2.1.0", - "hash": "sha256-rd8zK6YWSxSP5HLrP+IR8o5/+/sheTNDtj3I9Eem/w0=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "2.1.1", - "hash": "sha256-3DdHcNmy+JKWB4Q8ixzE4N/hUAvx2o4YlYal4Riwiyw=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "2.2.0", - "hash": "sha256-5Jjn+0WZQ6OiN8AkNlGV0XIaw8L+a/wAq9hBD88RZbs=" - }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "8.0.0", "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" }, - { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "2.1.0", - "hash": "sha256-FNOrXx7bJbc6qrscne8RhRj28kxK3uq+3ltdXzhCKHQ=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "2.2.0", - "hash": "sha256-cigv0t9SntPWjJyRWMy3Q5KnuF17HoDyeKq26meTHoM=" - }, - { - "pname": "Microsoft.Extensions.Configuration.CommandLine", - "version": "2.2.0", - "hash": "sha256-0e3cpwsKrR5Tgt2ZXnfvs8NZbV2FEH8q6zRl84w6bCY=" - }, - { - "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", - "version": "2.2.0", - "hash": "sha256-haG2U6qEM6y+Mi4reFNGmarQc7pbc1RH0dXwSgcAxqk=" - }, - { - "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "2.2.0", - "hash": "sha256-DVfJkCR5BRZGln4X/OIrPMW/Vi4SJE9ttakIbOAMky8=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Json", - "version": "2.2.0", - "hash": "sha256-bG+jKsdugEfuVuLlTJxi1OEknnT8rUbp7SscBunOlaE=" - }, - { - "pname": "Microsoft.Extensions.Configuration.UserSecrets", - "version": "2.2.0", - "hash": "sha256-l+fI+81CZMINKkJ4yTE4w30ymh9Kzuk0HIbgs2TOCpc=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "2.2.0", - "hash": "sha256-k/3UKceE1hbgv1sfV9H85hzWvMwooE8PcasHvHMhe1M=" - }, { "pname": "Microsoft.Extensions.DependencyInjection", "version": "8.0.0", "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.1.0", - "hash": "sha256-WgS/QtxbITCpVjs1JPCWuJRrZSoplOtY7VfOXjLqDDA=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.1.1", - "hash": "sha256-BMU00QmmhtH3jP5cepJnoTrxrPESWeDU0i5UrIpIwGY=" - }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "2.2.0", @@ -589,101 +154,26 @@ "version": "8.0.2", "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" }, - { - "pname": "Microsoft.Extensions.DependencyModel", - "version": "2.1.0", - "hash": "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY=" - }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", "version": "8.0.1", "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0=" }, - { - "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "2.1.1", - "hash": "sha256-2nfsrYlWR3VE30Fa5Lleh4Acav+kdYD7zIfNz9htFOo=" - }, - { - "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "2.2.0", - "hash": "sha256-pLAxP15+PncMiRrUT5bBAhWg7lC6/dfQk5TLTpZzA7k=" - }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", "version": "8.0.0", "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" }, - { - "pname": "Microsoft.Extensions.FileProviders.Composite", - "version": "2.2.0", - "hash": "sha256-KEwhWadHe24jYSNW2UI18wHC+9kyuZXfMCvZC1Z3eEw=" - }, - { - "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "2.2.0", - "hash": "sha256-/UD6JMXqSKRVlNAQ+wV8XjQ1u9X48z+TNfwe4/oiOFM=" - }, - { - "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "2.2.0", - "hash": "sha256-gm05niqMBRcGmGSwogHlOAXCfutn5qFxMZaQZYM+XAY=" - }, - { - "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "2.1.1", - "hash": "sha256-FCQqPxMNaaN+CD8xE42+evaxKjPWdznJ45U+qoVf8e0=" - }, - { - "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "2.2.0", - "hash": "sha256-YZcyKXL6jOpyGrDbFLu46vncfUw2FuqhclMdbEPuh/U=" - }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", "version": "8.0.1", "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA=" }, - { - "pname": "Microsoft.Extensions.Localization", - "version": "2.2.0", - "hash": "sha256-07D6Zh5un5dKl2zM18oVDgWeWQq3Y0RP823nisuc48w=" - }, - { - "pname": "Microsoft.Extensions.Localization.Abstractions", - "version": "2.2.0", - "hash": "sha256-/p2UA5VBmC6jxu0boS/hK9g2YgeS+gwe5Ubmk3rR+Ps=" - }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "2.1.0", - "hash": "sha256-BtRVc8o7NruFCblOITHPZD3llUmri3+1dStSo09EMTY=" - }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "2.2.0", - "hash": "sha256-lY9axb6/MyPAhE+N8VtfCIpD80AFCtxUnnGxvb2koy8=" - }, { "pname": "Microsoft.Extensions.Logging", "version": "8.0.0", "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "2.1.0", - "hash": "sha256-0i4YUnMQ4DE0KDp47pssJLUIw8YAsHf2NZN0xoOLb78=" - }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "2.1.1", - "hash": "sha256-TzbYgz4EemrYKHMvB9HWDkFmq0BkTetKPUwBpYHk9+k=" - }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "2.2.0", - "hash": "sha256-lJeKyhBnDc4stX2Wd7WpcG+ZKxPTFHILZSezKM2Fhws=" - }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.0", @@ -694,46 +184,11 @@ "version": "8.0.2", "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" }, - { - "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "2.2.0", - "hash": "sha256-KeAgb1vzW3HOd1+Bp741nHshe2DVVH2OCEU4suam69o=" - }, - { - "pname": "Microsoft.Extensions.Logging.Console", - "version": "2.2.0", - "hash": "sha256-7qmSYQZGqjuW1JYLzUQCTjl/Ox6ZLjIBJQswNUNjnLw=" - }, - { - "pname": "Microsoft.Extensions.Logging.Debug", - "version": "2.2.0", - "hash": "sha256-1x4AdGEmpN5br+UKXp15EboqMIjtsUn9/r3wNoj7v/w=" - }, - { - "pname": "Microsoft.Extensions.Logging.EventSource", - "version": "2.2.0", - "hash": "sha256-DyEQNzKE9ACtCAN2gpVe1Z2ovpDznyBJM9L9A+oSf6I=" - }, - { - "pname": "Microsoft.Extensions.ObjectPool", - "version": "2.1.1", - "hash": "sha256-ivQH0mOjHNwEh/VWUxdrXi/i0SZqRHDMxU9SiW9ygeU=" - }, { "pname": "Microsoft.Extensions.ObjectPool", "version": "2.2.0", "hash": "sha256-P+QUM50j/V8f45zrRqat8fz6Gu3lFP+hDjESwTZNOFg=" }, - { - "pname": "Microsoft.Extensions.Options", - "version": "2.1.0", - "hash": "sha256-ol0tKlHOyX1qAQqNWuag0thb2mMCU2JHNiw0nzUhJnE=" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "2.1.1", - "hash": "sha256-dCPA56Wv9cLuz720PmVbk2oXda1t9ZSAlP8/clDU93E=" - }, { "pname": "Microsoft.Extensions.Options", "version": "2.2.0", @@ -749,21 +204,6 @@ "version": "8.0.2", "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" }, - { - "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "2.2.0", - "hash": "sha256-TZKLbSNM32hTzzDIKlRNcu6V2NhLfXTz+ew7QPvNJXE=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "2.1.0", - "hash": "sha256-q1oDnqfQiiKgzlv/WDHgNGTlWfm+fkuY1R6t6hr/L+U=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "2.1.1", - "hash": "sha256-nbu2OeQGWeG8QKpoAOxIQ8aPzDbWHgbzLXh55xqeeQw=" - }, { "pname": "Microsoft.Extensions.Primitives", "version": "2.2.0", @@ -774,16 +214,6 @@ "version": "8.0.0", "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, - { - "pname": "Microsoft.Extensions.WebEncoders", - "version": "2.2.0", - "hash": "sha256-wwfvTcAgSnHQCuqqUwsiF588QxQYjXaGk9VwxiCLFtY=" - }, - { - "pname": "Microsoft.Net.Http.Headers", - "version": "2.1.1", - "hash": "sha256-jdod0MQ58QG8ezS3nYhO85Qk4D7xh0LnOz4XIXvtBBs=" - }, { "pname": "Microsoft.Net.Http.Headers", "version": "2.2.0", @@ -804,16 +234,6 @@ "version": "5.0.0", "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" }, - { - "pname": "Microsoft.NETFramework.ReferenceAssemblies", - "version": "1.0.3", - "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE=" - }, - { - "pname": "Microsoft.NETFramework.ReferenceAssemblies.net462", - "version": "1.0.3", - "hash": "sha256-7mkqhFdDUAkQhV1MMwym6e+HwW4W90DkR00YcYXWbiE=" - }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "17.10.0", @@ -824,16 +244,6 @@ "version": "17.10.0", "hash": "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4=" }, - { - "pname": "Microsoft.Win32.Registry", - "version": "4.5.0", - "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0=" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" - }, { "pname": "MimeMapping", "version": "1.0.1.50", @@ -869,16 +279,6 @@ "version": "2.0.3", "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" }, - { - "pname": "Newtonsoft.Json", - "version": "10.0.1", - "hash": "sha256-Gw7dQIsmYfmcR5ASTuMsB8cqaI4g3osw0j+LO1jEzJY=" - }, - { - "pname": "Newtonsoft.Json", - "version": "11.0.2", - "hash": "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0=" - }, { "pname": "Newtonsoft.Json", "version": "13.0.1", @@ -889,16 +289,6 @@ "version": "13.0.3", "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, - { - "pname": "Newtonsoft.Json", - "version": "9.0.1", - "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" - }, - { - "pname": "Newtonsoft.Json.Bson", - "version": "1.0.1", - "hash": "sha256-qofIFqViDsdBOE/X0IvzfGUklSrULaH8MoZQ+YrcMOQ=" - }, { "pname": "Newtonsoft.Json.Bson", "version": "1.0.2", @@ -949,11 +339,6 @@ "version": "1.4.2", "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" }, - { - "pname": "System.AppContext", - "version": "4.3.0", - "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" - }, { "pname": "System.Buffers", "version": "4.4.0", @@ -969,26 +354,6 @@ "version": "4.5.1", "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, - { - "pname": "System.Collections.Concurrent", - "version": "4.3.0", - "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" - }, - { - "pname": "System.Collections.Immutable", - "version": "1.3.1", - "hash": "sha256-areGRq/dO08KhxiWuAK+cWAjOWYtuB1R9zGXLvIqwZw=" - }, - { - "pname": "System.Collections.Immutable", - "version": "1.5.0", - "hash": "sha256-BliqYlL9ntbMXo5d7NUrKXwYN+PqdyqDIS5bp4qVr7Q=" - }, { "pname": "System.ComponentModel.Annotations", "version": "4.5.0", @@ -999,86 +364,21 @@ "version": "4.4.0", "hash": "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I=" }, - { - "pname": "System.Console", - "version": "4.3.0", - "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.5.0", - "hash": "sha256-0r8bsmgsb30bHJnvi98oPTFcxLfuqqt9mcoeEcYFFfk=" - }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "7.0.2", "hash": "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "8.0.1", - "hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo=" - }, { "pname": "System.Diagnostics.EventLog", "version": "8.0.1", "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA=" }, - { - "pname": "System.Diagnostics.FileVersionInfo", - "version": "4.3.0", - "hash": "sha256-JyqOf5/lsUNLMpIqK8XffcFTxB6vHWzGWHssmojokCQ=" - }, - { - "pname": "System.Diagnostics.StackTrace", - "version": "4.3.0", - "hash": "sha256-Tfq7F61N0VfujVyI5A9MZvyWewQ5HepB1f1UMBMkUCs=" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.3.0", - "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" - }, - { - "pname": "System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" - }, { "pname": "System.IO.FileSystem.AccessControl", "version": "5.0.0", "hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc=" }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" - }, - { - "pname": "System.IO.Pipelines", - "version": "4.5.2", - "hash": "sha256-AXsErCMtJnoT1ZhYlChyObzAimwEp1Cl1L6X6fewuhA=" - }, { "pname": "System.IO.Pipelines", "version": "4.6.0", @@ -1089,21 +389,6 @@ "version": "5.0.1", "hash": "sha256-2zT5uBiyYm+jLIoJppIKJttTtpcMNKxd7Li0QEVjbv8=" }, - { - "pname": "System.Linq", - "version": "4.3.0", - "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.3.0", - "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" - }, - { - "pname": "System.Memory", - "version": "4.5.0", - "hash": "sha256-YOz1pCR4RpP1ywYoJsgXnVlzsWtC2uYKQJTg0NnFXtE=" - }, { "pname": "System.Memory", "version": "4.5.1", @@ -1129,41 +414,11 @@ "version": "4.4.0", "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "1.4.2", - "hash": "sha256-cYd2SWmnacNq14fTpyW9vGcnbZSD4DPRjpR+tgdZZyE=" - }, { "pname": "System.Reflection.Metadata", "version": "1.6.0", "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.0", - "hash": "sha256-g9jIdQtXSAhY+ezQtYNgHEUoQR3HzznHs3JMzD9bip4=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.5.1", @@ -1184,66 +439,16 @@ "version": "6.0.0", "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.0.0", - "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4=" - }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.3.0", - "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.3.0", - "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" - }, - { - "pname": "System.Security.AccessControl", - "version": "4.5.0", - "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=" - }, { "pname": "System.Security.AccessControl", "version": "5.0.0", "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.0", - "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.5.0", - "hash": "sha256-9llRbEcY1fHYuTn3vGZaCxsFxSAqXl4bDA6Rz9b0pN4=" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.3.0", - "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" - }, { "pname": "System.Security.Cryptography.Pkcs", "version": "8.0.1", "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.3.0", - "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" - }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "4.4.0", @@ -1254,31 +459,11 @@ "version": "8.0.0", "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.3.0", - "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" - }, - { - "pname": "System.Security.Cryptography.Xml", - "version": "4.5.0", - "hash": "sha256-FIGpgYPbdA1NX0I4NmAr4gdt5VM/emm7PjM5XUEHZOY=" - }, { "pname": "System.Security.Cryptography.Xml", "version": "8.0.2", "hash": "sha256-9TCmVyMB4+By/ipU8vdYDtSnw1tkkebnXXVRdT78+28=" }, - { - "pname": "System.Security.Permissions", - "version": "4.5.0", - "hash": "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.5.0", - "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" - }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", @@ -1289,31 +474,16 @@ "version": "8.0.1", "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8=" }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, { "pname": "System.Text.Encoding.CodePages", "version": "8.0.0", "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" - }, { "pname": "System.Text.Encodings.Web", "version": "4.5.0", "hash": "sha256-o+jikyFOG30gX57GoeZztmuJ878INQ5SFMmKovYqLWs=" }, - { - "pname": "System.Text.Encodings.Web", - "version": "4.5.1", - "hash": "sha256-F3YY+z86YxC5TQW7RToelnemrqRN7gdRNbpdot8byl8=" - }, { "pname": "System.Text.Encodings.Web", "version": "8.0.0", @@ -1324,26 +494,6 @@ "version": "8.0.5", "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.0", - "hash": "sha256-SIdUoXOGGSmBGXLWW76fz0OEoFYDJ8ZoU/xFdVibtxY=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.1", - "hash": "sha256-3NeBC+r7eTVz3f+cEm1NkVhxSr7LrYGX/NdUwje9ecY=" - }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.5.2", @@ -1354,51 +504,6 @@ "version": "4.5.4", "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" }, - { - "pname": "System.Threading.Tasks.Parallel", - "version": "4.3.0", - "hash": "sha256-8H2vRmsn29MNfMmCeIL5vHfbM19jWaLDKNLzDonCI+c=" - }, - { - "pname": "System.Threading.Thread", - "version": "4.3.0", - "hash": "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg=" - }, - { - "pname": "System.ValueTuple", - "version": "4.3.0", - "hash": "sha256-tkMwiobmGQn/t8LDqpkM+Q7XJOebEl3bwVf11d2ZR4g=" - }, - { - "pname": "System.ValueTuple", - "version": "4.5.0", - "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.3.0", - "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.3.0", - "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" - }, - { - "pname": "System.Xml.XmlDocument", - "version": "4.3.0", - "hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4=" - }, - { - "pname": "System.Xml.XPath", - "version": "4.3.0", - "hash": "sha256-kd1JMqj6obhxzEPRJeYvcUyJqkOs/9A0UOQccC6oYrM=" - }, - { - "pname": "System.Xml.XPath.XDocument", - "version": "4.3.0", - "hash": "sha256-dqk4CWuwocj5qsUAYlS+XAe6GGcY/N/HIPEGe5afrPM=" - }, { "pname": "YamlDotNet", "version": "13.0.1", From 2fda0fb4260993b49a2867c800fd2b64a3117481 Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Sun, 22 Dec 2024 13:23:14 -0400 Subject: [PATCH 6/6] fixup! dotnet: default to source-built sdk/runtimes --- pkgs/by-name/ry/ryujinx-greemdev/package.nix | 2 +- pkgs/development/tools/marksman/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ry/ryujinx-greemdev/package.nix b/pkgs/by-name/ry/ryujinx-greemdev/package.nix index c24709132784b..9ea5114b5aef9 100644 --- a/pkgs/by-name/ry/ryujinx-greemdev/package.nix +++ b/pkgs/by-name/ry/ryujinx-greemdev/package.nix @@ -46,7 +46,7 @@ buildDotnetModule rec { enableParallelBuilding = false; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; nugetDeps = ./deps.json; diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix index 6b0d61ee89130..ea4ecdbbb21ea 100644 --- a/pkgs/development/tools/marksman/default.nix +++ b/pkgs/development/tools/marksman/default.nix @@ -28,7 +28,7 @@ buildDotnetModule rec { nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; postInstall = ''