Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

Small fixes based on PR feedback #2172

Merged
merged 1 commit into from
Mar 21, 2018
Merged

Small fixes based on PR feedback #2172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions samples/AzCopyCore/AzCopyCore/AzCopyCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<!--
<RuntimeFrameworkVersion>2.1.0-preview2-26209-04</RuntimeFrameworkVersion>
-->
<CoreFxPackageVersion>4.5.0-preview2-26213-06</CoreFxPackageVersion>
<CoreFxLabPackageVersion>0.1.0-preview2-180213-4</CoreFxLabPackageVersion>
</PropertyGroup>
Expand All @@ -22,18 +19,18 @@

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="1.0.0-alpha-26320-02" />
<PackageReference Include="System.Buffers.ReaderWriter" Version="0.1.0-preview2-180320-2" />
<PackageReference Include="System.IO.Pipelines" Version="4.5.0-preview3-26319-04" />
<PackageReference Include="System.Memory" Version="4.5.0-preview3-26319-04" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.0-preview3-26319-04" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Azure.Experimental" Version="0.1.0-preview2-180320-2" />
<PackageReference Include="System.Buffers.Experimental" Version="0.1.0-preview2-180320-2" />
<PackageReference Include="System.Buffers.ReaderWriter" Version="0.1.0-preview2-180320-2" />
<PackageReference Include="System.Text.Http" Version="0.1.0-preview2-180320-2" />
<PackageReference Include="System.Text.Http.Parser" Version="0.1.0-preview2-180320-2" />
<PackageReference Include="System.Text.Utf8String" Version="0.1.0-preview2-180320-2" />
<PackageReference Include="System.IO.Pipelines" Version="4.5.0-preview3-26319-04" />
</ItemGroup>

</Project>
4 changes: 1 addition & 3 deletions samples/AzCopyCore/AzCopyCore/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static void Main(string[] args)
ReadOnlySpan<char> destination = options.GetSpan("/Dest:");

long before = GC.GetAllocatedBytesForCurrentThread();
var sw = Stopwatch.StartNew();
Stopwatch sw = Stopwatch.StartNew();

// transfer from file system to storage
if (destination.StartsWith("http://"))
Expand Down Expand Up @@ -80,7 +80,6 @@ static void TransferDirectoryToStorage(ReadOnlySpan<char> localDirectory, ReadOn
if (options.Contains("/DestKey:"))
{
ReadOnlySpan<char> key = options["/DestKey:"];
var str = key.ToString();
keyBytes = key.ComputeKeyBytes();
}
else if (options.Contains("/@:"))
Expand All @@ -103,7 +102,6 @@ static void TransferDirectoryToStorage(ReadOnlySpan<char> localDirectory, ReadOn

using (var client = new StorageClient(keyBytes, account, host, 80, Log))
{
//var files = new Files(directoryPath);
foreach (string filepath in Directory.EnumerateFiles(directoryPath))
{
// TODO: Use Path.Join when it becomes available
Expand Down