Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Storage Libraries upgrade from 11.2.0 to 11.2.3; Prepare for release of 2.0.4 #272

Merged
merged 2 commits into from
May 12, 2021
Merged

Storage Libraries upgrade from 11.2.0 to 11.2.3; Prepare for release of 2.0.4 #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86c865f
Storage Libraries upgrade from 11.2.0 to 11.2.3; increment minor version
amnguye May 12, 2021
b003d13
Update test dependency on storage libraries
amnguye May 12, 2021
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
12 changes: 6 additions & 6 deletions lib/DataMovement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Storage.Blob, Version=11.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.2.2\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
<Reference Include="Microsoft.Azure.Storage.Blob, Version=11.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.11.2.3\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Storage.Common, Version=11.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.Common.11.2.2\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
<Reference Include="Microsoft.Azure.Storage.Common, Version=11.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.Common.11.2.3\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Storage.File, Version=11.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.File.11.2.2\lib\net452\Microsoft.Azure.Storage.File.dll</HintPath>
<Reference Include="Microsoft.Azure.Storage.File, Version=11.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.File.11.2.3\lib\net452\Microsoft.Azure.Storage.File.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
Expand Down
6 changes: 3 additions & 3 deletions lib/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Storage.Blob" version="11.2.2" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.Common" version="11.2.2" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.File" version="11.2.2" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.Blob" version="11.2.3" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.Common" version="11.2.3" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.File" version="11.2.3" targetFramework="net452" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
<package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net45" />
<package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net45" />
Expand Down
6 changes: 3 additions & 3 deletions netcore/Microsoft.Azure.Storage.DataMovement/Microsoft.Azure.Storage.DataMovement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Microsoft.WindowsAzure.Storage.DataMovement Class Library</Description>
<Version>2.0.3.0</Version>
<Version>2.0.4.0</Version>
<Authors>Microsoft</Authors>
<TargetFramework>netstandard2.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down Expand Up @@ -37,8 +37,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.KeyVault.Core" Version="2.0.4" />
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />
<PackageReference Include="Microsoft.Azure.Storage.File" Version="11.2.2" />
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.3" />
<PackageReference Include="Microsoft.Azure.Storage.File" Version="11.2.3" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0-beta2" />
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0" />
Expand Down
12 changes: 6 additions & 6 deletions test/DMLibTest/DMLibTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Storage.Blob, Version=11.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.Storage.Blob.11.2.2\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
<Reference Include="Microsoft.Azure.Storage.Blob, Version=11.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.Storage.Blob.11.2.3\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Storage.Common, Version=11.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.Storage.Common.11.2.2\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
<Reference Include="Microsoft.Azure.Storage.Common, Version=11.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.Storage.Common.11.2.3\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Storage.File, Version=11.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.Storage.File.11.2.2\lib\net452\Microsoft.Azure.Storage.File.dll</HintPath>
<Reference Include="Microsoft.Azure.Storage.File, Version=11.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.Storage.File.11.2.3\lib\net452\Microsoft.Azure.Storage.File.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion test/DMLibTest/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Azure.Storage.Common" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.2.2.0" newVersion="11.2.2.0" />
<bindingRedirect oldVersion="0.0.0.0-11.2.3.0" newVersion="11.2.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
6 changes: 3 additions & 3 deletions test/DMLibTest/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Storage.Blob" version="11.2.2" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.Common" version="11.2.2" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.File" version="11.2.2" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.Blob" version="11.2.3" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.Common" version="11.2.3" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.File" version="11.2.3" targetFramework="net452" />
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
<package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net45" />
Expand Down
4 changes: 2 additions & 2 deletions tools/AssemblyInfo/SharedAssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
using System.Resources;
using System.Runtime.InteropServices;

[assembly: AssemblyVersion("2.0.3.0")]
[assembly: AssemblyFileVersion("2.0.3.0")]
[assembly: AssemblyVersion("2.0.4.0")]
[assembly: AssemblyFileVersion("2.0.4.0")]

[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure Storage")]
Expand Down
10 changes: 5 additions & 5 deletions tools/nupkg/Microsoft.Azure.Storage.DataMovement.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>Microsoft.Azure.Storage.DataMovement</id>
<version>2.0.3</version>
<version>2.0.4</version>
<title>Microsoft Azure Storage Data Movement Library</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
Expand All @@ -19,14 +19,14 @@
<dependencies>
<group targetFramework="net452">
<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" />
<dependency id="Microsoft.Azure.Storage.File" version="11.2.0" />
<dependency id="Microsoft.Azure.Storage.Blob" version="11.2.0" />
<dependency id="Microsoft.Azure.Storage.File" version="11.2.3" />
<dependency id="Microsoft.Azure.Storage.Blob" version="11.2.3" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Mono.Posix.NETStandard" version="1.0.0-beta2" />
<dependency id="NETStandard.Library" version="2.0.1" />
<dependency id="Microsoft.Azure.Storage.File" version="11.2.0" />
<dependency id="Microsoft.Azure.Storage.Blob" version="11.2.0" />
<dependency id="Microsoft.Azure.Storage.File" version="11.2.3" />
<dependency id="Microsoft.Azure.Storage.Blob" version="11.2.3" />
<dependency id="System.Runtime.Serialization.Xml" version="4.3.0" />
<dependency id="System.Threading.ThreadPool" version="4.3.0" />
<dependency id="System.Net.Http" version="4.3.4" />
Expand Down