Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit 724248e

Browse files
KevinRansomnosami
authored andcommitted
Nuget package + release notes (dotnet#10024)
* Nuget package + release notes * feedback
1 parent 556b3dc commit 724248e

File tree

8 files changed

+698
-23
lines changed

8 files changed

+698
-23
lines changed

FSharpBuild.Directory.Build.targets

+15
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,19 @@
116116
<Copy SourceFiles="@(CopyVsixResources)" DestinationFolder="$(IntermediateOutputPath)\resources\Resources" Condition="'$(IntermediateFilesHash)' != '$(IntermediateResourceFilesHash)'" />
117117
</Target>
118118

119+
<PropertyGroup>
120+
<CoreBuildDependsOn>$(CoreBuildDependsOn);PrefixRepoToReleaseNotes</CoreBuildDependsOn>
121+
</PropertyGroup>
122+
123+
<Target Name="PrefixRepoToReleaseNotes"
124+
BeforeTargets="InitializeStandardNuspecProperties"
125+
DependsOnTargets="InitializeSourceControlInformationFromSourceControlManager"
126+
Condition="'$(IsPackable)'=='true'">
127+
128+
<PropertyGroup Condition="$(ScmRepositoryUrl.EndsWith('.git'))">
129+
<_GitUrl>$([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), ".git$", ""))</_GitUrl>
130+
<PackageReleaseNotes>$(_GitUrl)$(PackageReleaseNotes)</PackageReleaseNotes>
131+
</PropertyGroup>
132+
</Target>
133+
119134
</Project>

FSharpTests.Directory.Build.targets

+1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@
3939
<_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
4040
</ItemGroup>
4141
</Target>
42+
4243
</Project>

eng/Versions.props

+25-21
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,49 @@
1212
<!-- Version number computation -->
1313
<PropertyGroup>
1414
<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>
2532
<!-- The current published nuget package -->
2633
<FSharpCoreShippedPackageVersion>4.7.2</FSharpCoreShippedPackageVersion>
27-
2834
<!-- The pattern for specifying the preview package -->
2935
<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>
3043
</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-
3944
<PropertyGroup>
4045
<VSMajorVersion>16</VSMajorVersion>
4146
<VSMinorVersion>7</VSMinorVersion>
4247
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
4348
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
4449
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
4550
</PropertyGroup>
46-
4751
<!-- version number assignment -->
4852
<PropertyGroup>
4953
<VersionPrefix>$(FSCoreVersionPrefix)</VersionPrefix>
5054
<VersionPrefix Condition="'$(UseFSharpPackageVersion)' == 'true'">$(FSCorePackageVersion)</VersionPrefix>
5155
<VersionPrefix Condition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersionPrefix)</VersionPrefix>
5256
<VersionPrefix Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersionPrefix)</VersionPrefix>
53-
<VersionPrefix Condition="'$(UseFSharpCompilerServiceVersion)' == 'true'">$(FSharpCompilerServiceVersion)</VersionPrefix>
57+
<VersionPrefix Condition="'$(UseFSharpCompilerServiceVersion)' == 'true'">$(FSharpCompilerServicePackageVersion)</VersionPrefix>
5458
<AssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VersionPrefix).0</AssemblyVersion>
5559
<!-- PR builds should explicitly specify a version number -->
5660
</PropertyGroup>

0 commit comments

Comments
 (0)