Skip to content

Commit

Permalink
Fix cli-deps-satellites on windows to not sign the satellites during …
Browse files Browse the repository at this point in the history
…source-build, since we are using a dummy RoslynTools package.
  • Loading branch information
eerhardt committed Sep 16, 2017
1 parent 0e41e37 commit 03b23c9
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From ad9db12008d9d07bc6137c69234670112d5899fb Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Fri, 15 Sep 2017 20:08:48 -0500
Subject: [PATCH] Allow cli-deps-satellites to skip signing on Windows during
source-build since we don't have the RoslynTools package

---
src/Directory.Build.props | 3 ++-
src/Directory.Build.targets | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 042f2ab..191b194 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -33,7 +33,8 @@
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\build\$(StrongNameKey).snk</AssemblyOriginatorKeyFile>
<SignToolConfig>$(MSBuildThisFileDirectory)..\build\$(StrongNameKey).json</SignToolConfig>
<SignAssembly>true</SignAssembly>
-
+ <SkipSignSatellites Condition="'$(SkipSignSatellites)' == '' and '$(DotNetBuildType)' == 'Source'">true</SkipSignSatellites>
+
<!-- Use delay signing instead of public signing on full msbuild to workaround https://github.com/Microsoft/msbuild/issues/1490 -->
<PublicSign Condition="'$(SignType)' != 'real' and '$(MSBuildRuntimeType)' == 'Core'">true</PublicSign>
<DelaySign Condition="'$(PublicSign)' != 'true'">true</DelaySign>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 8e76325..0f87c86 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -21,7 +21,7 @@

<Target Name="SignSatellites"
BeforeTargets="PackSatellites"
- Condition="$(IsPackage) and '$(OS)' == 'Windows_NT'">
+ Condition="$(IsPackage) and '$(OS)' == 'Windows_NT' and '$(SkipSignSatellites)' != 'true'">
<ItemGroup>
<SignToolArg Include="-nugetPackagesPath $(NuGetPackageRoot)" />
<SignToolArg Include="-intermediateOutputPath $(IntermediateOutputPath)" />
--
2.11.0 (Apple Git-81)

1 change: 1 addition & 0 deletions targets/cli-deps-satellites.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<PackagesOutput>$(ProjectDirectory)/bin/$(Configuration)</PackagesOutput>
<BuildNumber>20170727-1</BuildNumber>
<CommitHash>4ae79a97bb5aadc5486d0f72223bfbf90dd9cfce</CommitHash>
<DotNetBuildType>Source</DotNetBuildType>
</PropertyGroup>
<ItemGroup>
<EnvironmentVariables Include="BuildNumber=$(BuildNumber)" />
Expand Down

0 comments on commit 03b23c9

Please sign in to comment.