Packaging updates to service X509Certificates

Includes bumping the baseline version of the native shim, so the rebuilt package has a higher dependency version.
dotnet · Aug 14, 2017 · e13c1b0 · e13c1b0
1 parent 47d95a6
commit e13c1b0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/pkg/Microsoft.Private.PackageBaseline/baseline.packages.props b/pkg/Microsoft.Private.PackageBaseline/baseline.packages.props
@@ -421,7 +421,7 @@
       <Version>4.0.1</Version>
     </BaseLinePackage>
     <BaseLinePackage Include="runtime.native.System.Security.Cryptography">
-      <Version>4.0.0</Version>
+      <Version>4.0.2</Version>
     </BaseLinePackage>
     <BaseLinePackage Include="System.Private.DataContractSerialization">
       <Version>4.1.2</Version>

diff --git a/...y.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj b/...y.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Version>4.1.1</Version>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\ref\4.0\System.Security.Cryptography.X509Certificates.csproj">
       <SupportedFramework>net46</SupportedFramework>
@@ -21,4 +24,4 @@
   <ItemGroup>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
diff --git a/src/System.Security.Cryptography.X509Certificates/pkg/ValidationSuppression.txt b/src/System.Security.Cryptography.X509Certificates/pkg/ValidationSuppression.txt
@@ -0,0 +1,6 @@
+// The netfx facades have their versions locked, but we should
+// permit the netcoreapp implementations to use a higher runtime assembly
+// version than the ref assembly.
+// The refs shouldn't get bumped because that could push the 1.0 assembly to
+// a higher version than the 1.1 assembly.
+PermitHigherCompatibleImplementationVersion
diff --git a/...ty.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/...ty.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
@@ -10,8 +10,9 @@
     <ProjectGuid>{6F8576C2-6CD0-4DF3-8394-00B002D82E40}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>System.Security.Cryptography.X509Certificates</AssemblyName>
-    <AssemblyVersion>4.1.0.0</AssemblyVersion>
+    <AssemblyVersion>4.1.0.1</AssemblyVersion>
     <AssemblyVersion Condition="'$(TargetGroup)'=='net46'">4.0.0.0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(TargetGroup)'=='net461'">4.1.0.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLSCompliant>false</CLSCompliant>
     <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.6</PackageTargetFramework>

diff --git a/src/packages.builds b/src/packages.builds
@@ -30,6 +30,9 @@
     <Project Include="..\pkg\Microsoft.NETCore.Targets\Microsoft.NETCore.Targets.builds">
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
+    <Project Include="System.Security.Cryptography.X509Certificates\pkg\System.Security.Cryptography.X509Certificates.builds">
+      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
+    </Project>
   </ItemGroup>
 
   <ItemGroup Condition="'$(BuildAllPackages)' == 'false' AND '$(SkipNativePackageBuild)' != 'true'" >