mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

pr feedback

Browse source
This commit is contained in:
Bryan Thornbury 2016-10-04 16:37:23 -07:00
parent 46b16d2de0
commit 49637d0fe9
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
TestAssets/TestProjects/TestAppWithSigning/project.json
View file

@ -5,22 +5,12 @@
"keyFile": "./key.snk"
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.1"
"Microsoft.NETCore.App": {
"version": "1.0.1",
"type": "platform"
},
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {},
"fedora.23-x64": {},
"opensuse.13.2-x64": {}
}
}

2
src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs
View file

@ -35,7 +35,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
.WithMSBuildCondition(" '$(OS)' == 'Windows_NT' "),
new AddPropertyTransform<CommonCompilerOptions>("PublicSign",
"true",
compilerOptions => !string.IsNullOrEmpty(compilerOptions.KeyFile))
compilerOptions => !string.IsNullOrEmpty(compilerOptions.KeyFile) && (compilerOptions.PublicSign == null))
.WithMSBuildCondition(" '$(OS)' != 'Windows_NT' ")
};