Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
4742f7c6
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4742f7c6
编写于
8月 11, 2016
作者:
J
Jared Parsons
提交者:
GitHub
8月 11, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #13085 from jaredpar/delay
Fix our MSBuild logic around signing
上级
ffbc278d
d742f9d4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
30 deletion
+7
-30
build/Targets/VSL.Imports.targets
build/Targets/VSL.Imports.targets
+5
-22
build/Targets/VSL.Versions.targets
build/Targets/VSL.Versions.targets
+2
-8
未找到文件。
build/Targets/VSL.Imports.targets
浏览文件 @
4742f7c6
...
...
@@ -58,35 +58,18 @@
</Otherwise>
</Choose>
<!-- settings for strong name signing -->
<PropertyGroup>
<ShouldSignBuild Condition="'$(RealSignBuild)' == 'true' OR '$(SignType)' == 'real'">true</ShouldSignBuild>
</PropertyGroup>
<!-- Settings for strong name signing -->
<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
. -->
<!-- Shipping binaries
are always public signed. In the case of an official build $(OfficialBuild) the
binaries will be real signed as a post processing step
. -->
<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>
<PropertyGroup>
<AssemblyOriginatorKeyFile>$(VSLToolsPath)\Strong Name Keys\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<PublicKey>$(RoslynPublicKey)</PublicKey>
<PublicKeyToken>31BF3856AD364E35</PublicKeyToken>
<PublicSign>true</PublicSign>
</PropertyGroup>
</When>
...
...
@@ -207,7 +190,7 @@
<Target Name="VerifyBuildFlags">
<Error
Condition="
('$(RealSignBuild)' == 'true' OR '$(SignType)' == 'real')
AND '$(BuildVersion)' == '42.42.42.42'"
Condition="
'$(OfficialBuild)' == 'true'
AND '$(BuildVersion)' == '42.42.42.42'"
Text="Must specify a build version in order to real sign a build." />
<Error
...
...
build/Targets/VSL.Versions.targets
浏览文件 @
4742f7c6
...
...
@@ -15,16 +15,10 @@
<MicrosoftVisualStudioInteractiveWindowVersion>$(RoslynAssemblyVersionBase)</MicrosoftVisualStudioInteractiveWindowVersion>
</PropertyGroup>
<PropertyGroup>
<!-- We cannot sign an unofficial build, so fail if 'OfficialBuild' is not 'true' but 'SignedBuild' is -->
<SignedBuild Condition="'$(RealSignBuild)' == 'true' OR '$(SignType)' == 'real'">true</SignedBuild>
<Error Condition="'$(OfficialBuild)' != 'true' AND '$(SignedBuild)' == 'true'">Cannot sign an unofficial build.</Error>
</PropertyGroup>
<PropertyGroup>
<!-- We should not be signing a build anywhere except for in MicroBuild, which will always specify 'BUILD_BUILDNUMBER' -->
<BuildNumber Condition="'$(BuildNumber)' == ''">$(BUILD_BUILDNUMBER)</BuildNumber>
<Error Condition="'$(BuildNumber)' == '' AND '$(
Signed
Build)' == 'true'">A build number must be specified for a signed build.</Error>
<Error Condition="'$(BuildNumber)' == '' AND '$(
Official
Build)' == 'true'">A build number must be specified for a signed build.</Error>
</PropertyGroup>
<PropertyGroup>
...
...
@@ -48,7 +42,7 @@
</PropertyGroup>
<Choose>
<When Condition="'$(OfficialBuild)' == 'true' OR '$(
SignedBuild)' == 'true' OR '$(
UseShippingAssemblyVersion)' == 'true'">
<When Condition="'$(OfficialBuild)' == 'true' OR '$(UseShippingAssemblyVersion)' == 'true'">
<PropertyGroup>
<AssemblyVersion>$(RoslynAssemblyVersionBase).0</AssemblyVersion>
<BuildVersion>$(RoslynFileVersionBase).$(BuildNumberFiveDigitDateStamp)</BuildVersion>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录