Merge pull request #17834 from mmitche/stabilize

[release/3.0] Stabilize package versions
dotnet · Sep 14, 2019 · b403b17 · b403b17
2 parents f98574f + 3a36b62
commit b403b17
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -3,6 +3,11 @@
     <VersionPrefix>3.0.0</VersionPrefix>
     <PreReleaseVersionLabel>rc2</PreReleaseVersionLabel>
     <IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
+    <!--
+        When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
+    -->
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
+    <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
   </PropertyGroup>
   <PropertyGroup Label="Arcade settings">
     <!-- Opt-in to using the ref assembly version bundled with Arcade. -->

diff --git a/test/EFCore.Tests/ModelSourceTest.cs b/test/EFCore.Tests/ModelSourceTest.cs
@@ -145,6 +145,12 @@ public void Stores_model_version_information_as_annotation_on_model()
             var packageVersion = typeof(Context1).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
                 .Single(m => m.Key == "PackageVersion").Value;
 
+            var prereleaseIndex = packageVersion.IndexOf("-", StringComparison.Ordinal);
+            if (prereleaseIndex != -1)
+            {
+                packageVersion = packageVersion.Substring(0, prereleaseIndex);
+            }
+
             Assert.StartsWith(packageVersion, model.GetProductVersion(), StringComparison.OrdinalIgnoreCase);
         }