Skip to content

Commit 4aa2544

Browse files
author
Nick Nicholls
committed
4.0 Release
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.
1 parent 953030a commit 4aa2544

392 files changed

Lines changed: 12216 additions & 12645 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 60 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,63 @@
1-
# Auto detect text files and perform LF normalization
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
24
* text=auto
35

4-
# Custom for Visual Studio
5-
*.cs diff=csharp
6-
*.sln merge=union
7-
*.csproj merge=union
8-
*.vbproj merge=union
9-
*.fsproj merge=union
10-
*.dbproj merge=union
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
1114

12-
# Standard to msysgit
13-
*.doc diff=astextplain
14-
*.DOC diff=astextplain
15-
*.docx diff=astextplain
16-
*.DOCX diff=astextplain
17-
*.dot diff=astextplain
18-
*.DOT diff=astextplain
19-
*.pdf diff=astextplain
20-
*.PDF diff=astextplain
21-
*.rtf diff=astextplain
22-
*.RTF diff=astextplain
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
#*.jpg binary
44+
#*.png binary
45+
#*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

.gitignore

Lines changed: 25 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,3 @@
1-
#################
2-
## Eclipse
3-
#################
4-
5-
*.pydevproject
6-
.project
7-
.metadata
8-
bin/
9-
tmp/
10-
*.tmp
11-
*.bak
12-
*.swp
13-
*~.nib
14-
local.properties
15-
.classpath
16-
.settings/
17-
.loadpath
18-
19-
# External tool builders
20-
.externalToolBuilders/
21-
22-
# Locally stored "Eclipse launch configurations"
23-
*.launch
24-
25-
# CDT-specific
26-
.cproject
27-
28-
# PDT-specific
29-
.buildpath
30-
31-
32-
#################
33-
## Visual Studio
34-
#################
35-
361
## Ignore Visual Studio temporary files, build results, and
372
## files generated by popular Visual Studio add-ons.
383

@@ -49,6 +14,11 @@ x64/
4914
build/
5015
[Bb]in/
5116
[Oo]bj/
17+
.fake/
18+
artifacts/
19+
20+
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
21+
!packages/*/build/
5222

5323
# MSTest test Results
5424
[Tt]est[Rr]esult*/
@@ -77,6 +47,7 @@ build/
7747
*.pidb
7848
*.log
7949
*.scc
50+
.vs/
8051

8152
# Visual C++ cache files
8253
ipch/
@@ -126,11 +97,10 @@ publish/
12697

12798
# Publish Web Output
12899
*.Publish.xml
129-
*.pubxml
130100

131101
# NuGet Packages Directory
132102
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
133-
packages/
103+
#packages/
134104

135105
# Windows Azure Build Output
136106
csx
@@ -140,6 +110,7 @@ csx
140110
AppPackages/
141111

142112
# Others
113+
.cov/
143114
sql/
144115
*.Cache
145116
ClientBin/
@@ -165,9 +136,15 @@ UpgradeLog*.htm
165136
App_Data/*.mdf
166137
App_Data/*.ldf
167138

168-
#############
169-
## Windows detritus
170-
#############
139+
140+
#LightSwitch generated files
141+
GeneratedArtifacts/
142+
_Pvt_Extensions/
143+
ModelManifest.xml
144+
145+
# =========================
146+
# Windows detritus
147+
# =========================
171148

172149
# Windows image file caches
173150
Thumbs.db
@@ -179,37 +156,13 @@ Desktop.ini
179156
# Recycle Bin used on file shares
180157
$RECYCLE.BIN/
181158

182-
# Mac crap
159+
# Mac desktop service store files
183160
.DS_Store
161+
Core/packages/
162+
packages/
163+
packaging/*
184164

185-
186-
#############
187-
## Python
188-
#############
189-
190-
*.py[co]
191-
192-
# Packages
193-
*.egg
194-
*.egg-info
195-
dist/
196-
build/
197-
eggs/
198-
parts/
199-
var/
200-
sdist/
201-
develop-eggs/
202-
.installed.cfg
203-
204-
# Installer logs
205-
pip-log.txt
206-
207-
# Unit test / coverage reports
208-
.coverage
209-
.tox
210-
211-
#Translations
212-
*.mo
213-
214-
#Mr Developer
215-
.mr.developer.cfg
165+
coverage/
166+
coverage/*
167+
TestResult.xml
168+
**/project.lock.json

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ All code is licensed under the [MIT
1212
License](https://github.com/citrix/ShareFile-PowerShell/blob/master/ShareFileSnapIn/LICENSE.txt).
1313

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

1717
## Definitions ##
1818

ShareFile.Api.Client.DotNet.sln

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27004.2005
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ShareFile.Api.Client", "src\ShareFile.Api.Client\ShareFile.Api.Client.xproj", "{5B517B21-7981-4DF2-8989-EBE79A850416}"
7-
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{746B7023-5672-4B85-B592-287F87ADE6D3}"
9-
ProjectSection(SolutionItems) = preProject
10-
src\ShareFile.Api.Client\global.json = src\ShareFile.Api.Client\global.json
11-
src\ShareFile.Api.Client.Internal\global.json = src\ShareFile.Api.Client.Internal\global.json
12-
EndProjectSection
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShareFile.Api.Client", "src\ShareFile.Api.Client\ShareFile.Api.Client.csproj", "{5B517B21-7981-4DF2-8989-EBE79A850416}"
137
EndProject
148
Global
159
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,20 +15,11 @@ Global
2115
{5B517B21-7981-4DF2-8989-EBE79A850416}.Debug|Any CPU.Build.0 = Debug|Any CPU
2216
{5B517B21-7981-4DF2-8989-EBE79A850416}.Release|Any CPU.ActiveCfg = Release|Any CPU
2317
{5B517B21-7981-4DF2-8989-EBE79A850416}.Release|Any CPU.Build.0 = Release|Any CPU
24-
{01DED15B-3BEA-4322-B202-E07380797CA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{01DED15B-3BEA-4322-B202-E07380797CA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{01DED15B-3BEA-4322-B202-E07380797CA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
27-
{01DED15B-3BEA-4322-B202-E07380797CA4}.Release|Any CPU.Build.0 = Release|Any CPU
28-
{6C3BFAD2-8885-4959-A580-DDB3494E359C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29-
{6C3BFAD2-8885-4959-A580-DDB3494E359C}.Debug|Any CPU.Build.0 = Debug|Any CPU
30-
{6C3BFAD2-8885-4959-A580-DDB3494E359C}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{6C3BFAD2-8885-4959-A580-DDB3494E359C}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{0EAA8F56-DE6E-4BBA-AB9D-76086D19DAD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{0EAA8F56-DE6E-4BBA-AB9D-76086D19DAD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{0EAA8F56-DE6E-4BBA-AB9D-76086D19DAD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
35-
{0EAA8F56-DE6E-4BBA-AB9D-76086D19DAD7}.Release|Any CPU.Build.0 = Release|Any CPU
3618
EndGlobalSection
3719
GlobalSection(SolutionProperties) = preSolution
3820
HideSolutionNode = FALSE
3921
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {95B84D3C-EDB7-4E23-AB87-FB8DD03E558F}
24+
EndGlobalSection
4025
EndGlobal

ShareFile.Api.Client.sln

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)