Skip to content

Commit

Permalink
license, dependencies, net 462 updates (#78)
Browse files Browse the repository at this point in the history
  • Loading branch information
Icehunter authored Jul 4, 2018
1 parent bf46e10 commit 97e20ad
Show file tree
Hide file tree
Showing 148 changed files with 18,362 additions and 479,481 deletions.
4 changes: 3 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
Expand All @@ -17,4 +19,4 @@
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.RTF diff=astextplain
28 changes: 5 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
.idea/
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

[Dd]ebug*/
[Rr]elease*/
[Bb]uild*/
[Tt]est[Rr]esult
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
Expand All @@ -31,39 +28,32 @@
*.tli
*.tlh
*.tmp
.vs/
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf

# Visual Studio profiler
*.psess
*.vsp

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/

*.[Rr]e[Ss]harper

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
Expand All @@ -73,13 +63,10 @@ DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish

# Publish Web Output
*.Publish.xml

# Others
[Bb]in
[Oo]bj
Expand All @@ -91,27 +78,22 @@ ClientBin
[Ss]tyle[Cc]op.*
~$*
*.dbmdl

*.[Pp]ublish.xml

Generated_Code #added for RIA/Silverlight projects

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML

# Allow plugins
!FFXIVAPP.Plugin.*/

############
## Windows
############

# Windows image file caches
Thumbs.db

# Folder config file
Desktop.ini
FFXIVAPP.Client/FFXIVAPP.Client.csproj
packages/
distribution/
published/
16 changes: 11 additions & 5 deletions .nuget/NuGet.Config
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>

<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
</configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="FFXIVAPP.Common" value="D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-common\packages" />
<add key="FFXIVAPP.IPluginInterface" value="D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-iplugininterface\packages" />
<add key="FFXIVAPP.ResourceFiles" value="D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-resourcefiles\packages" />
<add key="Sharlayan" value="D:\Users\Icehunter\Source\Repos\ffxivapp\sharlayan\distribution" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
</configuration>
Binary file removed .vs/FFXIVAPP/v15/sqlite3/storage.ide
Binary file not shown.
Loading

0 comments on commit 97e20ad

Please sign in to comment.