Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dependency version & packageVersion in runtime.native.system.io.ports #47732

Merged
merged 3 commits into from
Feb 11, 2021
Merged

Fix dependency version & packageVersion in runtime.native.system.io.ports #47732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c70741
fix the dependencies version in native.system.io.ports
Anipik Feb 2, 2021
ae0a7ef
publish new verison of system.io.ports
Anipik Feb 4, 2021
f4904e9
Merge branch 'release/5.0' into ports
Anipik Feb 10, 2021
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
1 change: 1 addition & 0 deletions src/libraries/System.IO.Ports/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
<StrongNameKeyId>Open</StrongNameKeyId>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
<PackageVersion>5.0.1</PackageVersion>
</PropertyGroup>
</Project>
4 changes: 3 additions & 1 deletion src/libraries/libraries-packages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
<ProjectReference Include="$(PkgDir)*\*.proj" Exclude="$(PkgDir)test\*" Condition="'$(BuildAllOOBPackages)' == 'true'" />
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\**\*.pkgproj" Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true') And '$(BuildAllOOBPackages)' == 'true'" />
<!-- If setting BuildAllOOBPackages to false, add bellow the individual OOB packages you want to continue to build -->
<!-- This is merge marker 1 to help automerge -->
<ProjectReference Include="$(PkgDir)runtime.native.System.IO.Ports\runtime.native.System.IO.Ports.proj" />
<ProjectReference Include="$(LibrariesProjectRoot)\System.IO.Ports\pkg\System.IO.Ports.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<!-- This is merge marker 1 to help automerge -->
<!-- This is merge marker 2 to help automerge -->
<!-- This is merge marker 3 to help automerge -->
<!-- This is merge marker 4 to help automerge -->
Expand Down
41 changes: 36 additions & 5 deletions src/libraries/pkg/baseline/packageIndex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,17 +1508,47 @@
"4.3.0",
"4.4.0",
"4.5.0",
"4.6.0"
"4.6.0",
"4.7.0"
],
"BaselineVersion": "5.0.0",
"InboxOn": {}
},
"runtime.linux-arm.runtime.native.System.IO.Ports": {
"StableVersions": [
"4.7.0",
"5.0.0"
],
"InboxOn": {}
},
"runtime.linux-arm64.runtime.native.System.IO.Ports": {
"StableVersions": [
"4.7.0",
"5.0.0"
],
"InboxOn": {}
},
"runtime.linux-x64.runtime.native.System.IO.Ports": {
"StableVersions": [
"4.7.0",
"5.0.0"
],
"InboxOn": {}
},
"runtime.osx-x64.runtime.native.System.IO.Ports": {
Copy link
Member

Choose a reason for hiding this comment

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

What happens if we add new rids, do we have to be adding more entries here? I don't know if there is a better way long term. For 5.0.0 fix, it seems good as is, but maybe we can come with a better way long term.

Copy link
Member

@ericstj ericstj Feb 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

In 6.0 the package index will hopefully go away.

"StableVersions": [
"4.7.0",
"5.0.0"
],
"InboxOn": {}
},
"runtime.native.System.IO.Ports": {
"StableVersions": [
"4.6.0",
"5.0.0"
"5.0.0",
"5.0.1"
],
"BaselineVersion": "5.0.0",
"BaselineVersion": "5.0.1",
"InboxOn": {}
},
"SMDiagnostics": {
Expand Down Expand Up @@ -3521,9 +3551,10 @@
"4.4.0",
"4.5.0",
"4.6.0",
"5.0.0"
"5.0.0",
"5.0.1"
],
"BaselineVersion": "5.0.0",
"BaselineVersion": "5.0.1",
"InboxOn": {
"uap10.0.16299": "4.0.1.0"
},
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackageVersion Condition="'$(PackageTargetRuntime)' == ''">5.0.1</PackageVersion>
</PropertyGroup>
<ItemGroup Condition="'$(PackageTargetRuntime)' == 'linux-arm' or '$(PackageTargetRuntime)' == 'linux-arm64' or '$(PackageTargetRuntime)' == 'linux-x64' or '$(PackageTargetRuntime)' == 'osx-x64' or '$(PackageTargetRuntime)' == 'freebsd-x64'">
<File Include="$(NativeBinDir)$(LibraryFilePrefix)System.IO.Ports.Native$(LibraryFileExtension)" >
Expand All @@ -11,7 +12,7 @@
</ItemGroup>
<ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
<_buildRIDWithMetadata Include="@(BuildRID)">
<Version>$(PackageVersion)</Version>
<Version>5.0.0</Version>
</_buildRIDWithMetadata>
<IndexedDependency Include="@(_buildRIDWithMetadata->'runtime.%(Identity).$(Id)')" />
</ItemGroup>
Expand Down