Skip to content

Commit d572c6e

Browse files
author
J.F. Larente
authored
Merge pull request #2 from Sitecore/master
Back merging master to develop
2 parents 62ade3a + d945294 commit d572c6e

26 files changed

Lines changed: 1521 additions & 0 deletions

‎sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/.gitattributes‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
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
14+
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

‎sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/.gitignore‎

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

0 commit comments

Comments
 (0)