From 61e9f2f2a569b03deb1af96189f707b171eab34d Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 18 Dec 2015 12:13:36 -0800 Subject: [PATCH 1/2] Adding a key to use for strong name signing of our assemblies and modifying the project.json of our projects to include that key. --- src/Microsoft.DotNet.Cli.Utils/project.json | 4 ++++ src/Microsoft.DotNet.Compiler.Common/project.json | 4 ++++ .../project.json | 3 +++ .../project.json | 3 +++ src/Microsoft.DotNet.ProjectModel/project.json | 3 +++ src/Microsoft.DotNet.Runtime/project.json | 2 +- .../project.json | 3 ++- .../project.json | 3 ++- tools/Key.snk | Bin 0 -> 596 bytes 9 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 tools/Key.snk diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 7bafa034a..1a5670618 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -1,6 +1,10 @@ { "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, + "shared": "**/*.cs", "dependencies": { diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 3bd797244..33a18ddb1 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -1,6 +1,10 @@ { "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, + "dependencies": { "System.Reflection": "4.0.10-rc2-23616", "NETStandard.Library": "1.0.0-rc2-23616", diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 8fb750e90..a2e50a291 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -1,5 +1,8 @@ { "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, "dependencies": { "NETStandard.Library": "1.0.0-rc2-23616", "Microsoft.DotNet.ProjectModel": "1.0.0-*", diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 408da528c..1b2b97dc8 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -1,5 +1,8 @@ { "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, "dependencies": { "NETStandard.Library": "1.0.0-rc2-23616", "Microsoft.DotNet.ProjectModel": "1.0.0-*", diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index b9baad7e4..b3d58d43b 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -1,5 +1,8 @@ { "version": "1.0.0-*", + "compilationOptions": { + "keyFile": "../../tools/Key.snk" + }, "description": "Types to model a .NET Project", "dependencies": { "NETStandard.Library": "1.0.0-rc2-23616", diff --git a/src/Microsoft.DotNet.Runtime/project.json b/src/Microsoft.DotNet.Runtime/project.json index dd5da7d01..26103a0f9 100644 --- a/src/Microsoft.DotNet.Runtime/project.json +++ b/src/Microsoft.DotNet.Runtime/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "compilationOptions": { - "emitEntryPoint": true + "emitEntryPoint": true }, "dependencies": { diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 1d2308e67..1cade77eb 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -6,7 +6,8 @@ "url": "git://github.com/dotnet/cli" }, "compilationOptions": { - "warningsAsErrors": true + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk" }, "dependencies": { "Newtonsoft.Json": "7.0.1" diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index ac9342317..98036c680 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -6,7 +6,8 @@ "url": "git://github.com/dotnet/cli" }, "compilationOptions": { - "warningsAsErrors": true + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk" }, "dependencies": { "Newtonsoft.Json": "7.0.1", diff --git a/tools/Key.snk b/tools/Key.snk new file mode 100644 index 0000000000000000000000000000000000000000..e10e4889c125d3120cd9e81582243d70f7cbb806 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098=Iw=HCsnz~#iVhm& zj%TU(_THUee?3yHBjk$37ysB?i5#7WD$={H zV4B!OxRPrb|8)HPg~A}8P>^=#y<)56#=E&NzcjOtPK~<4n6GHt=K$ro*T(lhby_@U zEk(hLzk1H)0yXj{A_5>fk-TgNoP|q6(tP2xo8zt8i%212CWM#AeCd?`hS|4~L({h~Moo(~vy&3Z z1uI}`fd^*>o=rwbAGymj6RM^pZm(*Kfhs+Y1#`-2JPWZMK8@;ZWCk2+9bX4YP);~fj-BU*R zQPvWv$89!{Rl9wM+zR>_TSkn^voYxA?2G iKnV#iZ6Ah`K>b=@=IjYJXrxL124zR(38)nxe+&q_$QXwJ literal 0 HcmV?d00001 From 7c40de57bf969b88ce524c2537fe115fd02e42b4 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Sun, 20 Dec 2015 11:32:19 -0800 Subject: [PATCH 2/2] Removing strong name signing from utils, as it is not compiled --- src/Microsoft.DotNet.Cli.Utils/project.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 1a5670618..7bafa034a 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -1,10 +1,6 @@ { "version": "1.0.0-*", - "compilationOptions": { - "keyFile": "../../tools/Key.snk" - }, - "shared": "**/*.cs", "dependencies": {