Bumping the version of OOB packages to match product version (dotnet/corefx#41623)

* update package version for oob packages as well

* ServiceVersion -> PatchVersion

Commit migrated from https://github.com/dotnet/corefx/commit/4e0541e71d7ff69aaebccd28ca8b6b7dba9e76ee

diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props
index feda0b1..e849305 100644 (file)
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>2.3.0</PackageVersion>
     <AssemblyVersion>2.0.2.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>

diff --git a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
index 8b06325..0e43443 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
+++ b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
@@ -1,7 +1,8 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>10.6.0</PackageVersion>
+    <MajorVersion>$([MSBuild]::Add($(MajorVersion), 6))</MajorVersion>
+    <PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
     <AssemblyVersion>10.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>

diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props b/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
index 545d69b..50d2821 100644 (file)
--- a/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>2.3.0</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyFileVersion>$(AssemblyVersion)</AssemblyFileVersion>

diff --git a/src/libraries/System.Collections.Immutable/Directory.Build.props b/src/libraries/System.Collections.Immutable/Directory.Build.props
index ed1e4b9..a8569f9 100644 (file)
--- a/src/libraries/System.Collections.Immutable/Directory.Build.props
+++ b/src/libraries/System.Collections.Immutable/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>1.8.0</PackageVersion>
     <AssemblyVersion>1.2.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>

diff --git a/src/libraries/System.Composition/Directory.Build.props b/src/libraries/System.Composition/Directory.Build.props
index 1a8f01b..8e5e47f 100644 (file)
--- a/src/libraries/System.Composition/Directory.Build.props
+++ b/src/libraries/System.Composition/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>1.5.0</PackageVersion>
     <AssemblyVersion>1.0.34.0</AssemblyVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.Numerics.Tensors/Directory.Build.props b/src/libraries/System.Numerics.Tensors/Directory.Build.props
index aacaa60..3a570b1 100644 (file)
--- a/src/libraries/System.Numerics.Tensors/Directory.Build.props
+++ b/src/libraries/System.Numerics.Tensors/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>0.4.0</PackageVersion>
     <AssemblyVersion>0.2.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <!-- This is a preview package. Do not mark as stable. -->

diff --git a/src/libraries/System.Reflection.Metadata/Directory.Build.props b/src/libraries/System.Reflection.Metadata/Directory.Build.props
index ac89a3d..7750549 100644 (file)
--- a/src/libraries/System.Reflection.Metadata/Directory.Build.props
+++ b/src/libraries/System.Reflection.Metadata/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>1.9.0</PackageVersion>
     <AssemblyVersion>1.4.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>

diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 68d87b3..d942d3c 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -123,7 +123,7 @@
         "2.0.1",
         "2.1.0"
       ],
-      "BaselineVersion": "2.3.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "2.0.0.0": "2.0.0",
@@ -264,7 +264,7 @@
       }
     },
     "Microsoft.VisualBasic.Core": {
-      "BaselineVersion": "10.6.0",
+      "BaselineVersion": "11.0.0",
       "InboxOn": {
         "netcoreapp3.0": "10.0.4.0",
         "uap10.0.16300": "10.0.4.0"
@@ -367,7 +367,7 @@
         "2.0.0",
         "2.1.0"
       ],
-      "BaselineVersion": "2.3.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "1.0.0.0": "1.0.0",
@@ -769,7 +769,7 @@
         "1.5.0",
         "1.6.0"
       ],
-      "BaselineVersion": "1.8.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "1.2.2.0",
         "netcoreapp2.1": "1.2.3.0",
@@ -1068,7 +1068,7 @@
         "1.2.0",
         "1.3.0"
       ],
-      "BaselineVersion": "1.5.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {}
     },
     "System.Composition.AttributedModel": {
@@ -3250,7 +3250,7 @@
       "StableVersions": [
         "0.1.0"
       ],
-      "BaselineVersion": "0.4.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "0.1.0.0": "0.1.0",
@@ -3630,7 +3630,7 @@
         "1.6.0",
         "1.7.0"
       ],
-      "BaselineVersion": "1.9.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "1.4.2.0",
         "netcoreapp2.1": "1.4.3.0",