Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
087e1d6f
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,发现更多精彩内容 >>
提交
087e1d6f
编写于
6月 14, 2016
作者:
T
Tanner Gooding
提交者:
GitHub
6月 14, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #11971 from tannergooding/master
Updating VSL.Version.targets to properly specify build number.
上级
fa964e07
49a1d5af
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
31 deletion
+29
-31
build/Targets/VSL.Versions.targets
build/Targets/VSL.Versions.targets
+29
-22
src/Compilers/Core/MSBuildTask/Desktop/MSBuildTask.Desktop.csproj
...ilers/Core/MSBuildTask/Desktop/MSBuildTask.Desktop.csproj
+0
-9
未找到文件。
build/Targets/VSL.Versions.targets
浏览文件 @
087e1d6f
...
@@ -17,6 +17,31 @@
...
@@ -17,6 +17,31 @@
<!-- Pre-release version of CoreCLR dependencies (empty for release). Used e.g. to find crossgen. -->
<!-- Pre-release version of CoreCLR dependencies (empty for release). Used e.g. to find crossgen. -->
<CoreClrVersionSuffix>-rc3-24128-00</CoreClrVersionSuffix>
<CoreClrVersionSuffix>-rc3-24128-00</CoreClrVersionSuffix>
</PropertyGroup>
</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 '$(SignedBuild)' == 'true'">A build number must be specified for a signed build.</Error>
</PropertyGroup>
<PropertyGroup>
<!-- When a build number is not specified, then we should default back to '0.0' -->
<BuildNumber Condition="'$(BuildNumber)' == ''">0.0</BuildNumber>
<!-- When a build number is specified, it needs to be in the format of 'x.y' -->
<Error Condition="$(BuildNumber.Split('.').Length) != 2">BuildNumber should have two parts (in the form of 'x.y')</Error>
</PropertyGroup>
<PropertyGroup>
<!-- Split the build parts out from the BuildNumber -->
<BuildNumberPart1>$(BuildNumber.Split('.')[0])</BuildNumberPart1>
<BuildNumberPart2>$(BuildNumber.Split('.')[1].PadLeft(2,'0'))</BuildNumberPart2>
</PropertyGroup>
<Choose>
<Choose>
<When Condition="'$(BuildVersion)' != ''">
<When Condition="'$(BuildVersion)' != ''">
...
@@ -28,20 +53,10 @@
...
@@ -28,20 +53,10 @@
</PropertyGroup>
</PropertyGroup>
</When>
</When>
<When Condition="('$(BuildNumber)' != '') and ($(BuildNumber.Split('.').Length) == 2)">
<When Condition="'$(OfficialBuild)' == 'true' OR '$(SignedBuild)' == 'true'">
<!-- The user specified a build number, so we should use that. -->
<PropertyGroup>
<AssemblyVersion>$(RoslynSemanticVersion).0</AssemblyVersion>
<BuildVersion>$(RoslynSemanticVersion).$(BuildNumber.Split('.')[0])</BuildVersion>
</PropertyGroup>
</When>
<When Condition="'$(OfficialBuild)' == 'true' OR '$(RealSignBuild)' == 'true' OR '$(SignType)' == 'real'">
<!-- We're creating an official or real-signed build, but don't have a build number. Just use the RoslynSemanticVersion.
This happens if the build template does not pass BuildNumber down to MSBuild. -->
<PropertyGroup>
<PropertyGroup>
<AssemblyVersion>$(RoslynSemanticVersion).0</AssemblyVersion>
<AssemblyVersion>$(RoslynSemanticVersion).0</AssemblyVersion>
<BuildVersion>$(RoslynSemanticVersion).
0
</BuildVersion>
<BuildVersion>$(RoslynSemanticVersion).
$(BuildNumberPart1)$(BuildNumberPart2)
</BuildVersion>
</PropertyGroup>
</PropertyGroup>
</When>
</When>
...
@@ -51,8 +66,8 @@
...
@@ -51,8 +66,8 @@
have a build with an actual number installed, but then build and F5 a build with
have a build with an actual number installed, but then build and F5 a build with
this number. -->
this number. -->
<PropertyGroup>
<PropertyGroup>
<BuildVersion>42.42.42.42</BuildVersion>
<AssemblyVersion>42.42.42.42</AssemblyVersion>
<AssemblyVersion>42.42.42.42</AssemblyVersion>
<BuildVersion>42.42.42.42</BuildVersion>
</PropertyGroup>
</PropertyGroup>
</Otherwise>
</Otherwise>
</Choose>
</Choose>
...
@@ -62,19 +77,11 @@
...
@@ -62,19 +77,11 @@
<!-- NuGet version -->
<!-- NuGet version -->
<PropertyGroup>
<PropertyGroup>
<BuildNumberSuffix>$(BUILD_BUILDNUMBER)</BuildNumberSuffix>
<BuildNumberPart1 Condition="'$(BuildNumberSuffix)' != ''">
$(BuildNumberSuffix.Split('.')[0])
</BuildNumberPart1>
<BuildNumberPart2 Condition="'$(BuildNumberSuffix)' != ''">
$(BuildNumberSuffix.Split('.')[1].PadLeft(2,'0'))
</BuildNumberPart2>
<!-- Only set when building RTM with no dependencies on pre-release packages
<!-- Only set when building RTM with no dependencies on pre-release packages
<NuGetReleaseVersion>$(RoslynSemanticVersion)</NuGetReleaseVersion>
<NuGetReleaseVersion>$(RoslynSemanticVersion)</NuGetReleaseVersion>
-->
-->
<NuGetPreReleaseVersion>$(RoslynSemanticVersion)-beta3</NuGetPreReleaseVersion>
<NuGetPreReleaseVersion>$(RoslynSemanticVersion)-beta3</NuGetPreReleaseVersion>
<NuGetPerBuildPreReleaseVersion
Condition="'$(BuildNumberSuffix)' != ''"
>$(NuGetPreReleaseVersion)-$(BuildNumberPart1.Trim())-$(BuildNumberPart2.Trim())</NuGetPerBuildPreReleaseVersion>
<NuGetPerBuildPreReleaseVersion>$(NuGetPreReleaseVersion)-$(BuildNumberPart1.Trim())-$(BuildNumberPart2.Trim())</NuGetPerBuildPreReleaseVersion>
<!-- TODO: change to a fixed version once we move this component to a separate repo -->
<!-- TODO: change to a fixed version once we move this component to a separate repo -->
<MicrosoftDiaSymReaderPortablePdbVersion>1.1.0-beta1</MicrosoftDiaSymReaderPortablePdbVersion>
<MicrosoftDiaSymReaderPortablePdbVersion>1.1.0-beta1</MicrosoftDiaSymReaderPortablePdbVersion>
...
...
src/Compilers/Core/MSBuildTask/Desktop/MSBuildTask.Desktop.csproj
浏览文件 @
087e1d6f
...
@@ -14,15 +14,6 @@
...
@@ -14,15 +14,6 @@
<AssemblyName>
Microsoft.Build.Tasks.CodeAnalysis
</AssemblyName>
<AssemblyName>
Microsoft.Build.Tasks.CodeAnalysis
</AssemblyName>
<TargetFrameworkVersion>
v4.6
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v4.6
</TargetFrameworkVersion>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup
Condition=
"('$(BuildNumber)' != '') and ($(BuildNumber.Split('.').Length) == 2)"
>
<!-- Due to msbuild node reuse, the build task needs to have a different assembly
version to be loaded in multiple builds. Since nothing depends on the exact
assembly version of the build task we'll append the build number to the assembly
version when available (which it always is in official builds) -->
<AssemblyVersion>
$(RoslynSemanticVersion).$(BuildNumber.Split('.')[0])
</AssemblyVersion>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "
/>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "
/>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "
/>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "
/>
<ItemGroup>
<ItemGroup>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录