Skip to content

Commit ad18399

Browse files
authored
Merge branch 'master' into 215_PersistedDocument
2 parents 6a485da + cf4b149 commit ad18399

File tree

58 files changed

+3365
-195
lines changed

Some content is hidden

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

58 files changed

+3365
-195
lines changed

.gitignore

Lines changed: 257 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,261 @@
1-
# Shamelessly stolen from http://gist.github.com/114476
2-
# .gitignore for .NET projects
3-
# Thanks to Derick Bailey
4-
# http://www.lostechies.com/blogs/derickbailey/archive/2009/05/18/a-net-c-developer-s-gitignore-file.aspx
5-
# Additional Thanks to
6-
# - Alexey Abramov
7-
8-
# Standard VS.NET and ReSharper Foo
9-
obj
10-
bin
11-
Bin
12-
*.csproj.user
13-
*ReSharper*
14-
*resharper*
1+
## Ignore Visual Studio temporary files, build results, and
2+
## files generated by popular Visual Studio add-ons.
3+
4+
# User-specific files
155
*.suo
16-
*.cache
17-
Thumbs.db
18-
*.dotCover
6+
*.user
7+
*.userosscache
8+
*.sln.docstates
9+
10+
# User-specific files (MonoDevelop/Xamarin Studio)
11+
*.userprefs
12+
13+
# Build results
14+
[Dd]ebug/
15+
[Dd]ebugPublic/
16+
[Rr]elease/
17+
[Rr]eleases/
18+
x64/
19+
x86/
20+
bld/
21+
[Bb]in/
22+
[Oo]bj/
23+
[Ll]og/
24+
25+
# Visual Studio 2015 cache/options directory
26+
.vs/
27+
# Uncomment if you have tasks that create the project's static files in wwwroot
28+
#wwwroot/
29+
30+
# MSTest test Results
31+
[Tt]est[Rr]esult*/
32+
[Bb]uild[Ll]og.*
1933

20-
# NuGet Packages Directory
21-
packages
22-
23-
# Other useful stuff
24-
*.bak
25-
*.cache
34+
# NUNIT
35+
*.VisualState.xml
36+
TestResult.xml
37+
38+
# Build Results of an ATL Project
39+
[Dd]ebugPS/
40+
[Rr]eleasePS/
41+
dlldata.c
42+
43+
# DNX
44+
project.lock.json
45+
project.fragment.lock.json
46+
artifacts/
47+
48+
*_i.c
49+
*_p.c
50+
*_i.h
51+
*.ilk
52+
*.meta
53+
*.obj
54+
*.pch
55+
*.pdb
56+
*.pgc
57+
*.pgd
58+
*.rsp
59+
*.sbr
60+
*.tlb
61+
*.tli
62+
*.tlh
63+
*.tmp
64+
*.tmp_proj
2665
*.log
27-
*.swp
28-
*.user
29-
_compareTemp
30-
_notes
31-
aspnet_client
32-
httpd.parse.errors
33-
34-
# Office Temp Files
66+
*.vspscc
67+
*.vssscc
68+
.builds
69+
*.pidb
70+
*.svclog
71+
*.scc
72+
73+
# Chutzpah Test files
74+
_Chutzpah*
75+
76+
# Visual C++ cache files
77+
ipch/
78+
*.aps
79+
*.ncb
80+
*.opendb
81+
*.opensdf
82+
*.sdf
83+
*.cachefile
84+
*.VC.db
85+
*.VC.VC.opendb
86+
87+
# Visual Studio profiler
88+
*.psess
89+
*.vsp
90+
*.vspx
91+
*.sap
92+
93+
# TFS 2012 Local Workspace
94+
$tf/
95+
96+
# Guidance Automation Toolkit
97+
*.gpState
98+
99+
# ReSharper is a .NET coding add-in
100+
_ReSharper*/
101+
*.[Rr]e[Ss]harper
102+
*.DotSettings.user
103+
104+
# JustCode is a .NET coding add-in
105+
.JustCode
106+
107+
# TeamCity is a build add-in
108+
_TeamCity*
109+
110+
# DotCover is a Code Coverage Tool
111+
*.dotCover
112+
113+
# NCrunch
114+
_NCrunch_*
115+
.*crunch*.local.xml
116+
nCrunchTemp_*
117+
118+
# MightyMoose
119+
*.mm.*
120+
AutoTest.Net/
121+
122+
# Web workbench (sass)
123+
.sass-cache/
124+
125+
# Installshield output folder
126+
[Ee]xpress/
127+
128+
# DocProject is a documentation generator add-in
129+
DocProject/buildhelp/
130+
DocProject/Help/*.HxT
131+
DocProject/Help/*.HxC
132+
DocProject/Help/*.hhc
133+
DocProject/Help/*.hhk
134+
DocProject/Help/*.hhp
135+
DocProject/Help/Html2
136+
DocProject/Help/html
137+
138+
# Click-Once directory
139+
publish/
140+
141+
# Publish Web Output
142+
*.[Pp]ublish.xml
143+
*.azurePubxml
144+
# TODO: Comment the next line if you want to checkin your web deploy settings
145+
# but database connection strings (with potential passwords) will be unencrypted
146+
#*.pubxml
147+
*.publishproj
148+
149+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
150+
# checkin your Azure Web App publish settings, but sensitive information contained
151+
# in these scripts will be unencrypted
152+
PublishScripts/
153+
154+
# NuGet Packages
155+
*.nupkg
156+
# The packages folder can be ignored because of Package Restore
157+
**/packages/*
158+
# except build/, which is used as an MSBuild target.
159+
!**/packages/build/
160+
# Uncomment if necessary however generally it will be regenerated when needed
161+
#!**/packages/repositories.config
162+
# NuGet v3's project.json files produces more ignoreable files
163+
*.nuget.props
164+
*.nuget.targets
165+
166+
# Microsoft Azure Build Output
167+
csx/
168+
*.build.csdef
169+
170+
# Microsoft Azure Emulator
171+
ecf/
172+
rcf/
173+
174+
# Windows Store app package directories and files
175+
AppPackages/
176+
BundleArtifacts/
177+
Package.StoreAssociation.xml
178+
_pkginfo.txt
179+
180+
# Visual Studio cache files
181+
# files ending in .cache can be ignored
182+
*.[Cc]ache
183+
# but keep track of directories ending in .cache
184+
!*.[Cc]ache/
185+
186+
# Others
187+
ClientBin/
35188
~$*
36-
37-
# If you have a deploy folder
38-
# deploy
39-
# deploy/*
40-
41-
# Exclude ALL DLLs? (
42-
# *.dll
189+
*~
190+
*.dbmdl
191+
*.dbproj.schemaview
192+
*.jfm
193+
*.pfx
194+
*.publishsettings
195+
node_modules/
196+
orleans.codegen.cs
197+
198+
# Since there are multiple workflows, uncomment next line to ignore bower_components
199+
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
200+
#bower_components/
201+
202+
# RIA/Silverlight projects
203+
Generated_Code/
204+
205+
# Backup & report files from converting an old project file
206+
# to a newer Visual Studio version. Backup files are not needed,
207+
# because we have git ;-)
208+
_UpgradeReport_Files/
209+
Backup*/
210+
UpgradeLog*.XML
211+
UpgradeLog*.htm
212+
213+
# SQL Server files
214+
*.mdf
215+
*.ldf
216+
217+
# Business Intelligence projects
218+
*.rdl.data
219+
*.bim.layout
220+
*.bim_*.settings
221+
222+
# Microsoft Fakes
223+
FakesAssemblies/
224+
225+
# GhostDoc plugin setting file
226+
*.GhostDoc.xml
227+
228+
# Node.js Tools for Visual Studio
229+
.ntvs_analysis.dat
230+
231+
# Visual Studio 6 build log
232+
*.plg
233+
234+
# Visual Studio 6 workspace options file
235+
*.opt
236+
237+
# Visual Studio LightSwitch build output
238+
**/*.HTMLClient/GeneratedArtifacts
239+
**/*.DesktopClient/GeneratedArtifacts
240+
**/*.DesktopClient/ModelManifest.xml
241+
**/*.Server/GeneratedArtifacts
242+
**/*.Server/ModelManifest.xml
243+
_Pvt_Extensions
244+
245+
# Paket dependency manager
246+
.paket/paket.exe
247+
paket-files/
248+
249+
# FAKE - F# Make
250+
.fake/
251+
252+
# JetBrains Rider
253+
.idea/
254+
*.sln.iml
255+
256+
# CodeRush
257+
.cr/
258+
259+
# Python Tools for Visual Studio (PTVS)
260+
__pycache__/
261+
*.pyc
File renamed without changes.

README.markdown renamed to README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Gemini
22

3-
[![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)
3+
[![Build status](https://ci.appveyor.com/api/projects/status/jwagos6igfdgx819/branch/master?svg=true)](https://ci.appveyor.com/project/tgjones/gemini/branch/master)
4+
[![NuGet](https://img.shields.io/nuget/v/GeminiWpf.svg)](https://www.nuget.org/packages/GeminiWpf/)
5+
[![Issue Stats](http://www.issuestats.com/github/tgjones/gemini/badge/pr?style=flat)](http://www.issuestats.com/github/tgjones/gemini)
6+
[![Issue Stats](http://www.issuestats.com/github/tgjones/gemini/badge/issue?style=flat)](http://www.issuestats.com/github/tgjones/gemini)
7+
[![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)
48

59
## What is this?
610

appveyor.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ init:
66
- ps: >-
77
$parsedReleaseBuildVersion = $env:APPVEYOR_REPO_TAG_NAME -Match "(\d+.\d+.\d+(.\d+)?)"
88
9-
If($env:appveyor_repo_tag -AND $parsedReleaseBuildVersion) {
9+
if ($env:appveyor_repo_tag -AND $parsedReleaseBuildVersion) {
1010
$env:BuildVersion = $matches[0]
1111
$env:IsGithubRelease = $TRUE
1212
}
@@ -15,20 +15,34 @@ init:
1515
$env:IsGithubRelease = ""
1616
}
1717
18-
Write-Host "Build Version: " $env:BuildVersion
19-
Write-Host "Tag name: " $env:appveyor_repo_tag
20-
Write-Host "Commit: " $env:APPVEYOR_REPO_COMMIT_MESSAGE
21-
Write-Host "Commit extended:" $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED
18+
write-host -NoNewline "Build Version: ";
19+
write-host $env:BuildVersion -foregroundcolor "Yellow";
2220
23-
Write-Host "appveyor_build_version Variable: " $env:appveyor_build_version
24-
21+
write-host -NoNewline "Tag name: ";
22+
write-host $env:appveyor_repo_tag -foregroundcolor "Yellow";
23+
24+
write-host -NoNewline "Commit: ";
25+
write-host $env:APPVEYOR_REPO_COMMIT_MESSAGE -foregroundcolor "Yellow";
26+
27+
write-host -NoNewline "Commit extended: ";
28+
write-host $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED -foregroundcolor "Yellow";
29+
30+
write-host -NoNewline "appveyor_build_version Variable: ";
31+
write-host $env:appveyor_build_version -foregroundcolor "Yellow";
32+
2533
assembly_info:
2634
patch: true
2735
file: '**\AssemblyInfo.*'
2836
assembly_version: $(BuildVersion)
2937
assembly_file_version: $(BuildVersion)
3038
assembly_informational_version: $(BuildVersion)
3139

40+
install:
41+
- ps: .\scripts\install-xna.ps1
42+
43+
cache:
44+
- XNAGS40_setup.exe
45+
3246
before_build:
3347
- cmd: cd src
3448
- cmd: nuget restore
-125 KB
Binary file not shown.

0 commit comments

Comments
 (0)