From 92a33aaeda2766589f9489a490a0158f9952d72f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 18 Mar 2019 11:04:43 +0100 Subject: [PATCH] Remove more unnecessary nunit24 cruft (cherry picked from commit 362eface2cd657e292c38d1da1c50833c353cdd9) --- data/net_1_1/machine.config | 2 -- data/net_2_0/machine.config | 2 -- data/net_4_0/machine.config | 2 -- data/net_4_5/machine.config | 2 -- msvc/scripts/genproj.cs | 13 ------------- packaging/MacSDK/packaging/resources/whitelist.txt | 3 --- scripts/.gitignore | 3 --- 7 files changed, 27 deletions(-) diff --git a/data/net_1_1/machine.config b/data/net_1_1/machine.config index 9c604051b59..2dfec5f0203 100644 --- a/data/net_1_1/machine.config +++ b/data/net_1_1/machine.config @@ -237,8 +237,6 @@ - - diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config index 1d59a0a81b5..2577c81dd92 100644 --- a/data/net_2_0/machine.config +++ b/data/net_2_0/machine.config @@ -220,8 +220,6 @@ - - diff --git a/data/net_4_0/machine.config b/data/net_4_0/machine.config index a1e11bbd130..f3b71c43c53 100644 --- a/data/net_4_0/machine.config +++ b/data/net_4_0/machine.config @@ -237,8 +237,6 @@ - - diff --git a/data/net_4_5/machine.config b/data/net_4_5/machine.config index 0814804953d..455709536f8 100644 --- a/data/net_4_5/machine.config +++ b/data/net_4_5/machine.config @@ -240,8 +240,6 @@ - - diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs index eaf02abbf5c..b600f42c381 100755 --- a/msvc/scripts/genproj.cs +++ b/msvc/scripts/genproj.cs @@ -1282,14 +1282,6 @@ public class MsbuildGenerator { if (fx_version == "4.5") fx_version = "4.6.2"; - // The VS2017 signing system fails to sign using this key for some reason, so for now, - // just disable code signing for the nunit assemblies. It's not important. - // I'd rather fix this by updating the makefiles but it seems to be impossible to disable - // code signing in our make system... - - if (StrongNameKeyFile?.Contains("nunit.snk") ?? false) - StrongNameKeyFile = null; - // // Replace the template values // @@ -1501,11 +1493,6 @@ public static class Driver { // The next ones are to make debugging easier for now if (profile == "basic") continue; - - // For now -- problem is, our resolver currently only considers the assembly name, and we ahve - // conflicing 2.0 and 2.4 versions so for now, we just skip the nunit20 versions - if (dir.Contains ("nunit20")) - continue; if (library.Contains ("tests") && !withTests) continue; diff --git a/packaging/MacSDK/packaging/resources/whitelist.txt b/packaging/MacSDK/packaging/resources/whitelist.txt index acdaf2aec2f..ff9d58253e3 100644 --- a/packaging/MacSDK/packaging/resources/whitelist.txt +++ b/packaging/MacSDK/packaging/resources/whitelist.txt @@ -104,9 +104,6 @@ mprof-report msbuild nant nuget -nunit-console -nunit-console2 -nunit-console4 pdb2mdb pedump permview diff --git a/scripts/.gitignore b/scripts/.gitignore index d21f69e8ccf..ddaf2f7c695 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -70,9 +70,6 @@ /mono-symbolicate /mono-xmltool /mozroots -/nunit-console -/nunit-console2 -/nunit-console4 /pdb2mdb /permview /peverify -- 2.11.4.GIT