dotnetenv: remove (#424329)
This commit is contained in:
Wolfgang Walther
GitHub
commit
db3df9f919
@ -1,5 +0,0 @@
|
|||||||
[*]
|
|
||||||
end_of_line = unset
|
|
||||||
indent_style = unset
|
|
||||||
insert_final_newline = unset
|
|
||||||
trim_trailing_whitespace = unset
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
|
||||||
# Visual Studio 2010
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wrapper", "Wrapper\Wrapper.csproj", "{D01B3597-E85E-42F4-940A-EF5AE712942F}"
|
|
||||||
EndProject
|
|
||||||
Global
|
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
||||||
Debug|x86 = Debug|x86
|
|
||||||
Release|x86 = Release|x86
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.ActiveCfg = Debug|x86
|
|
||||||
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.Build.0 = Debug|x86
|
|
||||||
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.ActiveCfg = Release|x86
|
|
||||||
{D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.Build.0 = Release|x86
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
using System.Reflection;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
// General Information about an assembly is controlled through the following
|
|
||||||
// set of attributes. Change these attribute values to modify the information
|
|
||||||
// associated with an assembly.
|
|
||||||
[assembly: AssemblyTitle("Wrapper")]
|
|
||||||
[assembly: AssemblyDescription("")]
|
|
||||||
[assembly: AssemblyConfiguration("")]
|
|
||||||
[assembly: AssemblyCompany("Philips Healthcare")]
|
|
||||||
[assembly: AssemblyProduct("Wrapper")]
|
|
||||||
[assembly: AssemblyCopyright("Copyright © Philips Healthcare 2011")]
|
|
||||||
[assembly: AssemblyTrademark("")]
|
|
||||||
[assembly: AssemblyCulture("")]
|
|
||||||
|
|
||||||
// Setting ComVisible to false makes the types in this assembly not visible
|
|
||||||
// to COM components. If you need to access a type in this assembly from
|
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
|
||||||
[assembly: Guid("2045ce22-78c7-4cd6-ad0a-9367f8a49738")]
|
|
||||||
|
|
||||||
// Version information for an assembly consists of the following four values:
|
|
||||||
//
|
|
||||||
// Major Version
|
|
||||||
// Minor Version
|
|
||||||
// Build Number
|
|
||||||
// Revision
|
|
||||||
//
|
|
||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
|
||||||
// by using the '*' as shown below:
|
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
|
||||||
[assembly: AssemblyVersion("1.0.0.0")]
|
|
||||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
using System.IO;
|
|
||||||
|
|
||||||
namespace @NAMESPACE@Wrapper
|
|
||||||
{
|
|
||||||
class @MAINCLASSNAME@Wrapper
|
|
||||||
{
|
|
||||||
private String[] AssemblySearchPaths = { @ASSEMBLYSEARCHPATH@ };
|
|
||||||
|
|
||||||
private String ExePath = @"@EXEPATH@";
|
|
||||||
|
|
||||||
private String MainClassName = "@NAMESPACE@.@MAINCLASSNAME@";
|
|
||||||
|
|
||||||
private Assembly exeAssembly;
|
|
||||||
|
|
||||||
public @MAINCLASSNAME@Wrapper(string[] args)
|
|
||||||
{
|
|
||||||
// Attach the resolve event handler to the AppDomain so that missing library assemblies will be searched
|
|
||||||
AppDomain currentDomain = AppDomain.CurrentDomain;
|
|
||||||
currentDomain.AssemblyResolve += new ResolveEventHandler(MyResolveEventHandler);
|
|
||||||
|
|
||||||
// Dynamically load the executable assembly
|
|
||||||
exeAssembly = Assembly.LoadFrom(ExePath);
|
|
||||||
|
|
||||||
// Lookup the main class
|
|
||||||
Type mainClass = exeAssembly.GetType(MainClassName);
|
|
||||||
|
|
||||||
// Lookup the main method
|
|
||||||
MethodInfo mainMethod = mainClass.GetMethod("Main");
|
|
||||||
|
|
||||||
// Invoke the main method
|
|
||||||
mainMethod.Invoke(this, new Object[] {args});
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Main(string[] args)
|
|
||||||
{
|
|
||||||
new @MAINCLASSNAME@Wrapper(args);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Assembly MyResolveEventHandler(object sender, ResolveEventArgs args)
|
|
||||||
{
|
|
||||||
// This handler is called only when the common language runtime tries to bind to the assembly and fails.
|
|
||||||
|
|
||||||
Assembly MyAssembly;
|
|
||||||
String assemblyPath = "";
|
|
||||||
String requestedAssemblyName = args.Name.Substring(0, args.Name.IndexOf(","));
|
|
||||||
|
|
||||||
// Search for the right path of the library assembly
|
|
||||||
foreach (String currentAssemblyPath in AssemblySearchPaths)
|
|
||||||
{
|
|
||||||
assemblyPath = currentAssemblyPath + "/" + requestedAssemblyName + ".dll";
|
|
||||||
|
|
||||||
if (File.Exists(assemblyPath))
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load the assembly from the specified path.
|
|
||||||
MyAssembly = Assembly.LoadFrom(assemblyPath);
|
|
||||||
|
|
||||||
// Return the loaded assembly.
|
|
||||||
return MyAssembly;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
||||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
|
||||||
<ProductVersion>8.0.30703</ProductVersion>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
<ProjectGuid>{D01B3597-E85E-42F4-940A-EF5AE712942F}</ProjectGuid>
|
|
||||||
<OutputType>Exe</OutputType>
|
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
|
||||||
<RootNamespace>@ROOTNAMESPACE@</RootNamespace>
|
|
||||||
<AssemblyName>@ASSEMBLYNAME@</AssemblyName>
|
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
|
||||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
|
||||||
<FileAlignment>512</FileAlignment>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<Optimize>false</Optimize>
|
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
|
||||||
<DebugType>pdbonly</DebugType>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="System" />
|
|
||||||
<Reference Include="System.Core" />
|
|
||||||
<Reference Include="System.Xml.Linq" />
|
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
|
||||||
<Reference Include="Microsoft.CSharp" />
|
|
||||||
<Reference Include="System.Data" />
|
|
||||||
<Reference Include="System.Xml" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="Wrapper.cs" />
|
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
|
||||||
<Target Name="BeforeBuild">
|
|
||||||
</Target>
|
|
||||||
<Target Name="AfterBuild">
|
|
||||||
</Target>
|
|
||||||
-->
|
|
||||||
</Project>
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
stdenv,
|
|
||||||
dotnetfx,
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
name,
|
|
||||||
src,
|
|
||||||
baseDir ? ".",
|
|
||||||
slnFile,
|
|
||||||
targets ? "ReBuild",
|
|
||||||
verbosity ? "detailed",
|
|
||||||
options ? "/p:Configuration=Debug;Platform=Win32",
|
|
||||||
assemblyInputs ? [ ],
|
|
||||||
preBuild ? "",
|
|
||||||
modifyPublicMain ? false,
|
|
||||||
mainClassFile ? null,
|
|
||||||
}:
|
|
||||||
|
|
||||||
assert modifyPublicMain -> mainClassFile != null;
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
inherit name src;
|
|
||||||
|
|
||||||
buildInputs = [ dotnetfx ];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
cd ${baseDir}
|
|
||||||
'';
|
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
${lib.optionalString modifyPublicMain ''
|
|
||||||
sed -i -e "s|static void Main|public static void Main|" ${mainClassFile}
|
|
||||||
''}
|
|
||||||
${preBuild}
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
addDeps() {
|
|
||||||
if [ -f $1/nix-support/dotnet-assemblies ]; then
|
|
||||||
for i in $(cat $1/nix-support/dotnet-assemblies); do
|
|
||||||
windowsPath=$(cygpath --windows $i)
|
|
||||||
assemblySearchPaths="$assemblySearchPaths;$windowsPath"
|
|
||||||
|
|
||||||
addDeps $i
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
for i in ${toString assemblyInputs}; do
|
|
||||||
windowsPath=$(cygpath --windows $i)
|
|
||||||
echo "Using assembly path: $windowsPath"
|
|
||||||
|
|
||||||
if [ "$assemblySearchPaths" = "" ]; then
|
|
||||||
assemblySearchPaths="$windowsPath"
|
|
||||||
else
|
|
||||||
assemblySearchPaths="$assemblySearchPaths;$windowsPath"
|
|
||||||
fi
|
|
||||||
|
|
||||||
addDeps $i
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "Assembly search paths are: $assemblySearchPaths"
|
|
||||||
|
|
||||||
if [ "$assemblySearchPaths" != "" ]; then
|
|
||||||
echo "Using assembly search paths args: $assemblySearchPathsArg"
|
|
||||||
export AssemblySearchPaths=$assemblySearchPaths
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p $out
|
|
||||||
MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options}
|
|
||||||
|
|
||||||
# Because .NET assemblies store strings as UTF-16 internally, we cannot detect
|
|
||||||
# hashes. Therefore a text files containing the proper paths is created
|
|
||||||
# We can also use this file the propagate transitive dependencies.
|
|
||||||
|
|
||||||
mkdir -p $out/nix-support
|
|
||||||
|
|
||||||
for i in ${toString assemblyInputs}; do
|
|
||||||
echo $i >> $out/nix-support/dotnet-assemblies
|
|
||||||
done
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
stdenv,
|
|
||||||
dotnetfx,
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
dotnetenv = {
|
|
||||||
buildSolution = import ./build-solution.nix {
|
|
||||||
inherit lib stdenv;
|
|
||||||
dotnetfx = dotnetfx.pkg;
|
|
||||||
};
|
|
||||||
|
|
||||||
buildWrapper = import ./wrapper.nix {
|
|
||||||
inherit dotnetenv;
|
|
||||||
};
|
|
||||||
|
|
||||||
inherit (dotnetfx)
|
|
||||||
assembly20Path
|
|
||||||
wcfPath
|
|
||||||
referenceAssembly30Path
|
|
||||||
referenceAssembly35Path
|
|
||||||
;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
dotnetenv
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
{ dotnetenv }:
|
|
||||||
|
|
||||||
{
|
|
||||||
name,
|
|
||||||
src,
|
|
||||||
baseDir ? ".",
|
|
||||||
slnFile,
|
|
||||||
targets ? "ReBuild",
|
|
||||||
verbosity ? "detailed",
|
|
||||||
options ? "/p:Configuration=Debug;Platform=Win32",
|
|
||||||
assemblyInputs ? [ ],
|
|
||||||
preBuild ? "",
|
|
||||||
namespace,
|
|
||||||
mainClassName,
|
|
||||||
mainClassFile,
|
|
||||||
modifyPublicMain ? true,
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
application = dotnetenv.buildSolution {
|
|
||||||
inherit
|
|
||||||
name
|
|
||||||
src
|
|
||||||
baseDir
|
|
||||||
slnFile
|
|
||||||
targets
|
|
||||||
verbosity
|
|
||||||
;
|
|
||||||
inherit options assemblyInputs preBuild;
|
|
||||||
inherit modifyPublicMain mainClassFile;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
dotnetenv.buildSolution {
|
|
||||||
name = "${name}-wrapper";
|
|
||||||
src = ./Wrapper;
|
|
||||||
slnFile = "Wrapper.sln";
|
|
||||||
assemblyInputs = [ application ];
|
|
||||||
preBuild = ''
|
|
||||||
addRuntimeDeps() {
|
|
||||||
if [ -f $1/nix-support/dotnet-assemblies ]; then
|
|
||||||
for i in $(cat $1/nix-support/dotnet-assemblies); do
|
|
||||||
windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g')
|
|
||||||
assemblySearchArray="$assemblySearchArray @\"$windowsPath\""
|
|
||||||
|
|
||||||
addRuntimeDeps $i
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g')
|
|
||||||
|
|
||||||
# Generate assemblySearchPaths string array contents
|
|
||||||
for path in ${toString assemblyInputs}; do
|
|
||||||
assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", "
|
|
||||||
addRuntimeDeps $path
|
|
||||||
done
|
|
||||||
|
|
||||||
sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \
|
|
||||||
-e "s|@ASSEMBLYNAME@|${namespace}|" \
|
|
||||||
Wrapper/Wrapper.csproj.in > Wrapper/Wrapper.csproj
|
|
||||||
|
|
||||||
sed -e "s|@NAMESPACE@|${namespace}|g" \
|
|
||||||
-e "s|@MAINCLASSNAME@|${mainClassName}|g" \
|
|
||||||
-e "s|@EXEPATH@|$exePath|g" \
|
|
||||||
-e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \
|
|
||||||
Wrapper/Wrapper.cs.in > Wrapper/Wrapper.cs
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@ -565,6 +565,7 @@ mapAliases {
|
|||||||
dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17
|
dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17
|
||||||
dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17
|
dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17
|
||||||
dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17
|
dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17
|
||||||
|
dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
|
||||||
downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25
|
downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25
|
||||||
dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30
|
dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30
|
||||||
dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21
|
dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21
|
||||||
|
|||||||
@ -498,10 +498,6 @@ with pkgs;
|
|||||||
autoPatchcilHook
|
autoPatchcilHook
|
||||||
;
|
;
|
||||||
|
|
||||||
dotnetenv = callPackage ../build-support/dotnet/dotnetenv {
|
|
||||||
dotnetfx = dotnetfx40;
|
|
||||||
};
|
|
||||||
|
|
||||||
buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { };
|
buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { };
|
||||||
fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { };
|
fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { };
|
||||||
dupeguru = callPackage ../applications/misc/dupeguru {
|
dupeguru = callPackage ../applications/misc/dupeguru {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user