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

Remove Xamarin placeholder for System.Memory package #29925

Merged
merged 3 commits into from
Jun 1, 2018
Merged

Remove Xamarin placeholder for System.Memory package #29925

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
5a6c5f7
Remove Xamarin placeholder for System.Memory package
tarekgh May 25, 2018
86f664f
Pump the package version
tarekgh May 25, 2018
eb49904
Update packageindex.json with the updated package version
tarekgh May 25, 2018
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
10 changes: 2 additions & 8 deletions pkg/Microsoft.Private.PackageBaseline/packageIndex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2408,17 +2408,11 @@
"System.Memory": {
"InboxOn": {
"netcoreapp2.1": "4.1.0.0",
"monoandroid10": "Any",
"monotouch10": "Any",
"uap10.0.16300": "4.1.0.0",
"xamarinios10": "Any",
"xamarinmac20": "Any",
"xamarintvos10": "Any",
"xamarinwatchos10": "Any"
"uap10.0.16300": "4.1.0.0"
},
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.4.0",
"4.0.1.0": "4.5.0"
"4.0.1.0": "4.5.1"
}
},
"System.Messaging": {
Expand Down
1 change: 1 addition & 0 deletions src/System.Memory/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.1.0</AssemblyVersion>
<PackageVersion>4.5.1</PackageVersion>
<!-- System.Memory has forwarded types into the runtime on netcoreapp/uap
It must win over assemblies versioned at 4.0.* -->
<AssemblyVersion Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap' ">4.1.0.0</AssemblyVersion>
Expand Down
1 change: 0 additions & 1 deletion src/System.Memory/pkg/System.Memory.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<SupportedFramework>net45;netcore45;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Memory.csproj" />
<InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
<InboxOnTargetFramework Include="netcoreapp2.1" />
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />
</ItemGroup>
Expand Down