Microbuild Additions #7
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| <Project DefaultTargets="Build" xmln="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <!-- Import MicroBuild for projects that need to be signed --> | ||
| <Import Condition="''$(NeedsSigningToRelease)' == 'true'" Project="$(NuGetPackageRoot)\MicroBuild.Core\0.2.0\build\MicroBuild.Core.props" /> | ||
| <Import Condition="''$(NeedsSigningToRelease)' == 'true'" Project="$(NuGetPackageRoot)\MicroBuild.Core\0.2.0\build\MicroBuild.Core.targets" /> | ||
| <VSLToolsPath Condition="'$(VSLToolsPath)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..'))</VSLToolsPath> | ||
|
|
||
|
|
||
| <!-- settings for strong name signing --> | ||
| <PropertyGroup> | ||
| <MicroBuildSigningLibraryV2>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\MicroBuild\Plugins\MicroBuild.Plugins.Signing.1.0.227\build\MicroBuild.Signing.dll</MicroBuildSigningLibraryV2> | ||
| <MicroBuildSigningLibrary Condition="Exists('$(MicroBuildSigningLibraryV2)')">$(MicroBuildSigningLibraryV2)</MicroBuildSigningLibrary> | ||
| <ShouldSignBuild Condition="'$(RunningInMicroBuild)' == 'true' AND '$(SignType)' == 'real'">true</ShouldSignBuild> | ||
| <StrongNameCertificate Condition="'$(StrongNameCertificate)' == ''">MicrosoftShared</StrongNameCertificate> | ||
| <RoslynInternalKey>002400000480000094000000060200000024000052534131000400000100010055e0217eb635f69281051f9a823e0c7edd90f28063eb6c7a742a19b4f6139778ee0af438f47aed3b6e9f99838aa8dba689c7a71ddb860c96d923830b57bbd5cd6119406ddb9b002cf1c723bf272d6acbb7129e9d6dd5a5309c94e0ff4b2c884d45a55f475cd7dba59198086f61f5a8c8b5e601c0edbf269733f6f578fc8579c2</RoslynInternalKey> | ||
| </PropertyGroup> | ||
|
|
||
| <Choose> | ||
| <When Condition="'$(SignAssembly)' == 'true'"> | ||
| <Choose> | ||
| <!-- Shipping binaries in an "official" build are delay-signed with the MS key; later, the signing | ||
| system will finish the strong-name signing. --> | ||
| <When Condition="'$(NonShipping)' != 'true'"> | ||
|
|
||
| <Choose> | ||
| <!-- DelaySign if we're real signing, otherwise public sign --> | ||
| <When Condition="'$(ShouldSignBuild)' == 'true'"> | ||
| <PropertyGroup> | ||
| <DelaySign>true</DelaySign> | ||
| </PropertyGroup> | ||
| </When> | ||
| <Otherwise> | ||
| <PropertyGroup> | ||
| <PublicSign>true</PublicSign> | ||
| </PropertyGroup> | ||
| </Otherwise> | ||
| </Choose> | ||
|
|
||
| <Choose> | ||
| <When Condition="'$(StrongNameCertificate)' == 'Microsoft'"> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>$(VSLToolsPath)\Strong Name Keys\MSFT.snk</AssemblyOriginatorKeyFile> | ||
| <PublicKey>002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293</PublicKey> | ||
| <PublicKeyToken>b03f5f7f11d50a3a</PublicKeyToken> | ||
| <StrongNameCertificateFriendlyId>67</StrongNameCertificateFriendlyId> | ||
| </PropertyGroup> | ||
| </When> | ||
|
|
||
| <When Condition="'$(StrongNameCertificate)' == 'MicrosoftShared'"> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>$(VSLToolsPath)\Strong Name Keys\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile> | ||
| <PublicKey>0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9</PublicKey> | ||
| <PublicKeyToken>31BF3856AD364E35</PublicKeyToken> | ||
| <StrongNameCertificateFriendlyId>72</StrongNameCertificateFriendlyId> | ||
| </PropertyGroup> | ||
| </When> | ||
|
|
||
| </Choose> | ||
|
|
||
| </When> | ||
|
|
||
| <!-- Non-shipping binaries are simply signed with the Roslyn internal key. --> | ||
| <Otherwise> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>$(VSLToolsPath)\Strong Name Keys\RoslynInternalKey.Private.snk</AssemblyOriginatorKeyFile> | ||
| <DelaySign>false</DelaySign> | ||
| <PublicKey>$(RoslynInternalKey)</PublicKey> | ||
| <PublicKeyToken>fc793a00266884fb</PublicKeyToken> | ||
| </PropertyGroup> | ||
| </Otherwise> | ||
| </Choose> | ||
| </When> | ||
| </Choose> | ||
|
|
||
| <!-- Because https://github.com/dotnet/roslyn/issues/7812 is not yet fixed, the IDE doesn't know if we set the PublicSign | ||
| flag. As a result, all design-time builds will thing we're real-signing, which causes semantics to get all screwed up. | ||
| The workaround for now is, for design-time builds only, to pass the DelaySign flag since that's "good enough". This | ||
| must be done in a target versus conditioning on BuildingProject, since BuildingProject itself is correctly set in a | ||
| target. --> | ||
| <Target Name="FixPublicSignFlagForDesignTimeBuilds" BeforeTargets="CoreCompile" Condition="'$(PublicSign)' == 'true'"> | ||
| <PropertyGroup Condition="'$(BuildingProject)' == 'false'"> | ||
| <!-- Turn off PublicSign, because leaving both to true will make the Csc task unhappy --> | ||
| <PublicSign>false</PublicSign> | ||
| <DelaySign>true</DelaySign> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <ItemGroup> | ||
| <FilesToSign Condition="'$(ShouldSignBuild)' == 'true' AND '$(NonShipping)' != 'true'" Include="$(OutDir)\$(AssemblyName).dll"> | ||
| <Authenticode>Microsoft</Authenticode> | ||
| <StrongName>$(StrongNameCertificateFriendlyId)</StrongName> | ||
| </FilesToSign> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Choose> | ||
| <When Condition="'$(ProjectLanguage)' == 'VB'"> | ||
|
Member
There was a problem hiding this comment. Not sure we need this VB stuff, so we?
Member
Author
There was a problem hiding this comment. I doubt we need it either, I've been copying from the Roslyn-project-system, and committed and pushed last night before I left. Still some more cleanup to do. |
||
| <PropertyGroup> | ||
| <MSBuildTargetsLanguageName>VisualBasic</MSBuildTargetsLanguageName> | ||
| </PropertyGroup> | ||
| </When> | ||
| <When Condition="'$(ProjectLanguage)' == 'CSharp'"> | ||
| <PropertyGroup> | ||
| <MSBuildTargetsLanguageName>CSharp</MSBuildTargetsLanguageName> | ||
| </PropertyGroup> | ||
| </When> | ||
| </Choose> | ||
|
|
||
| <Choose> | ||
| <When Condition="'$(ProjectLanguage)' == 'C++'"> | ||
| <PropertyGroup> | ||
| <MSBuildTargetsFilePath>$(VCTargetsPath)\Microsoft.Cpp.targets</MSBuildTargetsFilePath> | ||
| </PropertyGroup> | ||
| </When> | ||
| <When Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable'"> | ||
| <PropertyGroup> | ||
| <MSBuildTargetsFilePath>$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.$(MSBuildTargetsLanguageName).targets</MSBuildTargetsFilePath> | ||
| </PropertyGroup> | ||
| </When> | ||
| <Otherwise> | ||
| <PropertyGroup> | ||
| <MSBuildTargetsFilePath>$(MSBuildToolsPath)\Microsoft.$(MSBuildTargetsLanguageName).targets</MSBuildTargetsFilePath> | ||
| </PropertyGroup> | ||
| </Otherwise> | ||
| </Choose> | ||
|
|
||
| <Import Project="$(MSBuildTargetsFilePath)" /> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetPath></TargetPath> <!-- Prevent projects referencing this from trying to pass us to the compiler --> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="CoreCompile" /> <!-- Prevent Csc from being called --> | ||
| <Target Name="GenerateTargetFrameworkMonikerAttribute" /> <!-- Don't generate TFM attribute --> | ||
| <Target Name="RuntimeImplementationProjectOutputGroup" /> <!-- Group always attempts resolve runtime, regardless of <CopyNuGetImplementations>--> | ||
|
|
||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <IsPortable>false</IsPortable> | ||
| </PropertyGroup> | ||
| <Import Project="..\..\..\Directory.Build.props" /> | ||
| <PropertyGroup> | ||
| <ProjectGuid>{3899F789-E072-476D-B9D6-79E641611648}</ProjectGuid> | ||
| <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> | ||
| <TargetFrameworkVersion>v1.3</TargetFrameworkVersion> | ||
| <UseCommonOutputDirectory>true</UseCommonOutputDirectory> | ||
| <OutputPath>bin</OutputPath> | ||
| <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory> | ||
| <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory> | ||
| <OutputType>Library</OutputType> | ||
| <Nonshipping>true</Nonshipping> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Content Include="project.json" /> | ||
| </ItemGroup> | ||
| <Import Project="..\..\..\build\Targets\ProducesNoOutput.Imports.targets" /> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "supports" : {}, | ||
| "dependencies": { | ||
| "MicroBuild.Core": "0.2.0" | ||
| }, | ||
| "frameworks": { | ||
| "netstandard1.3": {} | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Won't this sign test assemblies as well? Do we want that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but because test assemblies are marked as non-shipping, they're not signed with the standard public keys, but instead with the Roslyn internal key.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/dotnet/sdk/blob/master/src/Tasks/Microsoft.DotNet.Core.Build.Tasks.UnitTests/Microsoft.DotNet.Core.Build.Tasks.UnitTests.csproj doesn't appear to have this 'non-shipping' mark.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point, it'll be in the next set of changes I push.