Unverified Commit 449a025b authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

{alttpr-opentracker,am2rlauncher,avalonia-ilspy,clr-loader,dafny,formula,ilspy... 

{alttpr-opentracker,am2rlauncher,avalonia-ilspy,clr-loader,dafny,formula,ilspycmd,inklecate,knossosnet}: update from .NET 6/7 to .NET 8 (#366067)
parents 8ac8ac65 ea961ad6

pkgs/applications/misc/avalonia-ilspy/default.nix

+60 −42
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, buildDotnetModule

, dotnetCorePackages

, libX11

, libICE

, libSM

, libXi

, libXcursor

, libXext

, libXrandr

, fontconfig

, glew

, makeDesktopItem

, copyDesktopItems

, icoutils

, bintools

, fixDarwinDylibNames

, autoSignDarwinBinariesHook

{

  lib,

  stdenv,

  fetchFromGitHub,

  buildDotnetModule,

  dotnetCorePackages,

  libX11,

  libICE,

  libSM,

  libXi,

  libXcursor,

  libXext,

  libXrandr,

  fontconfig,

  glew,

  makeDesktopItem,

  copyDesktopItems,

  icoutils,

  bintools,

  fixDarwinDylibNames,

  autoSignDarwinBinariesHook,

}:



buildDotnetModule rec {
@@ -28,19 +29,28 @@ buildDotnetModule rec { 
    owner = "icsharpcode";

    repo = "AvaloniaILSpy";

    rev = "v${version}";

    sha256 = "cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ=";

    hash = "sha256-cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ=";

  };



  patches = [

    # Remove dead nuget package source

    ./remove-broken-sources.patch

    # Upgrade project to .NET 8.0

    ./dotnet-8-upgrade.patch

  ];



  nativeBuildInputs = [

  nativeBuildInputs =

    [

      copyDesktopItems

      icoutils

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ]

    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ];

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      bintools

      fixDarwinDylibNames

    ]

    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [

      autoSignDarwinBinariesHook

    ];



  buildInputs = [

    # Dependencies of nuget packages w/ native binaries
@@ -61,21 +71,22 @@ buildDotnetModule rec { 
    glew

  ];



  postInstall = ''

  postInstall =

    ''

      icotool --icon -x ILSpy/ILSpy.ico

      for i in 16 32 48 256; do

        size=''${i}x''${i}

        install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png

      done

  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''

    ''

    + lib.optionalString stdenv.hostPlatform.isDarwin ''

      install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist

      install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns

      mkdir -p $out/Applications/ILSpy.app/Contents/MacOS

      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_8_0;



  projectFile = "ILSpy/ILSpy.csproj";

  nugetDeps = ./deps.json;
@@ -108,8 +119,15 @@ buildDotnetModule rec { 
      lgpl21Only

      mspl

    ];

    sourceProvenance = with sourceTypes; [ fromSource binaryBytecode binaryNativeCode ];

    maintainers = with maintainers; [ AngryAnt emilytrau ];

    sourceProvenance = with sourceTypes; [

      fromSource

      binaryBytecode

      binaryNativeCode

    ];

    maintainers = with maintainers; [

      AngryAnt

      emilytrau

    ];

    mainProgram = "ILSpy";

  };

}

pkgs/applications/misc/avalonia-ilspy/deps.json

+469 −234

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch

0 → 100644
+64 −0
Original line number Diff line number Diff line 
diff --git a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj

index 397e0e5..dfa385c 100644

--- a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj

+++ b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj

@@ -1,7 +1,7 @@

 <Project Sdk="Microsoft.NET.Sdk">

 

   <PropertyGroup>

-    <TargetFramework>netstandard2.0</TargetFramework>

+    <TargetFramework>net8.0</TargetFramework>

     <LangVersion>7.2</LangVersion>

     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

   </PropertyGroup>

diff --git a/ILSpy.Core/ILSpy.Core.csproj b/ILSpy.Core/ILSpy.Core.csproj

index cd6d5e2..d725817 100644

--- a/ILSpy.Core/ILSpy.Core.csproj

+++ b/ILSpy.Core/ILSpy.Core.csproj

@@ -2,7 +2,7 @@

 <Project Sdk="Microsoft.NET.Sdk">

 

   <PropertyGroup>

-    <TargetFramework>netstandard2.0</TargetFramework>

+    <TargetFramework>net8.0</TargetFramework>

     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

     <EnableDefaultItems>false</EnableDefaultItems>

     <SignAssembly>True</SignAssembly>

diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj

index 4deb56f..b9813ba 100644

--- a/ILSpy/ILSpy.csproj

+++ b/ILSpy/ILSpy.csproj

@@ -1,7 +1,7 @@

 <Project Sdk="Microsoft.NET.Sdk">

 

   <PropertyGroup>

-    <TargetFramework>net6.0</TargetFramework>

+    <TargetFramework>net8.0</TargetFramework>

     <OutputType>WinExe</OutputType>

 

     <TieredCompilation>true</TieredCompilation>

diff --git a/SharpTreeView/SharpTreeView.csproj b/SharpTreeView/SharpTreeView.csproj

index d6f46c5..4183ffd 100644

--- a/SharpTreeView/SharpTreeView.csproj

+++ b/SharpTreeView/SharpTreeView.csproj

@@ -1,6 +1,6 @@

 <Project Sdk="Microsoft.NET.Sdk">

   <PropertyGroup>

-    <TargetFramework>netstandard2.0</TargetFramework>

+    <TargetFramework>net8.0</TargetFramework>

     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

     <EnableDefaultItems>false</EnableDefaultItems>

     <SignAssembly>True</SignAssembly>

diff --git a/TestPlugin/TestPlugin.csproj b/TestPlugin/TestPlugin.csproj

index 453a3ef..806f375 100644

--- a/TestPlugin/TestPlugin.csproj

+++ b/TestPlugin/TestPlugin.csproj

@@ -2,7 +2,7 @@

 <Project Sdk="Microsoft.NET.Sdk">

 

   <PropertyGroup>

-    <TargetFramework>netstandard2.0</TargetFramework>

+    <TargetFramework>net8.0</TargetFramework>

     <AssemblyName>Test.Plugin</AssemblyName>

 

     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

pkgs/by-name/al/alttpr-opentracker/deps.json

+430 −460

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/al/alttpr-opentracker/package.nix

+7 −15
Original line number Diff line number Diff line
@@ -17,30 +17,22 @@ 
}:

buildDotnetModule rec {

  pname = "opentracker";

  version = "1.8.5";

  version = "1.8.6";



  src = fetchFromGitHub {

    owner = "trippsc2";

    repo = pname;

    repo = "opentracker";

    tag = version;

    hash = "sha512-nWkPgVYdnBJibyJRdLPe3O3RioDPbzumSritRejmr4CeiPb7aUTON7HjivcV/GKor1guEYu+TJ+QxYrqO/eppg==";

    hash = "sha256-4EBn3BX5tX+yPUjoNFQSls9CwTCd6MpvcBoUKwRndRo=";

  };



  patches = [./remove-project.patch];



  dotnet-sdk = dotnetCorePackages.sdk_6_0;

  dotnet-sdk = dotnetCorePackages.sdk_8_0;



  nugetDeps = ./deps.json;



  projectFile = "OpenTracker.sln";

  projectFile = "src/OpenTracker/OpenTracker.csproj";

  executables = [ "OpenTracker" ];



  doCheck = true;

  disabledTests = [

    "OpenTracker.UnitTests.Models.Nodes.Factories.SLightWorldConnectionFactoryTests.GetNodeConnections_ShouldReturnExpectedValue"

    "OpenTracker.UnitTests.Models.Sections.Factories.ItemSectionFactoryTests.GetItemSection_ShouldReturnExpected"

  ];



  nativeBuildInputs = [

    autoPatchelfHook

    wrapGAppsHook3