Skip to content

Commit

Permalink
Merge pull request #378 from box/3-1-0
Browse files Browse the repository at this point in the history
v3.1.0 release
  • Loading branch information
coolboy authored Aug 18, 2017
2 parents db4370a + 4de0121 commit 72f792c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Box.V2.Core/Box.V2.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Box.V2 for .Net Core</Description>
<AssemblyTitle>Box.V2.Core</AssemblyTitle>
<VersionPrefix>3.0.0</VersionPrefix>
<VersionPrefix>3.1.0</VersionPrefix>
<Authors>Box, Inc.</Authors>
<TargetFramework>netstandard1.4</TargetFramework>
<AssemblyName>Box.V2.Core</AssemblyName>
Expand Down
4 changes: 2 additions & 2 deletions Box.V2.Core/Box.V2.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<package >
<metadata>
<id>Box.V2.Core</id>
<version>3.0.0</version>
<version>3.1.0</version>
<title>Box Windows SDK V2 Core</title>
<authors>Box, Inc.</authors>
<owners>Box, Inc.</owners>
<projectUrl>https://github.com/box/box-windows-sdk-v2</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Windows SDK for v2 of the Box API. The SDK is built for .NET Core and includes JWTAuth support.</description>
<releaseNotes>See release notes of Box.V2 3.0.0</releaseNotes>
<releaseNotes>See release notes of Box.V2 3.1.0</releaseNotes>
<copyright>Copyright 2017</copyright>
<tags>Box V2 SDK Platform Enterprise Collaboration Storage File Management</tags>
</metadata>
Expand Down
3 changes: 2 additions & 1 deletion Box.V2.Samples.Core.File.Upload/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Box.V2.Models;
using Box.V2.Auth;
using System.Diagnostics;
using Box.V2.Utility;

namespace Box.V2.Core.Sample
{
Expand Down Expand Up @@ -54,7 +55,7 @@ private async Task ExecuteMainAsync()
// var bFile = await client.FilesManager.UploadAsync(fileRequest, file);

// Supercharged filed upload with progress report, only works with file >= 50m.
var progress = new Progress<int>(val => { Console.WriteLine("{0}%", val); });
var progress = new Progress<BoxProgress>(val => { Console.WriteLine("{0}%", val.progress); });
var bFile = await client.FilesManager.UploadUsingSessionAsync(file, fileName, parentFolderId, null, progress);

Console.WriteLine("{0} uploaded to folder: {1} as file: {2}",localFilePath, parentFolderId, bFile.Id);
Expand Down
4 changes: 2 additions & 2 deletions Box.V2/Box.V2.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<package >
<metadata>
<id>Box.V2</id>
<version>3.0.0</version>
<version>3.1.0</version>
<title>Box Windows SDK V2</title>
<authors>Box, Inc.</authors>
<owners>Box, Inc.</owners>
<projectUrl>https://github.com/box/box-windows-sdk-v2</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Windows SDK for v2 of the Box API. The SDK is targeting .NET Framework 4.5</description>
<releaseNotes>Major version bump to 3, targting net45. Upgrading the whole sln to vs2017. Recents API. New operation on Metadata API. Progress on UploadUsingSession. Other minor fixes.</releaseNotes>
<releaseNotes>Unified metadata support.</releaseNotes>
<copyright>Copyright 2017</copyright>
<tags>Box V2 SDK Platform Enterprise Collaboration Storage File Management</tags>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion Box.V2/Utility/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ internal class AssemblyInfo
public const string AssemblyTitle = "Box.V2";
public const string AssemblyProduct = "Box.V2";

public const string NuGetVersion = "3.0.0";
public const string NuGetVersion = "3.1.0";
public const string AssemblyVersion = "1.0.0.0";
public const string AssemblyFileVersion = "1.0.0.0";
}
Expand Down

0 comments on commit 72f792c

Please sign in to comment.