Bump S.S.C.Pkcs AssemblyVersion Minor version (#35429)

* Bump S.S.C.Pkcs AssemblyVersion Minor version

New API was added for .NET Core 3.0, so the assembly minor needs to bump.

* Fix packaging validation errors

* Apply review feedback

Author: bartonjs

pkg/Microsoft.Private.PackageBaseline/packageIndex.json

@@ -222,12 +222,6 @@
         "10.0.4.0": "10.4.0"
       }
     },
-    "Microsoft.VisualBasic.Core": {
-      "InboxOn": {
-          "netcoreapp3.0": "10.0.4.0",
-          "uap10.0.16300": "10.0.4.0"
-      }
-    },
     "Microsoft.VisualBasic.Compatibility": {
       "InboxOn": {
         "net45": "10.0.0.0"
@@ -238,6 +232,12 @@
         "net45": "10.0.0.0"
       }
     },
+    "Microsoft.VisualBasic.Core": {
+      "InboxOn": {
+        "netcoreapp3.0": "10.0.4.0",
+        "uap10.0.16300": "10.0.4.0"
+      }
+    },
     "Microsoft.VisualC": {
       "InboxOn": {
         "net45": "10.0.0.0"
@@ -499,6 +499,10 @@
       "BaselineVersion": "4.5.0",
       "InboxOn": {}
     },
+    "runtime.native.System.IO.Ports": {
+      "BaselineVersion": "4.6.0",
+      "InboxOn": {}
+    },
     "runtime.win7-x64.runtime.native.System.Data.SqlClient.sni": {
       "StableVersions": [
         "4.0.1",
@@ -2321,10 +2325,6 @@
         "4.0.2.0": "4.6.0"
       }
     },
-    "runtime.native.System.IO.Ports": {
-      "InboxOn": {},
-      "BaselineVersion": "4.6.0"
-    },
     "System.IO.UnmanagedMemoryStream": {
       "StableVersions": [
         "4.0.0",
@@ -4415,7 +4415,8 @@
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
         "4.0.3.0": "4.5.0",
-        "4.0.4.0": "4.6.0"
+        "4.0.4.0": "4.6.0",
+        "4.1.0.0": "4.6.0"
       }
     },
     "System.Security.Cryptography.Primitives": {
@@ -5923,4 +5924,4 @@
       "System.Xml.XDocument"
     ]
   }
-}
+}

src/System.Security.Cryptography.Pkcs/Directory.Build.props

@@ -2,7 +2,9 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
+    <AssemblyVersion>4.1.0.0</AssemblyVersion>
+    <!-- Currently the netstandard build is locked to the netfx API -->
+    <AssemblyVersion Condition="'$(TargetsNetStandard)' == 'true'">4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
   </PropertyGroup>
-</Project>
+</Project>