Skip to content

Commit 9be6b67

Browse files
huangpfhuangpf
committed
Merge pull request #67 from Azure/dev
.
2 parents 192b8fe + 82b2714 commit 9be6b67

File tree

266 files changed

+14976
-6271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+14976
-6271
lines changed

‎ChangeLog.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@
162162
* New-AzureVirtualNetworkGateway parameter changes
163163
* Removed command Resize-AzureVirtualNetworkGateway
164164
* Reset-AzureVirtualNetworkGatewayConnection renamed to Set-AzureVirtualNetworkGatewayConnection8
165+
* Azure Storage changes
166+
* Fix the bug on aliases Get-AzureStorageContainerAcl, Start-CopyAzureStorageBlob and Stop-CopyAzureStorageBlob
165167
* Azure RedisCache cmdlets
166168
* Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
167169
* New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513

‎setup/azurecmdfiles.wxi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,9 +1389,6 @@
13891389
<Component Id="cmp5CEBB63124C5833CCFA24A6D28E11CC9" Guid="*">
13901390
<File Id="filDB364E77519F6ACAA5B9CE685AB1AFB4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.WindowsAzure.Storage.dll" />
13911391
</Component>
1392-
<Component Id="cmpF5AF8CEC5E3C01F32D02BF852FD840AC" Guid="*">
1393-
<File Id="fil3E19CAF38E35341A8646C8D13141B4E5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Newtonsoft.Json.dll" />
1394-
</Component>
13951392
<Component Id="cmp5D4BF2AFED5DA226237313E9C2F8099B" Guid="*">
13961393
<File Id="filC27FF716D5D45BE809FDF4A013ED221B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\System.Net.Http.Formatting.dll" />
13971394
</Component>
@@ -5392,7 +5389,6 @@
53925389
<ComponentRef Id="cmp209CCEE0DCF9E72717C6DEDE4C8984E1" />
53935390
<ComponentRef Id="cmp7BECB13532E43A81AFC0959E29FF1F56" />
53945391
<ComponentRef Id="cmp5CEBB63124C5833CCFA24A6D28E11CC9" />
5395-
<ComponentRef Id="cmpF5AF8CEC5E3C01F32D02BF852FD840AC" />
53965392
<ComponentRef Id="cmp5D4BF2AFED5DA226237313E9C2F8099B" />
53975393
<ComponentRef Id="cmp0BBA12BCAEC94783EC690D768E1A9476" />
53985394
<ComponentRef Id="cmp704145D9362A78B6368BC991ADFDDD72" />

‎src/Common/Commands.Common.Storage/AzureStorageContext.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
16-
using Microsoft.WindowsAzure.Commands.Common.Storage.Properties;
17-
using Microsoft.WindowsAzure.Storage;
18-
1915
namespace Microsoft.WindowsAzure.Commands.Common.Storage
2016
{
17+
using System;
18+
using Microsoft.WindowsAzure.Commands.Common.Storage.Properties;
19+
using Microsoft.WindowsAzure.Storage;
20+
2121
/// <summary>
2222
/// Storage context
2323
/// </summary>

‎src/Common/Commands.Common.Storage/BlobUploadParameters.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using Microsoft.WindowsAzure.Storage.Blob;
16-
1715
namespace Microsoft.WindowsAzure.Commands.Common.Storage
1816
{
17+
using Microsoft.WindowsAzure.Storage.Blob;
18+
1919
public class BlobUploadParameters
2020
{
2121
public string StorageName {get; set;}

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,17 @@
6767
<Reference Include="Microsoft.Azure.ResourceManager">
6868
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6969
</Reference>
70-
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
70+
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<SpecificVersion>False</SpecificVersion>
72+
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
7273
</Reference>
73-
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
74+
<Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<SpecificVersion>False</SpecificVersion>
76+
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
7577
</Reference>
76-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
78+
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79+
<SpecificVersion>False</SpecificVersion>
80+
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
7881
</Reference>
7982
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8083
<SpecificVersion>False</SpecificVersion>
@@ -96,8 +99,9 @@
9699
<SpecificVersion>False</SpecificVersion>
97100
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
98101
</Reference>
99-
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100-
<HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
102+
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103+
<SpecificVersion>False</SpecificVersion>
104+
<HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
101105
</Reference>
102106
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103107
<SpecificVersion>False</SpecificVersion>
@@ -106,13 +110,13 @@
106110
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
107111
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
108112
</Reference>
109-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110114
<SpecificVersion>False</SpecificVersion>
111-
<HintPath>..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
115+
<HintPath>..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
112116
</Reference>
113-
<Reference Include="Newtonsoft.Json">
114-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
115-
<Private>True</Private>
117+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
118+
<SpecificVersion>False</SpecificVersion>
119+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
116120
</Reference>
117121
<Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118122
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.2.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
@@ -137,8 +141,9 @@
137141
</Reference>
138142
<Reference Include="System.Net.Http.WebRequest" />
139143
<Reference Include="System.Runtime.Serialization" />
140-
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
141-
<HintPath>..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
144+
<Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
145+
<SpecificVersion>False</SpecificVersion>
146+
<HintPath>..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
142147
</Reference>
143148
<Reference Include="System.Xml.Linq" />
144149
<Reference Include="System.Data.DataSetExtensions" />
@@ -182,4 +187,4 @@
182187
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
183188
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
184189
</Target>
185-
</Project>
190+
</Project>

‎src/Common/Commands.Common.Storage/IStorageClientWrapper.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
16-
using System;
17-
1815
namespace Microsoft.WindowsAzure.Commands.Common.Storage
1916
{
17+
using System;
18+
2019
public interface IStorageClientWrapper
2120
{
2221
void DeletePackageFromBlob(

‎src/Common/Commands.Common.Storage/StorageClientWrapper.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
16-
using System.Globalization;
17-
using System.IO;
18-
using Microsoft.WindowsAzure.Commands.Utilities.Common;
19-
using Microsoft.WindowsAzure.Management.Storage;
20-
using Microsoft.WindowsAzure.Management.Storage.Models;
21-
using Microsoft.WindowsAzure.Storage;
22-
using Microsoft.WindowsAzure.Storage.Auth;
23-
using Microsoft.WindowsAzure.Storage.Blob;
24-
2515
namespace Microsoft.WindowsAzure.Commands.Common.Storage
2616
{
17+
using System;
18+
using System.Globalization;
19+
using System.IO;
20+
using Microsoft.WindowsAzure.Commands.Utilities.Common;
21+
using Microsoft.WindowsAzure.Management.Storage;
22+
using Microsoft.WindowsAzure.Management.Storage.Models;
23+
using Microsoft.WindowsAzure.Storage;
24+
using Microsoft.WindowsAzure.Storage.Auth;
25+
using Microsoft.WindowsAzure.Storage.Blob;
26+
2727
/// <summary>
2828
/// Wrapper class that encapsulates Blob functionality from the StorageClient API
2929
/// </summary>

‎src/Common/Commands.Common.Storage/StorageUtilities.cs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
using System;
2-
using Microsoft.WindowsAzure.Commands.Utilities.Common;
3-
using Microsoft.WindowsAzure.Management.Storage;
4-
using Microsoft.WindowsAzure.Storage;
5-
using Microsoft.WindowsAzure.Storage.Auth;
6-
using Microsoft.WindowsAzure.Storage.Blob;
7-
using Microsoft.WindowsAzure.Storage.Table;
8-
1+

92
namespace Microsoft.WindowsAzure.Commands.Common.Storage
103
{
4+
using System;
5+
using Microsoft.WindowsAzure.Commands.Utilities.Common;
6+
using Microsoft.WindowsAzure.Management.Storage;
7+
using Microsoft.WindowsAzure.Storage;
8+
using Microsoft.WindowsAzure.Storage.Auth;
9+
using Microsoft.WindowsAzure.Storage.Blob;
10+
using Microsoft.WindowsAzure.Storage.Table;
11+
1112
public class StorageUtilities
1213
{
1314
public static CloudStorageAccount GenerateCloudStorageAccount(StorageManagementClient storageClient, string accountName)

‎src/Common/Commands.Common.Storage/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
99
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
11-
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
12-
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
13-
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
11+
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
12+
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
13+
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
1414
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1515
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
1616
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
1717
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
21-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
22-
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
23-
<package id="WindowsAzure.Storage" version="4.0.0" targetFramework="net45" />
24-
</packages>
21+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
22+
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
23+
<package id="WindowsAzure.Storage" version="5.0.0" targetFramework="net45" />
24+
</packages>

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,17 @@
7070
<HintPath>..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5687.28567-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
73-
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
73+
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74+
<SpecificVersion>False</SpecificVersion>
75+
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
7576
</Reference>
76-
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
77+
<Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<SpecificVersion>False</SpecificVersion>
79+
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
7880
</Reference>
79-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
81+
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
82+
<SpecificVersion>False</SpecificVersion>
83+
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
8184
</Reference>
8285
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
8386
<SpecificVersion>False</SpecificVersion>
@@ -108,8 +111,8 @@
108111
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
109112
</Reference>
110113
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
111-
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112-
<HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
114+
<Reference Include="Microsoft.WindowsAzure.Configuration">
115+
<HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
113116
</Reference>
114117
<Reference Include="Microsoft.WindowsAzure.Management">
115118
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
@@ -120,17 +123,15 @@
120123
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
121124
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
122125
</Reference>
123-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124-
<SpecificVersion>False</SpecificVersion>
125-
<HintPath>..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
126+
<Reference Include="Microsoft.WindowsAzure.Storage">
127+
<HintPath>..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
126128
</Reference>
127129
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
128130
<SpecificVersion>False</SpecificVersion>
129131
<HintPath>..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
130132
</Reference>
131133
<Reference Include="Newtonsoft.Json">
132-
<SpecificVersion>False</SpecificVersion>
133-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
134+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
134135
</Reference>
135136
<Reference Include="System" />
136137
<Reference Include="System.Core" />
@@ -149,8 +150,9 @@
149150
</Reference>
150151
<Reference Include="System.Net.Http.WebRequest" />
151152
<Reference Include="System.Runtime.Serialization" />
152-
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
153-
<HintPath>..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
153+
<Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
154+
<SpecificVersion>False</SpecificVersion>
155+
<HintPath>..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
154156
</Reference>
155157
<Reference Include="System.Xml.Linq" />
156158
<Reference Include="System.Data.DataSetExtensions" />
@@ -312,4 +314,4 @@
312314
</PropertyGroup>
313315
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
314316
</Target>
315-
</Project>
317+
</Project>

0 commit comments

Comments
 (0)