Skip to content

Commit

Permalink
Merge branch 'master' into local_DropFiles
Browse files Browse the repository at this point in the history
  • Loading branch information
diluculo authored May 15, 2018
2 parents ab7d384 + cf4b149 commit ecea16c
Show file tree
Hide file tree
Showing 58 changed files with 3,381 additions and 193 deletions.
295 changes: 257 additions & 38 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,42 +1,261 @@
# Shamelessly stolen from http://gist.github.com/114476
# .gitignore for .NET projects
# Thanks to Derick Bailey
# http://www.lostechies.com/blogs/derickbailey/archive/2009/05/18/a-net-c-developer-s-gitignore-file.aspx
# Additional Thanks to
# - Alexey Abramov

# Standard VS.NET and ReSharper Foo
obj
bin
Bin
*.csproj.user
*ReSharper*
*resharper*
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.cache
Thumbs.db
*.dotCover
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

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

# NuGet Packages Directory
packages

# Other useful stuff
*.bak
*.cache
# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
project.fragment.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.swp
*.user
_compareTemp
_notes
aspnet_client
httpd.parse.errors

# Office Temp Files
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
#*.pubxml
*.publishproj

# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
ClientBin/
~$*

# If you have a deploy folder
# deploy
# deploy/*

# Exclude ALL DLLs? (
# *.dll
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# 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
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

# CodeRush
.cr/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
File renamed without changes.
6 changes: 5 additions & 1 deletion README.markdown → README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Gemini

[![Build status](https://ci.appveyor.com/api/projects/status/jwagos6igfdgx819/branch/master?svg=true)](https://ci.appveyor.com/project/tgjones/gemini/branch/master) [![Issue Stats](http://www.issuestats.com/github/tgjones/gemini/badge/pr)](http://www.issuestats.com/github/tgjones/gemini) [![Issue Stats](http://www.issuestats.com/github/tgjones/gemini/badge/issue)](http://www.issuestats.com/github/tgjones/gemini) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/tgjones/gemini)
[![Build status](https://ci.appveyor.com/api/projects/status/jwagos6igfdgx819/branch/master?svg=true)](https://ci.appveyor.com/project/tgjones/gemini/branch/master)
[![NuGet](https://img.shields.io/nuget/v/GeminiWpf.svg)](https://www.nuget.org/packages/GeminiWpf/)
[![Issue Stats](http://www.issuestats.com/github/tgjones/gemini/badge/pr?style=flat)](http://www.issuestats.com/github/tgjones/gemini)
[![Issue Stats](http://www.issuestats.com/github/tgjones/gemini/badge/issue?style=flat)](http://www.issuestats.com/github/tgjones/gemini)
[![Join the chat at https://gitter.im/tgjones/gemini](https://badges.gitter.im/tgjones/gemini.svg)](https://gitter.im/tgjones/gemini?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

## What is this?

Expand Down
28 changes: 21 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ init:
- ps: >-
$parsedReleaseBuildVersion = $env:APPVEYOR_REPO_TAG_NAME -Match "(\d+.\d+.\d+(.\d+)?)"
If($env:appveyor_repo_tag -AND $parsedReleaseBuildVersion) {
if ($env:appveyor_repo_tag -AND $parsedReleaseBuildVersion) {
$env:BuildVersion = $matches[0]
$env:IsGithubRelease = $TRUE
}
Expand All @@ -15,20 +15,34 @@ init:
$env:IsGithubRelease = ""
}
Write-Host "Build Version: " $env:BuildVersion
Write-Host "Tag name: " $env:appveyor_repo_tag
Write-Host "Commit: " $env:APPVEYOR_REPO_COMMIT_MESSAGE
Write-Host "Commit extended:" $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED
write-host -NoNewline "Build Version: ";
write-host $env:BuildVersion -foregroundcolor "Yellow";
Write-Host "appveyor_build_version Variable: " $env:appveyor_build_version
write-host -NoNewline "Tag name: ";
write-host $env:appveyor_repo_tag -foregroundcolor "Yellow";
write-host -NoNewline "Commit: ";
write-host $env:APPVEYOR_REPO_COMMIT_MESSAGE -foregroundcolor "Yellow";
write-host -NoNewline "Commit extended: ";
write-host $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED -foregroundcolor "Yellow";
write-host -NoNewline "appveyor_build_version Variable: ";
write-host $env:appveyor_build_version -foregroundcolor "Yellow";
assembly_info:
patch: true
file: '**\AssemblyInfo.*'
assembly_version: $(BuildVersion)
assembly_file_version: $(BuildVersion)
assembly_informational_version: $(BuildVersion)

install:
- ps: .\scripts\install-xna.ps1

cache:
- XNAGS40_setup.exe

before_build:
- cmd: cd src
- cmd: nuget restore
Expand Down
Binary file removed lib/Xceed.Wpf.AvalonDock.Themes.VS2013.dll
Binary file not shown.
Loading

0 comments on commit ecea16c

Please sign in to comment.