Nuget package + release notes (#10024)

* Nuget package + release notes * feedback
dotnet · Aug 27, 2020 · ef0df32 · ef0df32
1 parent 34a28f9
commit ef0df32
Show file tree

Hide file tree

Showing 8 changed files with 698 additions and 23 deletions.
diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets
@@ -116,4 +116,19 @@
     <Copy SourceFiles="@(CopyVsixResources)" DestinationFolder="$(IntermediateOutputPath)\resources\Resources" Condition="'$(IntermediateFilesHash)' != '$(IntermediateResourceFilesHash)'" />
   </Target>
 
+  <PropertyGroup>
+    <CoreBuildDependsOn>$(CoreBuildDependsOn);PrefixRepoToReleaseNotes</CoreBuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="PrefixRepoToReleaseNotes"
+          BeforeTargets="InitializeStandardNuspecProperties"
+          DependsOnTargets="InitializeSourceControlInformationFromSourceControlManager"
+          Condition="'$(IsPackable)'=='true'">
+
+    <PropertyGroup Condition="$(ScmRepositoryUrl.EndsWith('.git'))">
+        <_GitUrl>$([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), ".git$", ""))</_GitUrl>
+        <PackageReleaseNotes>$(_GitUrl)$(PackageReleaseNotes)</PackageReleaseNotes>
+    </PropertyGroup>
+  </Target>
+
 </Project>
diff --git a/FSharpTests.Directory.Build.targets b/FSharpTests.Directory.Build.targets
@@ -39,4 +39,5 @@
           <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
       </ItemGroup>
   </Target>
+
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -12,45 +12,49 @@
   <!-- Version number computation -->
   <PropertyGroup>
     <PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
-    <FSLanguageVersion>5.0</FSLanguageVersion>
-
-    <FSCoreMajorVersion>$(FSLanguageVersion)</FSCoreMajorVersion>
-    <FSCorePackageVersion>$(FSCoreMajorVersion).0</FSCorePackageVersion>
-    <FSCoreVersionPrefix>$(FSCoreMajorVersion).0</FSCoreVersionPrefix>
-    <FSCoreVersion>$(FSCoreVersionPrefix).0</FSCoreVersion>
-
-    <FSharpCompilerServicePrefix>37.0</FSharpCompilerServicePrefix>
-    <FSharpCompilerServiceVersion>$(FSharpCompilerServicePrefix).0</FSharpCompilerServiceVersion>
-
+    <FSMajorVersion>5</FSMajorVersion>
+    <FSMinorVersion>0</FSMinorVersion>
+    <FSBuildVersion>0</FSBuildVersion>
+    <FSRevisionVersion>0</FSRevisionVersion>
+    <FSLanguageVersion>$(FSMajorVersion).$(FSMinorVersion)</FSLanguageVersion>
+    <FSLanguageReleaseNotesVersion>$(FSMajorVersion)-$(FSMinorVersion)</FSLanguageReleaseNotesVersion>
+    <FSCoreProductVersion>$(FSMajorVersion).$(FSMinorVersion)</FSCoreProductVersion>
+    <FSCorePackageVersion>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCorePackageVersion>
+    <FSCoreReleaseNotesVersion>$(FSMajorVersion)-$(FSMinorVersion)-$(FSBuildVersion)</FSCoreReleaseNotesVersion>
+    <FSCoreVersionPrefix>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCoreVersionPrefix>
+    <FSCoreVersion>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion).$(FSRevisionVersion)</FSCoreVersion>
+    <FCSMajorVersion>37</FCSMajorVersion>
+    <FCSMinorVersion>$(FSMinorVersion)</FCSMinorVersion>
+    <FCSBuildVersion>$(FSBuildVersion)</FCSBuildVersion>
+    <FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion>
+    <FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion>
+    <FSharpCompilerServiceReleaseNotesVersion>$(FCSMajorVersion)-$(FCSMinorVersion)-$(FCSBuildVersion)</FSharpCompilerServiceReleaseNotesVersion>
     <!-- The current published nuget package -->
     <FSharpCoreShippedPackageVersion>4.7.2</FSharpCoreShippedPackageVersion>
-
     <!-- The pattern for specifying the preview package -->
     <FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
+    <FSToolsMajorVersion>11</FSToolsMajorVersion>
+    <FSToolsMinorVersion>$(FSMinorVersion)</FSToolsMinorVersion>
+    <FSToolsBuildVersion>$(FSBuildVersion)</FSToolsBuildVersion>
+    <FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion>
+    <FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>
+    <FSProductVersionReleaseNotesVersion>$(FSToolsMajorVersion)-$(FSToolsMinorVersion)-$(FSToolsBuildVersion)</FSProductVersionReleaseNotesVersion>
+    <FSProductVersion>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion).$(FSToolsRevisionVersion)</FSProductVersion>
   </PropertyGroup>
-
-  <PropertyGroup>
-    <FSPackageMajorVersion>11.0</FSPackageMajorVersion>
-    <FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
-    <FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
-    <FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
-  </PropertyGroup>
-
   <PropertyGroup>
     <VSMajorVersion>16</VSMajorVersion>
     <VSMinorVersion>7</VSMinorVersion>
     <VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
     <VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
     <VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
   </PropertyGroup>
-
   <!-- version number assignment -->
   <PropertyGroup>
     <VersionPrefix>$(FSCoreVersionPrefix)</VersionPrefix>
     <VersionPrefix Condition="'$(UseFSharpPackageVersion)' == 'true'">$(FSCorePackageVersion)</VersionPrefix>
     <VersionPrefix Condition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersionPrefix)</VersionPrefix>
     <VersionPrefix Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersionPrefix)</VersionPrefix>
-    <VersionPrefix Condition="'$(UseFSharpCompilerServiceVersion)' == 'true'">$(FSharpCompilerServiceVersion)</VersionPrefix>
+    <VersionPrefix Condition="'$(UseFSharpCompilerServiceVersion)' == 'true'">$(FSharpCompilerServicePackageVersion)</VersionPrefix>
     <AssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VersionPrefix).0</AssemblyVersion>
     <!-- PR builds should explicitly specify a version number -->
   </PropertyGroup>