Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 08c416f

Browse files
authored
Merge pull request #75 from wastore/dev
[.Net][Desktop] Retarget and Update Nuspec TFM to net45
2 parents 24f01ae + 4ccf674 commit 08c416f

12 files changed

+47
-47
lines changed

BreakingChanges.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Tracking Breaking Changes since 7.0
22

3-
- All: (Desktop) Updated the desktop library to target .Net 4.5.2.
3+
- All: (Desktop) Updated the desktop library to target .Net 4.5.0
44
- Queues: Add Message now modifies the PopReceipt, Id, NextVisibleTime, InsertionTime, and ExpirationTime properties of its CloudQueueMessage parameter. The message can then be passed to the UpdateMessage and DeleteMessage APIs.
55
- Blobs/Files: Populate content MD5 for range gets on Blobs and Files.
66
- Blobs: BlobContainerPublicAccess enum has a new value "Unknown".

Lib/WindowsDesktop/Microsoft.WindowsAzure.Storage.Desktop.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Microsoft.WindowsAzure.Storage</RootNamespace>
1111
<AssemblyName>Microsoft.WindowsAzure.Storage</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile>
1515
</TargetFrameworkProfile>

Lib/WindowsDesktop/WindowsAzure.Storage.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency id="System.Spatial" version="5.7.0" />
3131
<dependency id="Newtonsoft.Json" version="9.0.1" />
3232
</group>
33-
<group targetFramework=".netframework4.5.2">
33+
<group targetFramework=".netframework4.5">
3434
<dependency id="Microsoft.Data.OData" version="5.7.0" />
3535
<dependency id="Newtonsoft.Json" version="6.0.8" />
3636
<dependency id="Microsoft.Data.Services.Client" version="5.7.0" />

Lib/WindowsDesktop/packages.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net452" />
4-
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net452" />
5-
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net452" />
6-
<package id="Microsoft.Data.Services.Client" version="5.7.0" targetFramework="net452" />
7-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
8-
<package id="System.Spatial" version="5.7.0" targetFramework="net452" />
3+
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
4+
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net45" />
5+
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net45" />
6+
<package id="Microsoft.Data.Services.Client" version="5.7.0" targetFramework="net45" />
7+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
8+
<package id="System.Spatial" version="5.7.0" targetFramework="net45" />
99
</packages>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ For the best development experience, developers should use the official Microsof
3131

3232
## Target Frameworks
3333

34-
- .NET Framework 4.5.2: As of December 2016, Storage Client Libraries for .NET supports primarily the desktop .NET Framework 4.5.2 release and above.
34+
- .NET Framework 4.5.0: As of December 2016, Storage Client Libraries for .NET supports primarily the desktop .NET Framework 4.5.0 release and above.
3535
- Windows 8 and 8.1 for Windows Store app development: Storage Client Libraries are available for Windows Store applications.
3636
- Windows Phone 8 and 8.1 app development: Storage Client Libraries are available for Windows Phone applications including Universal applications.
3737
- Netstandard1.3: Storage Client Libraries for .NET are available to support Netstandard application development including Xamarin/UWP applications.

Test/FaultInjection/AzureStorageMangler/AzureStorageMangler.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<AppDesignerFolder>Properties</AppDesignerFolder>
6767
<RootNamespace>Microsoft.WindowsAzure.Test.Network</RootNamespace>
6868
<AssemblyName>AzureStorageMangler</AssemblyName>
69-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
69+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
7070
<FileAlignment>512</FileAlignment>
7171
<TargetFrameworkProfile>
7272
</TargetFrameworkProfile>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

Test/FaultInjection/HttpMangler/HttpMangler.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Microsoft.WindowsAzure.Test.Network</RootNamespace>
1212
<AssemblyName>HttpMangler</AssemblyName>
13-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile>
1616
</TargetFrameworkProfile>

Test/WindowsDesktop/App.config

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<system.diagnostics>
44
<sources>
55
<source name="Microsoft.WindowsAzure.Storage">
66
<listeners>
7-
<add name="TestListener" />
7+
<add name="TestListener"/>
88
</listeners>
99
</source>
1010
</sources>
1111
<switches>
12-
<add name="Microsoft.WindowsAzure.Storage" value="Verbose" />
12+
<add name="Microsoft.WindowsAzure.Storage" value="Verbose"/>
1313
</switches>
1414
<sharedListeners>
15-
<add name="TestListener" type="Microsoft.WindowsAzure.Storage.Core.TestLogListener,Microsoft.WindowsAzure.Storage.Test" />
15+
<add name="TestListener" type="Microsoft.WindowsAzure.Storage.Core.TestLogListener,Microsoft.WindowsAzure.Storage.Test"/>
1616
</sharedListeners>
1717
</system.diagnostics>
1818
<runtime>
1919
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2020
<dependentAssembly>
21-
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
22-
<bindingRedirect oldVersion="0.0.0.0-2.2.22.0" newVersion="2.2.22.0" />
21+
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
22+
<bindingRedirect oldVersion="0.0.0.0-2.2.22.0" newVersion="2.2.22.0"/>
2323
</dependentAssembly>
2424
<dependentAssembly>
25-
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
26-
<bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0" />
25+
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
26+
<bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0"/>
2727
</dependentAssembly>
2828
<dependentAssembly>
29-
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
30-
<bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0" />
29+
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
30+
<bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0"/>
3131
</dependentAssembly>
3232
<dependentAssembly>
33-
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
34-
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
33+
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
34+
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
3535
</dependentAssembly>
3636
<dependentAssembly>
37-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
38-
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
37+
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
38+
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
3939
</dependentAssembly>
4040
<dependentAssembly>
41-
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
42-
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
41+
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
42+
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
4343
</dependentAssembly>
4444
</assemblyBinding>
4545
</runtime>
46-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
46+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

Test/WindowsDesktop/Microsoft.WindowsAzure.Storage.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>Microsoft.WindowsAzure.Storage</RootNamespace>
1010
<AssemblyName>Microsoft.WindowsAzure.Storage.Test</AssemblyName>
11-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<TestProjectType>UnitTest</TestProjectType>

Test/WindowsDesktop/packages.config

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Hyak.Common" version="1.0.2" targetFramework="net452" />
4-
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net452" />
5-
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net452" />
6-
<package id="Microsoft.Azure.KeyVault" version="1.0.0" targetFramework="net452" />
7-
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net452" />
8-
<package id="Microsoft.Azure.KeyVault.Extensions" version="1.0.4" targetFramework="net452" />
9-
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />
10-
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
11-
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net452" />
12-
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net452" />
13-
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net452" />
14-
<package id="Microsoft.Data.Services.Client" version="5.7.0" targetFramework="net452" />
15-
<package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net452" />
16-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
17-
<package id="System.Spatial" version="5.7.0" targetFramework="net452" />
3+
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
4+
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
6+
<package id="Microsoft.Azure.KeyVault" version="1.0.0" targetFramework="net45" />
7+
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
8+
<package id="Microsoft.Azure.KeyVault.Extensions" version="1.0.4" targetFramework="net45" />
9+
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
10+
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
11+
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
12+
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net45" />
13+
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net45" />
14+
<package id="Microsoft.Data.Services.Client" version="5.7.0" targetFramework="net45" />
15+
<package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net45" />
16+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
17+
<package id="System.Spatial" version="5.7.0" targetFramework="net45" />
1818
</packages>

changelog.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Changes in 8.0.0 :
22

33
- All: Support for 2016-05-31 REST version. Please see our REST API documentation and blogs for information about the related added features. If you are using the Storage Emulator, please update to Emulator version 4.6.
4-
- All: (Desktop) Updated the desktop library to target .Net 4.5.2.
4+
- All: (Desktop) Updated the desktop library to target .Net 4.5.0.
55
- All: Added a new Netstandard 1.0 Target Framework (facade) as PCL support.
66
- Blobs: Added large block blob upload support. The supported Blocks can now support sizes up to 100 MB.
77
- Blobs: Added a new, memory-optimized upload algorithm for UploadFrom* APIs. This strategy only applies for blocks greater than 4MB and when StoreBlobContentMD5 and Client-Side Encryption are disabled.

0 commit comments

Comments
 (0)