diff --git a/.gitignore b/.gitignore index 03c48b4..83b96f5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ _ReSharper.InjectModuleInitializer/* obj *.user *.suo - - - +*.nupkg +.DS_Store +.vs/ \ No newline at end of file diff --git a/CONTRIBUTORS b/CONTRIBUTORS new file mode 100644 index 0000000..f07e816 --- /dev/null +++ b/CONTRIBUTORS @@ -0,0 +1,13 @@ +Many thanks to: + +Marcus https://github.com/mjvh80 + +for fixing a command line parsing error + +Brian Fresen https://github.com/bfriesen + +for creating the NuGet package and fixing errors. + +Daniel Cazzulino https://github.com/kzu + +for porting to SDK style and migrating to SDK Pack \ No newline at end of file diff --git a/Errors.cs b/Errors.cs index e43014e..c19bda3 100644 --- a/Errors.cs +++ b/Errors.cs @@ -1,25 +1,13 @@ /* InjectModuleInitializer -MSBuild task and command line program to inject a module initializer -into a .NET assembly +Command line program to inject a module initializer into a .NET assembly. -Copyright (C) 2009-2012 Einar Egilsson -http://einaregilsson.com/2009/12/16/module-initializers-in-csharp/ +Copyright (C) 2009-2016 Einar Egilsson +http://einaregilsson.com/module-initializers-in-csharp/ -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +This program is licensed under the MIT license: http://opensource.org/licenses/MIT + */ using System; namespace EinarEgilsson.Utilities.InjectModuleInitializer diff --git a/GitInfo.txt b/GitInfo.txt new file mode 100644 index 0000000..359a5b9 --- /dev/null +++ b/GitInfo.txt @@ -0,0 +1 @@ +2.0.0 \ No newline at end of file diff --git a/InjectModuleInitializer.cs b/InjectModuleInitializer.cs deleted file mode 100644 index b9235fe..0000000 --- a/InjectModuleInitializer.cs +++ /dev/null @@ -1,49 +0,0 @@ -/* -InjectModuleInitializer - -MSBuild task and command line program to inject a module initializer -into a .NET assembly - -Copyright (C) 2009-2012 Einar Egilsson -http://einaregilsson.com/2009/12/16/module-initializers-in-csharp/ - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; - -namespace EinarEgilsson.Utilities.InjectModuleInitializer -{ - public class InjectModuleInitializer : Task - { - [Required] - public string AssemblyFile { get; set; } - public string ModuleInitializer { get; set; } - private readonly Injector injector = new Injector(); - - public override bool Execute() - { - try - { - injector.Inject(AssemblyFile, ModuleInitializer); - return true; - } - catch (InjectionException ex) - { - Log.LogError(ex.Message); - return false; - } - } - } -} diff --git a/InjectModuleInitializer.csproj b/InjectModuleInitializer.csproj index 7985ca0..c156ea8 100644 --- a/InjectModuleInitializer.csproj +++ b/InjectModuleInitializer.csproj @@ -1,137 +1,100 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {8B2B6640-191B-4733-8243-5A4270162F86} Exe - Properties EinarEgilsson.Utilities.InjectModuleInitializer InjectModuleInitializer - v2.0 - 512 - EinarEgilsson.Utilities.InjectModuleInitializer.Program - true - $(PrivateKeys)\EinarEgilssonStrongName.snk - - - 3.5 - - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true + net35 + *.binlog;Test\**\*.*;nuget\**\*.* + false + true + NU5105 + + Enables module initialization, as described here: http://einaregilsson.com/module-initializers-in-csharp + Einar Egilsson + Copyright © Einar Egilsson 2009-2018 + + module initializer assembly constructor + https://github.com/einaregilsson/InjectModuleInitializer/blob/master/license.txt + https://github.com/einaregilsson/InjectModuleInitializer + true + + true + true + tools + IncludeCecil - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - 1685 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - 1685 - AllRules.ruleset - - - - - - False - lib\Mono.Cecil.dll - False - - - False - lib\Mono.Cecil.Pdb.dll - False - - - False - lib\nunit.framework.dll - - - - - - - - - - - - - Always - - - Always - - - - + - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - + + + - - - - + + + - - - Always - Designer - - - PreserveNewest - - - - + $([MSBuild]::Add('$(GitCommits)', '1')) + - + + + + + + + $(GitSemVerDashLabel)-pr$(BUILD_SOURCEBRANCH.Substring(10).TrimEnd('/merge')) + $(GitSemVerDashLabel)-pr$(APPVEYOR_PULL_REQUEST_NUMBER) + + + $(SYSTEM_PULLREQUEST_TARGETBRANCH) + $(BUILD_SOURCEBRANCHNAME) + $(APPVEYOR_REPO_BRANCH) + + + <_IndexOfBranchSlash>$(GitBranch.LastIndexOf('/')) + <_IndexOfBranchSubstring>$([MSBuild]::Add('$(_IndexOfBranchSlash)', '1')) + <_GitBranch Condition="'$(_IndexOfBranchSlash)' != '0'">$(GitBranch.Substring($(_IndexOfBranchSubstring))) + <_GitBranch Condition="'$(_IndexOfBranchSlash)' == '0'">$(GitBranch) + + + -$(_GitBranch) + $(_GitBranch). + $(SemVerMetadata)sha.$(GitCommit) + + $(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch) + $(AssemblyVersion) + $(FileVersion)$(GitSemVerDashLabel)+$(SemVerMetadata) + $(PackageVersion) + - --> + \ No newline at end of file diff --git a/InjectModuleInitializer.props b/InjectModuleInitializer.props new file mode 100644 index 0000000..3ce85b8 --- /dev/null +++ b/InjectModuleInitializer.props @@ -0,0 +1,7 @@ + + + + $([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)..\tools\net35\InjectModuleInitializer.exe')) + + + \ No newline at end of file diff --git a/InjectModuleInitializer.sln b/InjectModuleInitializer.sln index d6a197f..1b15ed8 100644 --- a/InjectModuleInitializer.sln +++ b/InjectModuleInitializer.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C# Express 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InjectModuleInitializer", "InjectModuleInitializer.csproj", "{8B2B6640-191B-4733-8243-5A4270162F86}" EndProject Global diff --git a/InjectModuleInitializer.targets b/InjectModuleInitializer.targets new file mode 100644 index 0000000..35974dc --- /dev/null +++ b/InjectModuleInitializer.targets @@ -0,0 +1,23 @@ + + + + + + /k:"$(AssemblyOriginatorKeyFile)" + + + + + + + + + + + + + + diff --git a/Injector.cs b/Injector.cs index 1099e7f..dcb0262 100644 --- a/Injector.cs +++ b/Injector.cs @@ -1,25 +1,13 @@ -/* -InjectModuleInitializer - -MSBuild task and command line program to inject a module initializer -into a .NET assembly - -Copyright (C) 2009-2012 Einar Egilsson -http://einaregilsson.com/2009/12/16/module-initializers-in-csharp/ - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +/* +InjectModuleInitializer + +Command line program to inject a module initializer into a .NET assembly. + +Copyright (C) 2009-2016 Einar Egilsson +http://einaregilsson.com/module-initializers-in-csharp/ + +This program is licensed under the MIT license: http://opensource.org/licenses/MIT + */ using System; using System.Diagnostics; using System.IO; @@ -37,33 +25,11 @@ public class InjectionException : Exception public InjectionException(string msg) : base(msg) { } } - internal class Injector + internal class Injector : IDisposable { public const string DefaultInitializerClassName = "ModuleInitializer"; public const string DefaultInitializerMethodName = "Run"; - static Injector() - { - AppDomain.CurrentDomain.AssemblyResolve += LoadEmbeddedAssembly; - } - - static Assembly LoadEmbeddedAssembly(object sender, ResolveEventArgs args) - { - - string name = new AssemblyName(args.Name).Name; - string resourceName = typeof(Injector).Namespace + ".lib." + name + ".dll"; - Stream stream = typeof(Injector).Assembly.GetManifestResourceStream(resourceName); - if (stream == null) { - return null; - } - using (stream) { - byte[] buf = new byte[stream.Length]; - stream.Read(buf,0, buf.Length); - return System.Reflection.Assembly.Load(buf); - } - } - - private AssemblyDefinition Assembly { get; set; } private string PdbFile(string assemblyFile) @@ -77,7 +43,6 @@ private string PdbFile(string assemblyFile) return null; } - public void Inject(string assemblyFile, string moduleInitializer=null, string keyfile=null) { try @@ -105,7 +70,7 @@ public void Inject(string assemblyFile, string moduleInitializer=null, string ke private void InjectInitializer(MethodReference callee) { Debug.Assert(Assembly != null); - TypeReference voidRef = Assembly.MainModule.Import(callee.ReturnType); + TypeReference voidRef = Assembly.MainModule.ImportReference(callee.ReturnType); const MethodAttributes attributes = MethodAttributes.Static | MethodAttributes.SpecialName | MethodAttributes.RTSpecialName; @@ -138,8 +103,17 @@ private void WriteAssembly(string assemblyFile, string keyfile) private void ReadAssembly(string assemblyFile) { - Debug.Assert(Assembly == null); - var readParams = new ReaderParameters(ReadingMode.Immediate); + Debug.Assert(Assembly == null); + + var resolver = new DefaultAssemblyResolver(); + resolver.AddSearchDirectory(Path.GetDirectoryName(assemblyFile)); + + var readParams = new ReaderParameters(ReadingMode.Immediate) + { + AssemblyResolver = resolver, + InMemory = true + }; + if (PdbFile(assemblyFile) != null) { readParams.ReadSymbols = true; @@ -213,6 +187,11 @@ private static T Find(Collection objects, Predicate condition) where T: } } return null; - } + } + + public void Dispose() + { + Assembly.Dispose(); + } } } diff --git a/Program.cs b/Program.cs index ee9fdcf..2f78d7f 100644 --- a/Program.cs +++ b/Program.cs @@ -1,28 +1,17 @@ /* InjectModuleInitializer -MSBuild task and command line program to inject a module initializer -into a .NET assembly +Command line program to inject a module initializer into a .NET assembly. -Copyright (C) 2009-2012 Einar Egilsson -http://einaregilsson.com/2009/12/16/module-initializers-in-csharp/ +Copyright (C) 2009-2016 Einar Egilsson +http://einaregilsson.com/module-initializers-in-csharp/ -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +This program is licensed under the MIT license: http://opensource.org/licenses/MIT + */ using System; using System.Text.RegularExpressions; -using EinarEgilsson.Utilities.InjectModuleInitializer.Test; +//using EinarEgilsson.Utilities.InjectModuleInitializer.Test; +using System.Reflection; namespace EinarEgilsson.Utilities.InjectModuleInitializer { @@ -30,14 +19,14 @@ internal class Program { static int Main(string[] args) { -#if DEBUG - //I only have VS Express at home and this is the easiest way to debug - //the unit tests since there's no test runner and I can't attach to NUnit. - if (args.Length == 1 && args[0] == "/runtests") - { - return TestRunner.RunTests(); - } -#endif +//#if DEBUG +// //I only have VS Express at home and this is the easiest way to debug +// //the unit tests since there's no test runner and I can't attach to NUnit. +// if (args.Length == 1 && args[0] == "/runtests") +// { +// return TestRunner.RunTests(); +// } +//#endif var injector = new Injector(); if (args.Length == 0 || args.Length > 3 || Regex.IsMatch(args[0], @"^((/|--?)(\?|h|help))$")) { @@ -45,7 +34,8 @@ static int Main(string[] args) return 1; } - Console.WriteLine("InjectModuleInitializer v1.2"); + Version version = Assembly.GetExecutingAssembly().GetName().Version; + Console.WriteLine("InjectModuleInitializer v{0}.{1}", version.Major, version.Minor); Console.WriteLine(""); string assemblyFile, moduleInitializer=null, keyfile=null; @@ -53,19 +43,19 @@ static int Main(string[] args) for (int i = 0; i < args.Length - 1; i++) { - var initMatch = Regex.Match(args[0], "^/m(oduleinitializer)?:(.+)", RegexOptions.IgnoreCase); + var initMatch = Regex.Match(args[i], "^/m(oduleinitializer)?:(.+)", RegexOptions.IgnoreCase); if (initMatch.Success) { moduleInitializer = initMatch.Groups[2].Value; } - var keyMatch = Regex.Match(args[0], "^/k(eyfile)?:(.+)", RegexOptions.IgnoreCase); + var keyMatch = Regex.Match(args[i], "^/k(eyfile)?:(.+)", RegexOptions.IgnoreCase); if (keyMatch.Success) { keyfile = keyMatch.Groups[2].Value; } if (!initMatch.Success && !keyMatch.Success) { - Console.Error.WriteLine("ERROR: Invalid argument '{0}', type InjectModuleInitializer /? for help", args[0]); + Console.Error.WriteLine("error: Invalid argument '{0}', type InjectModuleInitializer /? for help", args[0]); return 1; } } @@ -78,15 +68,19 @@ static int Main(string[] args) } catch (InjectionException ex) { - Console.Error.WriteLine(ex.Message); + Console.Error.WriteLine("error: " + ex.Message); return 1; } + finally + { + injector.Dispose(); + } } static void PrintHelp() { Console.Error.WriteLine(@" -InjectModuleInitializer.exe [options] filename +InjectModuleInitializer.exe [/m:] [/k:] filename /m: Specify the method to be run as the module /moduleinitializer: initializer. Written as full name of containing @@ -108,10 +102,9 @@ a module initializer into. /? Prints this help screen. -Additional information about this program, including how to use it as -a MSBuild task, can be found at the url: +Additional information about this program can be found at the url: - http://einaregilsson.com/2009/12/16/module-initializers-in-csharp + http://einaregilsson.com/module-initializers-in-csharp/ "); } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs deleted file mode 100644 index aaf9c90..0000000 --- a/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* -InjectModuleInitializer - -MSBuild task and command line program to inject a module initializer -into a .NET assembly - -Copyright (C) 2009-2012 Einar Egilsson -http://einaregilsson.com/2009/12/16/module-initializers-in-csharp/ - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -using System.Reflection; -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("InjectModuleInitializer")] -[assembly: AssemblyDescription("Inject a module initializer into a .NET assembly")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Einar Egilsson")] -[assembly: AssemblyProduct("InjectModuleInitializer")] -[assembly: AssemblyCopyright("Copyright © Einar Egilsson 2009-2012")] -[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("945b78d2-a443-48d5-ad51-1abb4fa1d9f3")] - -// 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.2.0.0")] -[assembly: AssemblyFileVersion("1.2.0.0")] diff --git a/Test/Data/test.build b/Test/Data/test.build index fd8331b..db9c1e0 100644 --- a/Test/Data/test.build +++ b/Test/Data/test.build @@ -1,9 +1,8 @@  - - + $(AssemblyName) - v4.0 + v2.0 512 Program . @@ -17,8 +16,8 @@ - - - - + + + + \ No newline at end of file diff --git a/Test/TestRunner.cs b/Test/TestRunner.cs index cb6159b..7654730 100644 --- a/Test/TestRunner.cs +++ b/Test/TestRunner.cs @@ -1,25 +1,16 @@ /* InjectModuleInitializer -MSBuild task and command line program to inject a module initializer -into a .NET assembly - -Copyright (C) 2009-2012 Einar Egilsson -http://einaregilsson.com/2009/12/16/module-initializers-in-csharp/ - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +/* +InjectModuleInitializer + +Command line program to inject a module initializer into a .NET assembly. + +Copyright (C) 2009-2016 Einar Egilsson +http://einaregilsson.com/module-initializers-in-csharp/ + +This program is licensed under the MIT license: http://opensource.org/licenses/MIT + */ using System; using System.Collections.Generic; using System.Text; @@ -34,7 +25,18 @@ public static class TestRunner public static int RunTests() { int success=0, fail=0; - foreach (Type t in new[]{typeof(InjectModuleInitializerTest), typeof(InjectModuleInitializerTest_4_0)}) + + var baseType = typeof(InjectModuleInitializerTest); + var testTypes = new List(); + foreach (var type in Assembly.GetExecutingAssembly().GetTypes()) + { + if (type.IsSubclassOf(baseType)) + { + testTypes.Add(type); + } + } + + foreach (Type t in testTypes) { Console.WriteLine("\r\n" + t.Name); foreach (var method in t.GetMethods()) diff --git a/Test/UnitTests.cs b/Test/UnitTests.cs index 4bb8837..99d239f 100644 --- a/Test/UnitTests.cs +++ b/Test/UnitTests.cs @@ -1,25 +1,13 @@ /* InjectModuleInitializer -MSBuild task and command line program to inject a module initializer -into a .NET assembly +Command line program to inject a module initializer into a .NET assembly. -Copyright (C) 2009 Einar Egilsson -http://einaregilsson.com/2009/12/16/module-initializers-in-csharp/ +Copyright (C) 2009-2016 Einar Egilsson +http://einaregilsson.com/module-initializers-in-csharp/ -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +This program is licensed under the MIT license: http://opensource.org/licenses/MIT + */ using System; using System.Collections.Generic; using System.Diagnostics; @@ -33,9 +21,17 @@ namespace EinarEgilsson.Utilities.InjectModuleInitializer.Test { [TestFixture] - public class InjectModuleInitializerTest + public abstract class InjectModuleInitializerTest { + protected abstract string RuntimeVersion { get; } + + protected abstract string TargetFramework { get; } + + protected abstract string MSBuild { get; } + + protected abstract string ToolsVersion { get; } + [Test] public void AssemblyDoesNotExist() { @@ -125,17 +121,9 @@ public void InitializerMethodMayNotHaveParameters() private void BuildAndFailInject(string errorMsg, string assemblyName, string moduleInitializer = null, string keyfile = null, string codefile = "test.cs") { - var result = Build(assemblyName, codefile); - Assert.AreEqual(0, result.Result); - try - { - new Injector().Inject(string.Format(@"Test\Data\{0}.exe",assemblyName) , moduleInitializer, keyfile); - Assert.Fail("Should have thrown exception"); - } - catch (InjectionException ex) - { - Assert.AreEqual(errorMsg, ex.Message); - } + var result = Build(assemblyName, codefile, moduleInitializer); + Assert.IsTrue(result.StdOut.Contains(errorMsg)); + Assert.AreNotEqual(0, result.Result); } [Test] @@ -143,60 +131,28 @@ public void ExeImplicitInitializer() { var result = Build("ExeImplicitInitializer"); Assert.AreEqual(0, result.Result); - new Injector().Inject(@"Test\Data\ExeImplicitInitializer.exe", keyfile: @"Test\Data\testkey.snk"); ExecResult execResult = Exec(@"Test\Data\ExeImplicitInitializer.exe", ""); Assert.AreEqual(0, execResult.Result); Assert.IsTrue(execResult.StdOut.Contains("
")); - Assert.IsTrue(execResult.StdOut.Contains("ClrVersion: " + RuntimeVersion)); - Assert.IsTrue(execResult.StdOut.Contains("AssemblyRuntime: v" + RuntimeVersion)); - Assert.IsTrue(execResult.StdOut.Contains("PublicKey: 6dd84ac5c69bf74")); + AssertRuntimeAndSigning(execResult.StdOut); } - protected virtual string RuntimeVersion { - get { return "2.0.50727"; } + private void AssertRuntimeAndSigning(string output) + { + Assert.IsTrue(output.Contains("ClrVersion: " + RuntimeVersion)); + Assert.IsTrue(output.Contains("AssemblyRuntime: v" + RuntimeVersion)); + Assert.IsTrue(output.Contains("PublicKey: 6dd84ac5c69bf74")); } [Test] public void ExeExplicitInitializer() { - var result = Build("ExeExplicitInitializer"); + var result = Build("ExeExplicitInitializer", moduleInitializer:"NS.SomeOtherClass::SomeOtherMethod"); Assert.AreEqual(0, result.Result); - new Injector().Inject(@"Test\Data\ExeExplicitInitializer.exe","NS.SomeOtherClass::SomeOtherMethod", @"Test\Data\testkey.snk"); ExecResult execResult = Exec(@"Test\Data\ExeExplicitInitializer.exe", ""); Assert.AreEqual(0, execResult.Result); Assert.IsTrue(execResult.StdOut.Contains("
")); - Assert.IsTrue(execResult.StdOut.Contains("ClrVersion: " + RuntimeVersion)); - Assert.IsTrue(execResult.StdOut.Contains("AssemblyRuntime: v" + RuntimeVersion)); - Assert.IsTrue(execResult.StdOut.Contains("PublicKey: 6dd84ac5c69bf74")); - } - -// [Test] -// public void TestDllSuccess() -// { -// string dll = CompileAssembly(@" -// public class Empty { -// public static string NeverSet; -// } -// -// public class ModuleInitializer { -// public static void Run() { -// Empty.NeverSet = ""SetByModuleInitializer""; -// } -// } -// -// ", false); -// var injector = new Injector(); -// injector.Inject(dll, null); -// Assembly ass = Assembly.Load(File.ReadAllBytes(dll)); -// Type t = ass.GetType("Empty"); -// string value = (string)t.GetField("NeverSet").GetValue(null); -// Assert.AreEqual("SetByModuleInitializer", value); -// File.Delete(dll); -// } - - protected virtual string MSBuild - { - get { return @"C:\Windows\Microsoft.NET\Framework\v3.5\msbuild.exe"; } + AssertRuntimeAndSigning(execResult.StdOut); } private class ExecResult @@ -222,16 +178,47 @@ private ExecResult Exec(string program, string args) return new ExecResult { Result = p.ExitCode, StdErr = p.StandardError.ReadToEnd(), StdOut = p.StandardOutput.ReadToEnd() }; } - private ExecResult Build(string outputName, string codefile="test.cs") + private ExecResult Build(string outputName, string codefile="test.cs", string moduleInitializer=null) { if (File.Exists(outputName)) { File.Delete(outputName); } - return Exec(MSBuild, string.Format(@"/p:AssemblyName={0};CodeFile={1} /target:Clean;Build Test\Data\test.build", outputName, codefile)); + string props = string.Format("AssemblyName={0};CodeFile={1}", outputName, codefile); + if (moduleInitializer != null) + { + props += ";ModuleInitializer=" + moduleInitializer; + } + + props += ";TargetFrameworkVersion=" + this.TargetFramework; + return Exec(MSBuild, "/tv:" + this.ToolsVersion + " /p:" + props + @" /target:Clean;Build Test\Data\test.build"); } } + + public class InjectModuleInitializerTest_2_0 : InjectModuleInitializerTest + { + protected override string MSBuild + { + get { return @"C:\Windows\Microsoft.NET\Framework\v3.5\msbuild.exe"; } + } + + protected override string RuntimeVersion + { + get { return "2.0.50727"; } + } + + protected override string TargetFramework + { + get { return "v2.0"; } + } + + protected override string ToolsVersion + { + get { return "2.0"; } + } + + } public class InjectModuleInitializerTest_4_0 : InjectModuleInitializerTest { protected override string MSBuild @@ -242,6 +229,39 @@ protected override string RuntimeVersion { get { return "4.0.30319"; } } + + protected override string TargetFramework + { + get { return "v4.0"; } + } + + protected override string ToolsVersion + { + get { return "12.0"; } + } + } + + public class InjectModuleInitializerTest_4_6 : InjectModuleInitializerTest + { + protected override string MSBuild + { + get { return @"C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"; } + } + protected override string RuntimeVersion + { + get { return "4.0.30319"; } + } + + protected override string TargetFramework + { + get { return "v4.6"; } + } + + protected override string ToolsVersion + { + get { return "14.0"; } + } + } } diff --git a/lib/Mono.Cecil.Pdb.dll b/lib/Mono.Cecil.Pdb.dll deleted file mode 100644 index 41ed3a0..0000000 Binary files a/lib/Mono.Cecil.Pdb.dll and /dev/null differ diff --git a/lib/Mono.Cecil.dll b/lib/Mono.Cecil.dll deleted file mode 100644 index 6ba3faf..0000000 Binary files a/lib/Mono.Cecil.dll and /dev/null differ diff --git a/lib/nunit.framework.dll b/lib/nunit.framework.dll deleted file mode 100644 index 875e098..0000000 Binary files a/lib/nunit.framework.dll and /dev/null differ diff --git a/license.txt b/license.txt index 89c3eac..89f52f6 100644 --- a/license.txt +++ b/license.txt @@ -1,674 +1,21 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +The MIT License (MIT) + +Copyright (c) 2014 Einar Egilsson (einar@einaregilsson.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/readme.txt b/readme.txt new file mode 100644 index 0000000..48bfbe1 --- /dev/null +++ b/readme.txt @@ -0,0 +1,64 @@ +******************************************************************************** +_________ _______ ______ _______ +\__ __/( ___ )( __ \ ( ___ ) + ) ( | ( ) || ( \ )| ( ) | _ + | | | | | || | ) || | | |(_) + | | | | | || | | || | | | + | | | | | || | ) || | | | _ + | | | (___) || (__/ )| (___) |(_) + )_( (_______)(______/ (_______) + +1) Add the following class to your project: + +internal static class ModuleInitializer +{ + internal static void Run() + { + // TODO: Add assembly initialization logic. + } +} + +2) Add initialization logic to the Run method's body. + +******************************************************************************** + +******************************************************************************** + _______ ______ _______ _________ +( ___ )( ___ \ ( ___ )|\ /|\__ __/ +| ( ) || ( ) )| ( ) || ) ( | ) ( +| (___) || (__/ / | | | || | | | | | +| ___ || __ ( | | | || | | | | | +| ( ) || ( \ \ | | | || | | | | | +| ) ( || )___) )| (___) || (___) | | | +|/ \||/ \___/ (_______)(_______) )_( + +The InjectModuleInitializer nuget package modifies your project file, adding +an "AfterBuild" target. The target is configured such that, upon a successful +build of your project, it runs the InjectModuleInitializer.exe program. This +program modifies your compiled assembly so that, when it is loaded for the +first time, ModuleInitializer.Run() is called. + +******************************************************************************** + +******************************************************************************** + _ _________ _______ _______ _ _______ _______ +( \ \__ __/( ____ \( ____ \( ( /|( ____ \( ____ \ +| ( ) ( | ( \/| ( \/| \ ( || ( \/| ( \/ +| | | | | | | (__ | \ | || (_____ | (__ +| | | | | | | __) | (\ \) |(_____ )| __) +| | | | | | | ( | | \ | ) || ( +| (____/\___) (___| (____/\| (____/\| ) \ |/\____) || (____/\ +(_______/\_______/(_______/(_______/|/ )_)\_______)(_______/ + +InjectModuleInitializer + +Command line program to inject a module initializer into a .NET assembly. + +Copyright (C) 2009-2012 Einar Egilsson +http://einaregilsson.com/module-initializers-in-csharp/ + +This program is licensed under the MIT license: http://opensource.org/licenses/MIT + +******************************************************************************** + +ASCII art courtesy of patorjk.com/software/taag/#p=display&f=Epic&t=patorjk.com \ No newline at end of file diff --git a/vsts.yaml b/vsts.yaml new file mode 100644 index 0000000..acdc9e9 --- /dev/null +++ b/vsts.yaml @@ -0,0 +1,32 @@ +queue: Hosted VS2017 + +steps: + +- checkout: self + clean: true + +- task: MSBuild@1 + displayName: Restore + inputs: + solution: InjectModuleInitializer.sln + msbuildArguments: /t:Restore + +- task: MSBuild@1 + displayName: Version + inputs: + solution: InjectModuleInitializer.csproj + msbuildArguments: /t:Version + +- task: MSBuild@1 + displayName: Build + inputs: + solution: InjectModuleInitializer.sln + msbuildArguments: /bl:"$(Build.ArtifactStagingDirectory)\build.binlog" /p:PackageOutputPath=$(Build.ArtifactStagingDirectory) /v:d /p:Configuration=Release + +- task: PublishBuildArtifacts@1 + displayName: Publish Artifact + inputs: + PathtoPublish: $(Build.ArtifactStagingDirectory) + ArtifactName: out + ArtifactType: Container + condition: always() \ No newline at end of file