From ea6cb8062aa0c2479cbbaec107bdb6050b110f1a Mon Sep 17 00:00:00 2001 From: NextTurn <45985406+NextTurn@users.noreply.github.com> Date: Fri, 15 Feb 2019 00:00:00 +0800 Subject: [PATCH] Remove strong name signing --- .gitignore | 3 +-- Directory.Build.props | 1 - generate-key.ps1 | 3 --- src/Core/ServiceWrapper/winsw.csproj | 3 +-- src/Core/WinSWCore/WinSWCore.csproj | 1 - src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj | 1 - src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj | 1 - 7 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 generate-key.ps1 diff --git a/.gitignore b/.gitignore index 3660d53..114a799 100644 --- a/.gitignore +++ b/.gitignore @@ -239,8 +239,7 @@ orleans.codegen.cs # Including strong name files can present a security risk # (https://github.com/github/gitignore/pull/2483#issue-259490424) -*.snk -*.pfx +#*.snk # Since there are multiple workflows, uncomment next line to ignore bower_components # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) diff --git a/Directory.Build.props b/Directory.Build.props index 1366103..b3cf3c1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,6 @@ full - $(MSBuildThisFileDirectory)winsw_key.snk $(MSBuildThisFileDirectory)artifacts\ diff --git a/generate-key.ps1 b/generate-key.ps1 deleted file mode 100644 index 4b5f6f8..0000000 --- a/generate-key.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -$files = Get-ChildItem -Path 'C:\Program Files (x86)\Microsoft SDKs\Windows\' -Filter 'sn.exe' -Recurse | Select-Object -Property FullName -$files -& $files[0].FullName -k winsw_key.snk diff --git a/src/Core/ServiceWrapper/winsw.csproj b/src/Core/ServiceWrapper/winsw.csproj index c12631f..e90deb5 100644 --- a/src/Core/ServiceWrapper/winsw.csproj +++ b/src/Core/ServiceWrapper/winsw.csproj @@ -13,7 +13,6 @@ Copyright 2008-2016 Oleg Nenashev, CloudBees, Inc. and other contributors winsw WindowsService - true @@ -101,7 +100,7 @@ $(NuGetPackageRoot)ilmerge\3.0.29\tools\net452\ILMerge.exe - /keyfile:"$(AssemblyOriginatorKeyFile)" /targetplatform:$(TargetPlatform) /out:$(OutputAssembly) $(InputAssemblies) + /targetplatform:$(TargetPlatform) /out:$(OutputAssembly) $(InputAssemblies) "$(ILMerge)" $(ILMergeArgs) diff --git a/src/Core/WinSWCore/WinSWCore.csproj b/src/Core/WinSWCore/WinSWCore.csproj index 1c6edc6..c5e11c4 100644 --- a/src/Core/WinSWCore/WinSWCore.csproj +++ b/src/Core/WinSWCore/WinSWCore.csproj @@ -6,7 +6,6 @@ enable winsw - true diff --git a/src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj b/src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj index 4406cff..d3e6ce1 100644 --- a/src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj +++ b/src/Plugins/RunawayProcessKiller/RunawayProcessKiller.csproj @@ -7,7 +7,6 @@ true winsw.Plugins.RunawayProcessKiller - true diff --git a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj b/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj index 67d0e31..d3fd4de 100644 --- a/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj +++ b/src/Plugins/SharedDirectoryMapper/SharedDirectoryMapper.csproj @@ -6,7 +6,6 @@ enable winsw.Plugins.SharedDirectoryMapper - true