Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit 15f493e

Browse files
committed
Merge branch 'develop'
2 parents f19f259 + 8843ef5 commit 15f493e

400 files changed

Lines changed: 29527 additions & 23262 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.

.gitignore

Lines changed: 98 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Created by https://www.gitignore.io
1+
2+
# Created by https://www.gitignore.io/api/visualstudio
23

34
### VisualStudio ###
45
## Ignore Visual Studio temporary files, build results, and
@@ -10,26 +11,33 @@
1011
*.userosscache
1112
*.sln.docstates
1213

14+
# User-specific files (MonoDevelop/Xamarin Studio)
15+
*.userprefs
16+
1317
# Build results
1418
[Dd]ebug/
1519
[Dd]ebugPublic/
1620
[Rr]elease/
1721
[Rr]eleases/
1822
x64/
1923
x86/
20-
build/
2124
bld/
2225
[Bb]in/
2326
[Oo]bj/
27+
[Ll]og/
28+
[Dd]ist/
2429

25-
# Roslyn cache directories
26-
*.ide/
30+
# Visual Studio 2015 cache/options directory
31+
.vs/
32+
.cr/
33+
# Uncomment if you have tasks that create the project's static files in wwwroot
34+
#wwwroot/
2735

2836
# MSTest test Results
2937
[Tt]est[Rr]esult*/
3038
[Bb]uild[Ll]og.*
3139

32-
#NUNIT
40+
# NUNIT
3341
*.VisualState.xml
3442
TestResult.xml
3543

@@ -38,6 +46,11 @@ TestResult.xml
3846
[Rr]eleasePS/
3947
dlldata.c
4048

49+
# DNX
50+
project.lock.json
51+
project.fragment.lock.json
52+
artifacts/
53+
4154
*_i.c
4255
*_p.c
4356
*_i.h
@@ -70,14 +83,18 @@ _Chutzpah*
7083
ipch/
7184
*.aps
7285
*.ncb
86+
*.opendb
7387
*.opensdf
7488
*.sdf
7589
*.cachefile
90+
*.VC.db
91+
*.VC.VC.opendb
7692

7793
# Visual Studio profiler
7894
*.psess
7995
*.vsp
8096
*.vspx
97+
*.sap
8198

8299
# TFS 2012 Local Workspace
83100
$tf/
@@ -90,7 +107,7 @@ _ReSharper*/
90107
*.[Rr]e[Ss]harper
91108
*.DotSettings.user
92109

93-
# JustCode is a .NET coding addin-in
110+
# JustCode is a .NET coding add-in
94111
.JustCode
95112

96113
# TeamCity is a build add-in
@@ -99,9 +116,14 @@ _TeamCity*
99116
# DotCover is a Code Coverage Tool
100117
*.dotCover
101118

119+
# Visual Studio code coverage results
120+
*.coverage
121+
*.coveragexml
122+
102123
# NCrunch
103124
_NCrunch_*
104125
.*crunch*.local.xml
126+
nCrunchTemp_*
105127

106128
# MightyMoose
107129
*.mm.*
@@ -129,11 +151,16 @@ publish/
129151
# Publish Web Output
130152
*.[Pp]ublish.xml
131153
*.azurePubxml
132-
# TODO: Comment the next line if you want to checkin your web deploy settings
154+
# TODO: Comment the next line if you want to checkin your web deploy settings
133155
# but database connection strings (with potential passwords) will be unencrypted
134156
*.pubxml
135157
*.publishproj
136158

159+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
160+
# checkin your Azure Web App publish settings, but sensitive information contained
161+
# in these scripts will be unencrypted
162+
PublishScripts/
163+
137164
# NuGet Packages
138165
*.nupkg
139166
# The packages folder can be ignored because of Package Restore
@@ -142,26 +169,45 @@ publish/
142169
!**/packages/build/
143170
# Uncomment if necessary however generally it will be regenerated when needed
144171
#!**/packages/repositories.config
172+
# NuGet v3's project.json files produces more ignoreable files
173+
*.nuget.props
174+
*.nuget.targets
145175

146-
# Windows Azure Build Output
176+
# Microsoft Azure Build Output
147177
csx/
148178
*.build.csdef
149179

150-
# Windows Store app package directory
180+
# Microsoft Azure Emulator
181+
ecf/
182+
rcf/
183+
184+
# Windows Store app package directories and files
151185
AppPackages/
186+
BundleArtifacts/
187+
Package.StoreAssociation.xml
188+
_pkginfo.txt
189+
190+
# Visual Studio cache files
191+
# files ending in .cache can be ignored
192+
*.[Cc]ache
193+
# but keep track of directories ending in .cache
194+
!*.[Cc]ache/
152195

153196
# Others
154-
*.Cache
155197
ClientBin/
156-
[Ss]tyle[Cc]op.*
157198
~$*
158199
*~
159200
*.dbmdl
160201
*.dbproj.schemaview
202+
*.jfm
161203
*.pfx
162204
*.publishsettings
163205
node_modules/
164-
bower_components/
206+
orleans.codegen.cs
207+
208+
# Since there are multiple workflows, uncomment next line to ignore bower_components
209+
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
210+
#bower_components/
165211

166212
# RIA/Silverlight projects
167213
Generated_Code/
@@ -186,6 +232,43 @@ UpgradeLog*.htm
186232
# Microsoft Fakes
187233
FakesAssemblies/
188234

189-
Gemfile
190-
Gemfile.lock
191-
_site/
235+
# GhostDoc plugin setting file
236+
*.GhostDoc.xml
237+
238+
# Node.js Tools for Visual Studio
239+
.ntvs_analysis.dat
240+
241+
# Visual Studio 6 build log
242+
*.plg
243+
244+
# Visual Studio 6 workspace options file
245+
*.opt
246+
247+
# Visual Studio LightSwitch build output
248+
**/*.HTMLClient/GeneratedArtifacts
249+
**/*.DesktopClient/GeneratedArtifacts
250+
**/*.DesktopClient/ModelManifest.xml
251+
**/*.Server/GeneratedArtifacts
252+
**/*.Server/ModelManifest.xml
253+
_Pvt_Extensions
254+
255+
# Paket dependency manager
256+
.paket/paket.exe
257+
paket-files/
258+
259+
# FAKE - F# Make
260+
.fake/
261+
262+
# JetBrains Rider
263+
.idea/
264+
*.sln.iml
265+
266+
# CodeRush
267+
.cr/
268+
269+
# Python Tools for Visual Studio (PTVS)
270+
__pycache__/
271+
*.pyc
272+
273+
### VisualStudio Patch ###
274+
build/

AlphaFS.Doc/AlphaFS.Doc.shfbproj

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<!-- The configuration and platform will be used to determine which
@@ -8,7 +8,7 @@
88
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{81ed470c-0a64-4b10-b37e-61a06ddc497c}</ProjectGuid>
11-
<SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
11+
<SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
1212
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
1313
Studio adds them anyway -->
1414
<AssemblyName>Documentation</AssemblyName>
@@ -33,14 +33,14 @@
3333
<FrameworkVersion>.NET Framework 4.0</FrameworkVersion>
3434
<RootNamespaceContainer>True</RootNamespaceContainer>
3535
<RootNamespaceTitle>API Reference</RootNamespaceTitle>
36-
<HelpTitle>AlphaFS 2.0 Documentation</HelpTitle>
37-
<CopyrightText>Copyright %28C%29 2008-2015 Peter Palotas, Jeffrey Jangli, Alexandr Normuradov</CopyrightText>
36+
<HelpTitle>AlphaFS 2.1 Documentation</HelpTitle>
37+
<CopyrightText>Copyright %28C%29 2008-2016 Peter Palotas, Jeffrey Jangli, Alexandr Normuradov</CopyrightText>
3838
<PresentationStyle>VS2013</PresentationStyle>
3939
<SyntaxFilters>Standard</SyntaxFilters>
40-
<HelpFileVersion>1.0.0.9300</HelpFileVersion>
40+
<HelpFileVersion>2.0.0.9300</HelpFileVersion>
4141
<DocumentationSources>
42-
<DocumentationSource sourceFile="..\Bin\Debug\Net451\AlphaFS.dll" />
43-
<DocumentationSource sourceFile="..\Bin\Debug\Net451\AlphaFS.xml" />
42+
<DocumentationSource sourceFile="..\Bin\$(Configuration)\Net452\AlphaFS.dll" />
43+
<DocumentationSource sourceFile="..\Bin\$(Configuration)\Net452\AlphaFS.xml" />
4444
</DocumentationSources>
4545
<FooterText>https://github.com/alphaleonis/AlphaFS/</FooterText>
4646
<ShowFeedbackControl>False</ShowFeedbackControl>
@@ -54,7 +54,7 @@ Additional classes and methods are provided to provide more advanced functionali
5454
<NamespaceSummaryItem name="Alphaleonis.Win32" isDocumented="True">This namespace contains general classes related to the Win32 Api.</NamespaceSummaryItem>
5555
<NamespaceSummaryItem name="Alphaleonis.Win32.Network" isDocumented="True">This namespace contains network related classes.</NamespaceSummaryItem>
5656
</NamespaceSummaries>
57-
<HelpFileFormat>Website</HelpFileFormat>
57+
<HelpFileFormat>HtmlHelp1, Website</HelpFileFormat>
5858
<ComponentConfigurations>
5959
</ComponentConfigurations>
6060
<HtmlSdkLinkType>Msdn</HtmlSdkLinkType>
@@ -70,12 +70,15 @@ Additional classes and methods are provided to provide more advanced functionali
7070
<NamingMethod>HashedMemberName</NamingMethod>
7171
<Language>en-US</Language>
7272
<ContentPlacement>AboveNamespaces</ContentPlacement>
73+
<SaveComponentCacheCapacity>100</SaveComponentCacheCapacity>
7374
</PropertyGroup>
7475
<!-- There are no properties for these two groups but they need to appear in
7576
order for Visual Studio to perform the build. -->
76-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
77+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
78+
<OutputPath>..\Bin\Documentation\</OutputPath>
7779
</PropertyGroup>
78-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
80+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
81+
<OutputPath>..\Bin\Documentation\</OutputPath>
7982
</PropertyGroup>
8083
<ItemGroup>
8184
<None Include="License.aml" />

AlphaFS.Doc/License.aml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<topic id="75f7f0b6-63f5-4784-9898-0694076670a6" revisionNumber="1">
33
<developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
44
<introduction>
5-
<para><legacyBold>Copyright (c) 2008-2015 Peter Palotas, Jeffrey Jangli, Alexandr Normuradov</legacyBold></para>
5+
<para><legacyBold>Copyright (c) 2008-2016 Peter Palotas, Jeffrey Jangli, Alexandr Normuradov</legacyBold></para>
66
<para>Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files
88
(the "Software"), to deal in the Software without restriction,

0 commit comments

Comments
 (0)