Skip to content

Commit 97d568b

Browse files
joelverhagenjoelverhagen
authored
Use Microsoft.Data.Services instead of System.Data.Services (#35)
* Switch to Microsoft.Data.Services (instead of System.Data.Services) * Get semVerLevel from the current data source (so that you don't have to do semVerLevel='2.0.0') * Fix NuGet/NuGetGallery#3578
1 parent 9b439f2 commit 97d568b

6 files changed

Lines changed: 57 additions & 12 deletions

File tree

‎src/NuGet.Server/DataServices/Packages.svc.cs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,10 @@ public IQueryable<ODataPackage> Search(
127127
string searchTerm,
128128
string targetFramework,
129129
bool includePrerelease,
130-
bool? includeDelisted,
131-
string semVerLevel)
130+
bool? includeDelisted)
132131
{
133132
var targetFrameworks = string.IsNullOrEmpty(targetFramework) ? Enumerable.Empty<string>() : targetFramework.Split('|');
134-
var clientCompatibility = ClientCompatibilityFactory.FromProperties(semVerLevel);
133+
var clientCompatibility = CurrentDataSource.ClientCompatibility;
135134

136135
return Repository
137136
.Search(
@@ -145,9 +144,9 @@ public IQueryable<ODataPackage> Search(
145144
}
146145

147146
[WebGet]
148-
public IQueryable<ODataPackage> FindPackagesById(string id, string semVerLevel)
147+
public IQueryable<ODataPackage> FindPackagesById(string id)
149148
{
150-
var clientCompatibility = ClientCompatibilityFactory.FromProperties(semVerLevel);
149+
var clientCompatibility = CurrentDataSource.ClientCompatibility;
151150

152151
return Repository
153152
.FindPackagesById(id, clientCompatibility)
@@ -164,8 +163,7 @@ public IQueryable<ODataPackage> GetUpdates(
164163
bool includePrerelease,
165164
bool includeAllVersions,
166165
string targetFrameworks,
167-
string versionConstraints,
168-
string semVerLevel)
166+
string versionConstraints)
169167
{
170168
if (String.IsNullOrEmpty(packageIds) || String.IsNullOrEmpty(versions))
171169
{
@@ -201,7 +199,7 @@ public IQueryable<ODataPackage> GetUpdates(
201199
}
202200
}
203201

204-
var clientCompatibility = ClientCompatibilityFactory.FromProperties(semVerLevel);
202+
var clientCompatibility = CurrentDataSource.ClientCompatibility;
205203

206204
return Repository
207205
.GetUpdatesCore(

‎src/NuGet.Server/NuGet.Server.csproj‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,22 @@
3030
</PropertyGroup>
3131
<ItemGroup>
3232
<Reference Include="Microsoft.CSharp" />
33+
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
34+
<HintPath>..\..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
35+
<Private>True</Private>
36+
</Reference>
37+
<Reference Include="Microsoft.Data.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
39+
<Private>True</Private>
40+
</Reference>
41+
<Reference Include="Microsoft.Data.Services, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\Microsoft.Data.Services.5.7.0\lib\net40\Microsoft.Data.Services.dll</HintPath>
43+
<Private>True</Private>
44+
</Reference>
45+
<Reference Include="Microsoft.Data.Services.Client, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.7.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
47+
<Private>True</Private>
48+
</Reference>
3349
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3450
<SpecificVersion>False</SpecificVersion>
3551
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
@@ -57,11 +73,13 @@
5773
<Reference Include="System" />
5874
<Reference Include="System.ComponentModel.DataAnnotations" />
5975
<Reference Include="System.Data.DataSetExtensions" />
60-
<Reference Include="System.Data.Services" />
61-
<Reference Include="System.Data.Services.Client" />
6276
<Reference Include="System.ServiceModel" />
6377
<Reference Include="System.ServiceModel.Activation" />
6478
<Reference Include="System.ServiceModel.Web" />
79+
<Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<HintPath>..\..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
81+
<Private>True</Private>
82+
</Reference>
6583
<Reference Include="System.Web" />
6684
<Reference Include="System.Configuration" />
6785
<Reference Include="System.Web.ApplicationServices" />

‎src/NuGet.Server/NuGet.Server.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<frameworkAssembly assemblyName="System.ServiceModel" targetFramework="net46" />
1414
<frameworkAssembly assemblyName="System.ServiceModel.Web" targetFramework="net46" />
1515
<frameworkAssembly assemblyName="System.ServiceModel.Activation" targetFramework="net46" />
16-
<frameworkAssembly assemblyName="System.Data.Services" targetFramework="net46" />
1716
</frameworkAssemblies>
1817
<dependencies>
1918
<group targetFramework="net46">
@@ -22,6 +21,7 @@
2221
<dependency id="Newtonsoft.Json" version="8.0.3" />
2322
<dependency id="RouteMagic" version="1.3.0" />
2423
<dependency id="WebActivatorEx" version="2.1.0" />
24+
<dependency id="Microsoft.Data.Services" version="5.7.0" />
2525
</group>
2626
</dependencies>
2727
</metadata>

‎src/NuGet.Server/packages.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net46" />
4+
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net46" />
5+
<package id="Microsoft.Data.Services" version="5.7.0" targetFramework="net46" />
6+
<package id="Microsoft.Data.Services.Client" version="5.7.0" targetFramework="net46" />
37
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
48
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
59
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
610
<package id="NuGet.Core" version="2.14.0" targetFramework="net46" />
711
<package id="RouteMagic" version="1.3" targetFramework="net46" />
12+
<package id="System.Spatial" version="5.7.0" targetFramework="net46" />
813
<package id="WebActivatorEx" version="2.1.0" targetFramework="net46" />
914
</packages>

‎test/NuGet.Server.Tests/NuGet.Server.Tests.csproj‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,22 @@
2626
<HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
2727
<Private>True</Private>
2828
</Reference>
29+
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
30+
<HintPath>..\..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
31+
<Private>True</Private>
32+
</Reference>
33+
<Reference Include="Microsoft.Data.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
34+
<HintPath>..\..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
35+
<Private>True</Private>
36+
</Reference>
37+
<Reference Include="Microsoft.Data.Services, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\Microsoft.Data.Services.5.7.0\lib\net40\Microsoft.Data.Services.dll</HintPath>
39+
<Private>True</Private>
40+
</Reference>
41+
<Reference Include="Microsoft.Data.Services.Client, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.7.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
43+
<Private>True</Private>
44+
</Reference>
2945
<Reference Include="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
3046
<SpecificVersion>False</SpecificVersion>
3147
<HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
@@ -49,10 +65,13 @@
4965
<Reference Include="System.Core">
5066
<RequiredTargetFramework>3.5</RequiredTargetFramework>
5167
</Reference>
52-
<Reference Include="System.Data.Services" />
5368
<Reference Include="System.IO.Compression" />
5469
<Reference Include="System.ServiceModel" />
5570
<Reference Include="System.ServiceModel.Web" />
71+
<Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<HintPath>..\..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
73+
<Private>True</Private>
74+
</Reference>
5675
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
5776
<SpecificVersion>False</SpecificVersion>
5877
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>

‎test/NuGet.Server.Tests/packages.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Castle.Core" version="3.3.3" targetFramework="net46" />
4+
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net46" />
5+
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net46" />
6+
<package id="Microsoft.Data.Services" version="5.7.0" targetFramework="net46" />
7+
<package id="Microsoft.Data.Services.Client" version="5.7.0" targetFramework="net46" />
48
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
59
<package id="Moq" version="4.5.8" targetFramework="net46" />
610
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
711
<package id="NuGet.Core" version="2.14.0" targetFramework="net46" />
12+
<package id="System.Spatial" version="5.7.0" targetFramework="net46" />
813
<package id="xunit" version="2.1.0" targetFramework="net46" />
914
<package id="xunit.abstractions" version="2.0.0" targetFramework="net46" />
1015
<package id="xunit.assert" version="2.1.0" targetFramework="net46" />

0 commit comments

Comments
 (0)