Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

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

Merged
merged 3 commits into from
Feb 20, 2019
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b04ac3
Bump S.S.C.Pkcs AssemblyVersion Minor version
bartonjs Feb 19, 2019
ad87c02
Fix packaging validation errors
bartonjs Feb 20, 2019
1f9dfef
Apply review feedback
bartonjs Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions pkg/Microsoft.Private.PackageBaseline/packageIndex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -5923,4 +5924,4 @@
"System.Xml.XDocument"
]
}
}
}
5 changes: 3 additions & 2 deletions src/System.Security.Cryptography.Pkcs/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<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>
<NetstandardAssemblyVersion>4.0.4.0</NetstandardAssemblyVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could have done <AssemblyVersion Condition="'$(TargetsNetStandard)' == 'true'">4.0.4.0</AssemblyVersion> here, depending on what makes the most sense to you.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding a comment here that says something like netstandard API surface is still 4.0.* since that is all that is supported by desktop.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, okay, I'll try that, since it reduces the places that can get it wrong.

<StrongNameKeyId>Microsoft</StrongNameKeyId>
</PropertyGroup>
</Project>
</Project>
1 change: 1 addition & 0 deletions src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<UsePackageTargetRuntimeDefaults Condition="'$(IsPartialFacadeAssembly)' != 'true'">true</UsePackageTargetRuntimeDefaults>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<NoWarn>$(NoWarn);CS1574;CS3016</NoWarn>
<AssemblyVersion Condition="'$(TargetsNetStandard)' == 'true'">$(NetstandardAssemblyVersion)</AssemblyVersion>
<Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release</Configurations>
</PropertyGroup>
<Import Project="$(CommonPath)\System\Security\Cryptography\Asn1\AsnXml.targets" />
Expand Down