Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitf53f536

Browse files
committed
use the official build number (if provided) to version the compiler package
1 parente1a6afa commitf53f536

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

‎src/FSharpSource.Settings.targets‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,20 @@
4747
Given $(BUILD_BUILDNUMBER) = '20161225.1'
4848
Given $(MicroBuildAssemblyVersion) = '15.4.1.0'
4949
50-
Then $(BuildTimeStamp_Day) = 161225
50+
Then $(BuildTimeStamp_Date) = 161225
5151
Then $(BuildTimeStamp_Number) = 01
5252
Then $(BuildTimeStamp) = 16122501
5353
Then $(MicroBuildAssemblyVersion_WithoutRevision) = 15.4.1
5454
Then $(VsixPackageVersion) = 15.4.1.16122501
55+
Then $(NuGetPackageVersionSuffix) = 161225-01
5556
5657
-->
57-
<BuildTimeStamp_Day>$(BUILD_BUILDNUMBER.Split('.')[0].Substring(2))</BuildTimeStamp_Day>
58+
<BuildTimeStamp_Date>$(BUILD_BUILDNUMBER.Split('.')[0].Substring(2))</BuildTimeStamp_Date>
5859
<BuildTimeStamp_Number>$(BUILD_BUILDNUMBER.Split('.')[1].PadLeft(2, '0'))</BuildTimeStamp_Number>
59-
<BuildTimeStamp>$(BuildTimeStamp_Day)$(BuildTimeStamp_Number)</BuildTimeStamp>
60+
<BuildTimeStamp>$(BuildTimeStamp_Date)$(BuildTimeStamp_Number)</BuildTimeStamp>
6061
<MicroBuildAssemblyVersion_WithoutRevision>$(MicroBuildAssemblyVersion.Substring(0, $(MicroBuildAssemblyVersion.LastIndexOf('.'))))</MicroBuildAssemblyVersion_WithoutRevision>
6162
<VsixPackageVersion>$(MicroBuildAssemblyVersion_WithoutRevision).$(BuildTimeStamp)</VsixPackageVersion>
63+
<NuGetPackageVersionSuffix>$(BuildTimeStamp_Date)-$(BuildTimeStamp_Number)</NuGetPackageVersionSuffix>
6264
</PropertyGroup>
6365

6466
<PropertyGroup>

‎src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageAuthorsCondition="'$(PackageAuthors)' == ''" >Microsoft and F# Software Foundation</PackageAuthors>
1414
<PackageTagsCondition="'$(PackageTags)' == ''" >Visual F# Compiler FSharp functional programming</PackageTags>
1515
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\coreclr\bin</OutputPath>
16-
<PreReleaseSuffixCondition="'$(PreRelease)' != 'false'">-rtm-$(BuildRevision.Trim())-0</PreReleaseSuffix>
16+
<PreReleaseSuffixCondition="'$(PreRelease)' != 'false'">-rtm-$(NuGetPackageVersionSuffix)</PreReleaseSuffix>
1717
<PackageVersion>4.2.0$(PreReleaseSuffix)</PackageVersion>
1818
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" -prop "diasymreaderversion=$(MicrosoftDiaSymReaderPackageVersion)" -prop "diasymreaderportablepdbversion=$(MicrosoftDiaSymReaderPortablePdbPackageVersion)"</PackageProperties>
1919
</PropertyGroup>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp