|
12 | 12 | <!-- Version number computation -->
|
13 | 13 | <PropertyGroup>
|
14 | 14 | <PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
|
15 |
| - <FSLanguageVersion>5.0</FSLanguageVersion> |
16 |
| - |
17 |
| - <FSCoreMajorVersion>$(FSLanguageVersion)</FSCoreMajorVersion> |
18 |
| - <FSCorePackageVersion>$(FSCoreMajorVersion).0</FSCorePackageVersion> |
19 |
| - <FSCoreVersionPrefix>$(FSCoreMajorVersion).0</FSCoreVersionPrefix> |
20 |
| - <FSCoreVersion>$(FSCoreVersionPrefix).0</FSCoreVersion> |
21 |
| - |
22 |
| - <FSharpCompilerServicePrefix>37.0</FSharpCompilerServicePrefix> |
23 |
| - <FSharpCompilerServiceVersion>$(FSharpCompilerServicePrefix).0</FSharpCompilerServiceVersion> |
24 |
| - |
| 15 | + <FSMajorVersion>5</FSMajorVersion> |
| 16 | + <FSMinorVersion>0</FSMinorVersion> |
| 17 | + <FSBuildVersion>0</FSBuildVersion> |
| 18 | + <FSRevisionVersion>0</FSRevisionVersion> |
| 19 | + <FSLanguageVersion>$(FSMajorVersion).$(FSMinorVersion)</FSLanguageVersion> |
| 20 | + <FSLanguageReleaseNotesVersion>$(FSMajorVersion)-$(FSMinorVersion)</FSLanguageReleaseNotesVersion> |
| 21 | + <FSCoreProductVersion>$(FSMajorVersion).$(FSMinorVersion)</FSCoreProductVersion> |
| 22 | + <FSCorePackageVersion>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCorePackageVersion> |
| 23 | + <FSCoreReleaseNotesVersion>$(FSMajorVersion)-$(FSMinorVersion)-$(FSBuildVersion)</FSCoreReleaseNotesVersion> |
| 24 | + <FSCoreVersionPrefix>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCoreVersionPrefix> |
| 25 | + <FSCoreVersion>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion).$(FSRevisionVersion)</FSCoreVersion> |
| 26 | + <FCSMajorVersion>37</FCSMajorVersion> |
| 27 | + <FCSMinorVersion>$(FSMinorVersion)</FCSMinorVersion> |
| 28 | + <FCSBuildVersion>$(FSBuildVersion)</FCSBuildVersion> |
| 29 | + <FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion> |
| 30 | + <FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion> |
| 31 | + <FSharpCompilerServiceReleaseNotesVersion>$(FCSMajorVersion)-$(FCSMinorVersion)-$(FCSBuildVersion)</FSharpCompilerServiceReleaseNotesVersion> |
25 | 32 | <!-- The current published nuget package -->
|
26 | 33 | <FSharpCoreShippedPackageVersion>4.7.2</FSharpCoreShippedPackageVersion>
|
27 |
| - |
28 | 34 | <!-- The pattern for specifying the preview package -->
|
29 | 35 | <FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
|
| 36 | + <FSToolsMajorVersion>11</FSToolsMajorVersion> |
| 37 | + <FSToolsMinorVersion>$(FSMinorVersion)</FSToolsMinorVersion> |
| 38 | + <FSToolsBuildVersion>$(FSBuildVersion)</FSToolsBuildVersion> |
| 39 | + <FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion> |
| 40 | + <FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix> |
| 41 | + <FSProductVersionReleaseNotesVersion>$(FSToolsMajorVersion)-$(FSToolsMinorVersion)-$(FSToolsBuildVersion)</FSProductVersionReleaseNotesVersion> |
| 42 | + <FSProductVersion>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion).$(FSToolsRevisionVersion)</FSProductVersion> |
30 | 43 | </PropertyGroup>
|
31 |
| - |
32 |
| - <PropertyGroup> |
33 |
| - <FSPackageMajorVersion>11.0</FSPackageMajorVersion> |
34 |
| - <FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion> |
35 |
| - <FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix> |
36 |
| - <FSProductVersion>$(FSPackageVersion).0</FSProductVersion> |
37 |
| - </PropertyGroup> |
38 |
| - |
39 | 44 | <PropertyGroup>
|
40 | 45 | <VSMajorVersion>16</VSMajorVersion>
|
41 | 46 | <VSMinorVersion>7</VSMinorVersion>
|
42 | 47 | <VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
|
43 | 48 | <VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
|
44 | 49 | <VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
|
45 | 50 | </PropertyGroup>
|
46 |
| - |
47 | 51 | <!-- version number assignment -->
|
48 | 52 | <PropertyGroup>
|
49 | 53 | <VersionPrefix>$(FSCoreVersionPrefix)</VersionPrefix>
|
50 | 54 | <VersionPrefix Condition="'$(UseFSharpPackageVersion)' == 'true'">$(FSCorePackageVersion)</VersionPrefix>
|
51 | 55 | <VersionPrefix Condition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersionPrefix)</VersionPrefix>
|
52 | 56 | <VersionPrefix Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersionPrefix)</VersionPrefix>
|
53 |
| - <VersionPrefix Condition="'$(UseFSharpCompilerServiceVersion)' == 'true'">$(FSharpCompilerServiceVersion)</VersionPrefix> |
| 57 | + <VersionPrefix Condition="'$(UseFSharpCompilerServiceVersion)' == 'true'">$(FSharpCompilerServicePackageVersion)</VersionPrefix> |
54 | 58 | <AssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VersionPrefix).0</AssemblyVersion>
|
55 | 59 | <!-- PR builds should explicitly specify a version number -->
|
56 | 60 | </PropertyGroup>
|
|
0 commit comments