Skip to content

Commit

Permalink
4.0 Release
Browse files Browse the repository at this point in the history
The ShareFile.Api.Models namespace has moved to ShareFile.Api.Client.Models.
Methods that took a CancellationToken? parameter now take CancellationToken. If you were passing a null value, pass default(CancellationToken) or omit the parameter.
Classes, methods, and properties that were tagged Obsolete have been removed: PlatformFileStream, IPlatformFile, and the ShareFileClient.ZoneAuthentication property.
If you were using PlatformFileStream: all methods/constructors that accepted PlatformFileStream now accept Stream.
If you were using ShareFileClient.ZoneAuthentication: use ShareFileClient.CustomAuthentication.
The ShareFile.Api.Client.Filesystem namespace has been removed.
UploaderBase/DownloaderBase.OnTransferProgress is now an event. If you were assigning a value, use += and -=.
TransferEventArgs and TransferProgress are now structs. Null-checking TransferEventArgs.Progress is no longer necessary.
Upload and download progress is now reported over time intervals. The default interval is 100ms. This value is configurable at FileUploaderConfig/DownloaderConfig.ProgressReportInterval.
  • Loading branch information
Nick Nicholls committed Mar 22, 2018
1 parent 953030a commit 4aa2544
Show file tree
Hide file tree
Showing 392 changed files with 12,216 additions and 12,645 deletions.
79 changes: 60 additions & 19 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,22 +1,63 @@
# Auto detect text files and perform LF normalization
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
97 changes: 25 additions & 72 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,38 +1,3 @@
#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath


#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

Expand All @@ -49,6 +14,11 @@ x64/
build/
[Bb]in/
[Oo]bj/
.fake/
artifacts/

# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/

# MSTest test Results
[Tt]est[Rr]esult*/
Expand Down Expand Up @@ -77,6 +47,7 @@ build/
*.pidb
*.log
*.scc
.vs/

# Visual C++ cache files
ipch/
Expand Down Expand Up @@ -126,11 +97,10 @@ publish/

# Publish Web Output
*.Publish.xml
*.pubxml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
packages/
#packages/

# Windows Azure Build Output
csx
Expand All @@ -140,6 +110,7 @@ csx
AppPackages/

# Others
.cov/
sql/
*.Cache
ClientBin/
Expand All @@ -165,9 +136,15 @@ UpgradeLog*.htm
App_Data/*.mdf
App_Data/*.ldf

#############
## Windows detritus
#############

#LightSwitch generated files
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml

# =========================
# Windows detritus
# =========================

# Windows image file caches
Thumbs.db
Expand All @@ -179,37 +156,13 @@ Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac crap
# Mac desktop service store files
.DS_Store
Core/packages/
packages/
packaging/*


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist/
build/
eggs/
parts/
var/
sdist/
develop-eggs/
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg
coverage/
coverage/*
TestResult.xml
**/project.lock.json
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ All code is licensed under the [MIT
License](https://github.com/citrix/ShareFile-PowerShell/blob/master/ShareFileSnapIn/LICENSE.txt).

## Tooling requirements ##
* Building `ShareFile.Api.Client.DotNet.sln` requires Visual Studio 2015 Update 2 with .NET Core tooling.
* Building `ShareFile.Api.Client.DotNet.sln` requires Visual Studio 2017 with .NET Core tooling.

## Definitions ##

Expand Down
27 changes: 6 additions & 21 deletions ShareFile.Api.Client.DotNet.sln
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2005
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ShareFile.Api.Client", "src\ShareFile.Api.Client\ShareFile.Api.Client.xproj", "{5B517B21-7981-4DF2-8989-EBE79A850416}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{746B7023-5672-4B85-B592-287F87ADE6D3}"
ProjectSection(SolutionItems) = preProject
src\ShareFile.Api.Client\global.json = src\ShareFile.Api.Client\global.json
src\ShareFile.Api.Client.Internal\global.json = src\ShareFile.Api.Client.Internal\global.json
EndProjectSection
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShareFile.Api.Client", "src\ShareFile.Api.Client\ShareFile.Api.Client.csproj", "{5B517B21-7981-4DF2-8989-EBE79A850416}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -21,20 +15,11 @@ Global
{5B517B21-7981-4DF2-8989-EBE79A850416}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B517B21-7981-4DF2-8989-EBE79A850416}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B517B21-7981-4DF2-8989-EBE79A850416}.Release|Any CPU.Build.0 = Release|Any CPU
{01DED15B-3BEA-4322-B202-E07380797CA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{01DED15B-3BEA-4322-B202-E07380797CA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01DED15B-3BEA-4322-B202-E07380797CA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{01DED15B-3BEA-4322-B202-E07380797CA4}.Release|Any CPU.Build.0 = Release|Any CPU
{6C3BFAD2-8885-4959-A580-DDB3494E359C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C3BFAD2-8885-4959-A580-DDB3494E359C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C3BFAD2-8885-4959-A580-DDB3494E359C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C3BFAD2-8885-4959-A580-DDB3494E359C}.Release|Any CPU.Build.0 = Release|Any CPU
{0EAA8F56-DE6E-4BBA-AB9D-76086D19DAD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0EAA8F56-DE6E-4BBA-AB9D-76086D19DAD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0EAA8F56-DE6E-4BBA-AB9D-76086D19DAD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0EAA8F56-DE6E-4BBA-AB9D-76086D19DAD7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {95B84D3C-EDB7-4E23-AB87-FB8DD03E558F}
EndGlobalSection
EndGlobal
76 changes: 0 additions & 76 deletions ShareFile.Api.Client.sln

This file was deleted.

Loading

0 comments on commit 4aa2544

Please sign in to comment.