Skip to content

Commit

Permalink
Upgrade to XSCL 10.0.1 and change namespace to Microsoft.Azure.Storag…
Browse files Browse the repository at this point in the history
…e.DataMovement
  • Loading branch information
EmmaZhu committed Apr 15, 2019
1 parent 66fe8d2 commit 689c6ef
Show file tree
Hide file tree
Showing 192 changed files with 400 additions and 398 deletions.
15 changes: 9 additions & 6 deletions DataMovement_k.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.10
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.WindowsAzure.Storage.DataMovement", "netcore\Microsoft.WindowsAzure.Storage.DataMovement\Microsoft.WindowsAzure.Storage.DataMovement.csproj", "{FEF3205A-8724-4D88-9C01-4BEA24EC6A24}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DMLibTest", "netcore\DMLibTest\DMLibTest.csproj", "{1FBF2858-65D7-418B-92C4-75BAF207158C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DMTestLib", "netcore\DMTestLib\DMTestLib.csproj", "{AA7B6E4B-E574-4005-89CC-97A84B41E63A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsTestLib", "netcore\MsTestLib\MsTestLib.csproj", "{0F62F89A-6DE6-4623-821B-DD6D2CAFCF99}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Storage.DataMovement", "netcore\Microsoft.Azure.Storage.DataMovement\Microsoft.Azure.Storage.DataMovement.csproj", "{9CFC8F0E-85B4-43FB-AAB8-EECF9EE0F289}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FEF3205A-8724-4D88-9C01-4BEA24EC6A24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FEF3205A-8724-4D88-9C01-4BEA24EC6A24}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FEF3205A-8724-4D88-9C01-4BEA24EC6A24}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FEF3205A-8724-4D88-9C01-4BEA24EC6A24}.Release|Any CPU.Build.0 = Release|Any CPU
{1FBF2858-65D7-418B-92C4-75BAF207158C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1FBF2858-65D7-418B-92C4-75BAF207158C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1FBF2858-65D7-418B-92C4-75BAF207158C}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -33,8 +29,15 @@ Global
{0F62F89A-6DE6-4623-821B-DD6D2CAFCF99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F62F89A-6DE6-4623-821B-DD6D2CAFCF99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F62F89A-6DE6-4623-821B-DD6D2CAFCF99}.Release|Any CPU.Build.0 = Release|Any CPU
{9CFC8F0E-85B4-43FB-AAB8-EECF9EE0F289}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CFC8F0E-85B4-43FB-AAB8-EECF9EE0F289}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CFC8F0E-85B4-43FB-AAB8-EECF9EE0F289}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CFC8F0E-85B4-43FB-AAB8-EECF9EE0F289}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {98FDD843-F0CD-482D-9E73-75844F47C472}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion lib/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Microsoft.WindowsAzure.Storage.DataMovement.dll")]
[assembly: AssemblyTitle("Microsoft.Azure.Storage.DataMovement.dll")]
[assembly: AssemblyDescription("")]
2 changes: 1 addition & 1 deletion lib/ChunkedMemoryStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using System.IO;
Expand Down
2 changes: 1 addition & 1 deletion lib/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Copyright (c) Microsoft Corporation
// </copyright>
//------------------------------------------------------------------------------
namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using System.Reflection;
Expand Down
22 changes: 11 additions & 11 deletions lib/DataMovement.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ProjectGuid>{B821E031-09CC-48F0-BDC6-2793228D4027}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.WindowsAzure.Storage.DataMovement</RootNamespace>
<AssemblyName>Microsoft.WindowsAzure.Storage.DataMovement</AssemblyName>
<RootNamespace>Microsoft.Azure.Storage.DataMovement</RootNamespace>
<AssemblyName>Microsoft.Azure.Storage.DataMovement</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
Expand All @@ -29,7 +29,7 @@
<CodeAnalysisRuleSet>..\tools\analysis\fxcop\azure-storage-dm.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis>
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DocumentationFile>bin\Debug\Microsoft.WindowsAzure.Storage.DataMovement.XML</DocumentationFile>
<DocumentationFile>bin\Debug\Microsoft.Azure.Storage.DataMovement.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -43,7 +43,7 @@
<RunCodeAnalysis>true</RunCodeAnalysis>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<DocumentationFile>bin\Release\Microsoft.WindowsAzure.Storage.DataMovement.XML</DocumentationFile>
<DocumentationFile>bin\Release\Microsoft.Azure.Storage.DataMovement.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand All @@ -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=9.4.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.9.4.2\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
<Reference Include="Microsoft.Azure.Storage.Blob, Version=10.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.Blob.10.0.1\lib\net452\Microsoft.Azure.Storage.Blob.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Storage.Common, Version=9.4.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.Common.9.4.2\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
<Reference Include="Microsoft.Azure.Storage.Common, Version=10.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.Common.10.0.1\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Storage.File, Version=9.4.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.File.9.4.2\lib\net452\Microsoft.Azure.Storage.File.dll</HintPath>
<Reference Include="Microsoft.Azure.Storage.File, Version=10.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Storage.File.10.0.1\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 Expand Up @@ -229,4 +229,4 @@
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
</Project>
</Project>
2 changes: 1 addition & 1 deletion lib/DirectoryTransferContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System.IO;

Expand Down
2 changes: 1 addition & 1 deletion lib/Exceptions/TransferErrorCode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;

Expand Down
2 changes: 1 addition & 1 deletion lib/Exceptions/TransferException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using System.Runtime.Serialization;
Expand Down
2 changes: 1 addition & 1 deletion lib/Exceptions/TransferSkippedException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using System.Runtime.Serialization;
Expand Down
10 changes: 5 additions & 5 deletions lib/Extensions/StorageCopyState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement.Extensions
namespace Microsoft.Azure.Storage.DataMovement.Extensions
{
using System;

Expand Down Expand Up @@ -34,7 +34,7 @@ internal enum StorageCopyStatus

internal class StorageCopyState
{
public StorageCopyState(Microsoft.WindowsAzure.Storage.Blob.CopyState blobCopyState)
public StorageCopyState(Microsoft.Azure.Storage.Blob.CopyState blobCopyState)
{
this.CopyId = blobCopyState.CopyId;
this.SetStatus(blobCopyState.Status);
Expand All @@ -44,7 +44,7 @@ public StorageCopyState(Microsoft.WindowsAzure.Storage.Blob.CopyState blobCopySt
this.StatusDescription = blobCopyState.StatusDescription;
}

public StorageCopyState(Microsoft.WindowsAzure.Storage.File.CopyState fileCopyState)
public StorageCopyState(Microsoft.Azure.Storage.File.CopyState fileCopyState)
{
this.CopyId = fileCopyState.CopyId;
this.SetStatus(fileCopyState.Status);
Expand All @@ -54,7 +54,7 @@ public StorageCopyState(Microsoft.WindowsAzure.Storage.File.CopyState fileCopySt
this.StatusDescription = fileCopyState.StatusDescription;
}

private void SetStatus(Microsoft.WindowsAzure.Storage.Blob.CopyStatus blobCopyStatus)
private void SetStatus(Microsoft.Azure.Storage.Blob.CopyStatus blobCopyStatus)
{
switch (blobCopyStatus)
{
Expand All @@ -79,7 +79,7 @@ private void SetStatus(Microsoft.WindowsAzure.Storage.Blob.CopyStatus blobCopySt
}
}

private void SetStatus(Microsoft.WindowsAzure.Storage.File.CopyStatus fileCopyStatus)
private void SetStatus(Microsoft.Azure.Storage.File.CopyStatus fileCopyStatus)
{
switch (fileCopyStatus)
{
Expand Down
8 changes: 4 additions & 4 deletions lib/Extensions/StorageExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using Microsoft.WindowsAzure.Storage.Auth;
using Microsoft.WindowsAzure.Storage.Blob;
using Microsoft.WindowsAzure.Storage.File;
using Microsoft.Azure.Storage.Auth;
using Microsoft.Azure.Storage.Blob;
using Microsoft.Azure.Storage.File;

/// <summary>
/// Extension methods for CloudBlobs for use with BlobTransfer.
Expand Down
2 changes: 1 addition & 1 deletion lib/FileNativeMethods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement.Interop
namespace Microsoft.Azure.Storage.DataMovement.Interop
{
using System;
using System.Collections.Generic;
Expand Down
4 changes: 2 additions & 2 deletions lib/GlobalMemoryStatusNativeMethods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// Copyright (c) Microsoft Corporation
// </copyright>
//------------------------------------------------------------------------------
namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using Microsoft.WindowsAzure.Storage.DataMovement.Interop;
using Microsoft.Azure.Storage.DataMovement.Interop;

internal class GlobalMemoryStatusNativeMethods
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Interop/Interop.Linux.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement.Interop
namespace Microsoft.Azure.Storage.DataMovement.Interop
{
using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion lib/Interop/Interop.OSX.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement.Interop
namespace Microsoft.Azure.Storage.DataMovement.Interop
{
using System;
using System.Runtime.InteropServices;
Expand Down
2 changes: 1 addition & 1 deletion lib/Interop/Interop.Windows.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement.Interop
namespace Microsoft.Azure.Storage.DataMovement.Interop
{
using System;
using System.IO;
Expand Down
2 changes: 1 addition & 1 deletion lib/Interop/Interop.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement.Interop
namespace Microsoft.Azure.Storage.DataMovement.Interop
{
using System;
using System.Runtime.InteropServices;
Expand Down
2 changes: 1 addition & 1 deletion lib/JournalItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{

#if !BINARY_SERIALIZATION
Expand Down
4 changes: 2 additions & 2 deletions lib/LongPathFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using System.IO;
using Microsoft.WindowsAzure.Storage.DataMovement.Interop;
using Microsoft.Azure.Storage.DataMovement.Interop;

internal static partial class LongPathFile
{
Expand Down
4 changes: 2 additions & 2 deletions lib/LongPathFileStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using System.Collections.Generic;
Expand All @@ -18,7 +18,7 @@ namespace Microsoft.WindowsAzure.Storage.DataMovement
using Microsoft.Win32.SafeHandles;
#endif
using System.Diagnostics;
using Microsoft.WindowsAzure.Storage.DataMovement.Interop;
using Microsoft.Azure.Storage.DataMovement.Interop;

internal static class LongPath
{
Expand Down
2 changes: 1 addition & 1 deletion lib/MD5HashStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Copyright (c) Microsoft Corporation
// </copyright>
//------------------------------------------------------------------------------
namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using System.Diagnostics;
Expand Down
2 changes: 1 addition & 1 deletion lib/MD5Wrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using System.Diagnostics.CodeAnalysis;
Expand Down
2 changes: 1 addition & 1 deletion lib/MemoryManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using System.Collections.Concurrent;
Expand Down
2 changes: 1 addition & 1 deletion lib/NativeMD5.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// limitations under the License.
// </copyright>
//-----------------------------------------------------------------------
namespace Microsoft.WindowsAzure.Storage.DataMovement
namespace Microsoft.Azure.Storage.DataMovement
{
using System;
using System.Diagnostics.CodeAnalysis;
Expand Down
6 changes: 3 additions & 3 deletions lib/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/SerializationHelper/SerializableAccessCondition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage.DataMovement.SerializationHelper
namespace Microsoft.Azure.Storage.DataMovement.SerializationHelper
{
using System;
using System.Runtime.Serialization;
Expand Down
Loading

0 comments on commit 689c6ef

Please sign in to comment.