Skip to content

Commit 97e3d99

Browse files
joelverhagenjoelverhagen
authored
Merge pull request #83 from NuGet/dev
Merge branch 'dev' into master
2 parents 0473427 + e9352c9 commit 97e3d99

16 files changed

Lines changed: 63 additions & 90 deletions

File tree

‎samples/NuGet.Server.V2.Samples.OwinHost/NuGet.Server.V2.Samples.OwinHost.csproj‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,11 @@
4141
<StartupObject>NuGet.Server.V2.Samples.OwinHost.Program</StartupObject>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45-
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
47-
<Private>True</Private>
44+
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45+
<HintPath>..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
4846
</Reference>
49-
<Reference Include="Microsoft.Data.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
52-
<Private>True</Private>
47+
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48+
<HintPath>..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
5349
</Reference>
5450
<Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5551
<SpecificVersion>False</SpecificVersion>
@@ -90,10 +86,8 @@
9086
<SpecificVersion>False</SpecificVersion>
9187
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
9288
</Reference>
93-
<Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
94-
<SpecificVersion>False</SpecificVersion>
95-
<HintPath>..\..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
96-
<Private>True</Private>
89+
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
90+
<HintPath>..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
9791
</Reference>
9892
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9993
<SpecificVersion>False</SpecificVersion>

‎samples/NuGet.Server.V2.Samples.OwinHost/app.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
</dependentAssembly>
1414
<dependentAssembly>
1515
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
16-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
16+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
1717
</dependentAssembly>
1818
<dependentAssembly>
1919
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
20-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
20+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
2121
</dependentAssembly>
2222
<dependentAssembly>
2323
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
24-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
24+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
2525
</dependentAssembly>
2626
<dependentAssembly>
2727
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

‎samples/NuGet.Server.V2.Samples.OwinHost/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<package id="Microsoft.AspNet.WebApi.OData" version="5.7.0" targetFramework="net45" />
77
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net45" />
88
<package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.3" targetFramework="net45" />
9-
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net45" />
10-
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net45" />
9+
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net46" />
10+
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net46" />
1111
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
1212
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
1313
<package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
1414
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
1515
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
1616
<package id="NuGet.Core" version="2.14.0" targetFramework="net46" />
1717
<package id="Owin" version="1.0" targetFramework="net45" />
18-
<package id="System.Spatial" version="5.7.0" targetFramework="net45" />
18+
<package id="System.Spatial" version="5.8.4" targetFramework="net46" />
1919
</packages>

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,11 @@
3636
<Prefer32Bit>false</Prefer32Bit>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
42-
<Private>True</Private>
39+
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40+
<HintPath>..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
4341
</Reference>
44-
<Reference Include="Microsoft.Data.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45-
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
47-
<Private>True</Private>
42+
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
4844
</Reference>
4945
<Reference Include="Microsoft.Web.XmlTransform">
5046
<HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
@@ -67,10 +63,8 @@
6763
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
6864
<Private>True</Private>
6965
</Reference>
70-
<Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
73-
<Private>True</Private>
66+
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67+
<HintPath>..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
7468
</Reference>
7569
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7670
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
<dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.3" />
2424
<dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.3" />
2525
<dependency id="Microsoft.AspNet.WebApi.OData" version="5.7.0" />
26-
<dependency id="Microsoft.Data.Edm" version="5.7.0" />
27-
<dependency id="Microsoft.Data.OData" version="5.7.0" />
28-
<dependency id="System.Spatial" version="5.7.0" />
26+
<dependency id="Microsoft.Data.Edm" version="5.8.4" />
27+
<dependency id="Microsoft.Data.OData" version="5.8.4" />
28+
<dependency id="System.Spatial" version="5.8.4" />
2929
</group>
3030
</dependencies>
3131
</metadata>

‎src/NuGet.Server.V2/app.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
19+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
2020
</dependentAssembly>
2121
<dependentAssembly>
2222
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
23-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
23+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
2424
</dependentAssembly>
2525
<dependentAssembly>
2626
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
27+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
2828
</dependentAssembly>
2929
</assemblyBinding>
3030
</runtime>

‎src/NuGet.Server.V2/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi.OData" version="5.7.0" targetFramework="net45" />
7-
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net45" />
8-
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net45" />
7+
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net46" />
8+
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net46" />
99
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
1010
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
1111
<package id="NuGet.Core" version="2.14.0" targetFramework="net46" />
12-
<package id="System.Spatial" version="5.7.0" targetFramework="net45" />
12+
<package id="System.Spatial" version="5.8.4" targetFramework="net46" />
1313
</packages>

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,11 @@
3131
</PropertyGroup>
3232
<ItemGroup>
3333
<Reference Include="Microsoft.CSharp" />
34-
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
35-
<SpecificVersion>False</SpecificVersion>
36-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
37-
<Private>True</Private>
34+
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
35+
<HintPath>..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
3836
</Reference>
39-
<Reference Include="Microsoft.Data.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
42-
<Private>True</Private>
37+
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
4339
</Reference>
4440
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4541
<SpecificVersion>False</SpecificVersion>
@@ -68,10 +64,8 @@
6864
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
6965
<Private>True</Private>
7066
</Reference>
71-
<Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72-
<SpecificVersion>False</SpecificVersion>
73-
<HintPath>..\..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
74-
<Private>True</Private>
67+
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
7569
</Reference>
7670
<Reference Include="System.Web" />
7771
<Reference Include="System.Configuration" />

‎src/NuGet.Server/Web.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,15 @@
143143
</dependentAssembly>
144144
<dependentAssembly>
145145
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
146-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
146+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
147147
</dependentAssembly>
148148
<dependentAssembly>
149149
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
150-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
150+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
151151
</dependentAssembly>
152152
<dependentAssembly>
153153
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
154-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
154+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
155155
</dependentAssembly>
156156
</assemblyBinding>
157157
</runtime>

‎src/NuGet.Server/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net46" />
77
<package id="Microsoft.AspNet.WebApi.OData" version="5.7.0" targetFramework="net46" />
88
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net46" />
9-
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net46" />
10-
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net46" />
9+
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net46" />
10+
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net46" />
1111
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
1212
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
1313
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
1414
<package id="NuGet.Core" version="2.14.0" targetFramework="net46" />
15-
<package id="System.Spatial" version="5.7.0" targetFramework="net46" />
15+
<package id="System.Spatial" version="5.8.4" targetFramework="net46" />
1616
<package id="WebActivatorEx" version="2.2.0" targetFramework="net46" />
1717
</packages>

0 commit comments

Comments
 (0)