Update to latest .gitignore and prep for new NuGet license format
Rob Mensching committed
Dec 22, 2018 at 11:08 UTC
8630e9627cf35aef2a924cb55c5b1a2122c2ae65
3 files changed
+62
-14
.gitignore
+59
-13
@@ -4,6 +4,7 @@
4
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
5
6
# User-specific files
7
+*.rsuser
8
*.suo
9
*.user
10
*.userosscache
@@ -19,16 +20,21 @@
20
[Rr]eleases/
21
x64/
22
x86/
23
+[Aa][Rr][Mm]/
24
+[Aa][Rr][Mm]64/
25
bld/
26
[Bb]in/
27
[Oo]bj/
28
[Ll]og/
29
27
-# Visual Studio 2015 cache/options directory
30
+# Visual Studio 2015/2017 cache/options directory
31
.vs/
32
# Uncomment if you have tasks that create the project's static files in wwwroot
33
#wwwroot/
34
35
+# Visual Studio 2017 auto generated files
36
+Generated\ Files/
37
+
38
# MSTest test Results
39
[Tt]est[Rr]esult*/
40
[Bb]uild[Ll]og.*
@@ -49,16 +55,21 @@ BenchmarkDotNet.Artifacts/
55
project.lock.json
56
project.fragment.lock.json
57
artifacts/
52
-**/Properties/launchSettings.json
58
59
+# StyleCop
60
+StyleCopReport.xml
61
+
62
+# Files built by Visual Studio
63
*_i.c
64
*_p.c
56
-*_i.h
65
+*_h.h
66
*.ilk
67
*.meta
68
*.obj
69
+*.iobj
70
*.pch
71
*.pdb
72
+*.ipdb
73
*.pgc
74
*.pgd
75
*.rsp
@@ -68,6 +79,7 @@ artifacts/
79
*.tlh
80
*.tmp
81
*.tmp_proj
82
+*_wpftmp.csproj
83
*.log
84
*.vspscc
85
*.vssscc
@@ -96,6 +108,9 @@ ipch/
108
*.vspx
109
*.sap
110
111
+# Visual Studio Trace Files
112
+*.e2e
113
+
114
# TFS 2012 Local Workspace
115
$tf/
116
@@ -116,6 +131,10 @@ _TeamCity*
131
# DotCover is a Code Coverage Tool
132
*.dotCover
133
134
+# AxoCover is a Code Coverage Tool
135
+.axoCover/*
136
+!.axoCover/settings.json
137
+
138
# Visual Studio code coverage results
139
*.coverage
140
*.coveragexml
@@ -164,11 +183,11 @@ PublishScripts/
183
# NuGet Packages
184
*.nupkg
185
# The packages folder can be ignored because of Package Restore
167
-**/packages/*
186
+**/[Pp]ackages/*
187
# except build/, which is used as an MSBuild target.
169
-!**/packages/build/
188
+!**/[Pp]ackages/build/
189
# Uncomment if necessary however generally it will be regenerated when needed
171
-#!**/packages/repositories.config
190
+#!**/[Pp]ackages/repositories.config
191
# NuGet v3's project.json files produces more ignorable files
192
*.nuget.props
193
*.nuget.targets
@@ -192,7 +211,7 @@ _pkginfo.txt
211
# files ending in .cache can be ignored
212
*.[Cc]ache
213
# but keep track of directories ending in .cache
195
-!*.[Cc]ache/
214
+!?*.[Cc]ache/
215
216
# Others
217
ClientBin/
@@ -205,9 +224,15 @@ ClientBin/
224
*.publishsettings
225
orleans.codegen.cs
226
227
+# Including strong name files can present a security risk
228
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
229
+#*.snk
230
+
231
# Since there are multiple workflows, uncomment next line to ignore bower_components
232
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
233
#bower_components/
234
+# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
235
+**/wwwroot/lib/
236
237
# RIA/Silverlight projects
238
Generated_Code/
@@ -219,6 +244,8 @@ _UpgradeReport_Files/
244
Backup*/
245
UpgradeLog*.XML
246
UpgradeLog*.htm
247
+ServiceFabricBackup/
248
+*.rptproj.bak
249
250
# SQL Server files
251
*.mdf
@@ -229,6 +256,7 @@ UpgradeLog*.htm
256
*.rdl.data
257
*.bim.layout
258
*.bim_*.settings
259
+*.rptproj.rsuser
260
261
# Microsoft Fakes
262
FakesAssemblies/
@@ -240,9 +268,6 @@ FakesAssemblies/
268
.ntvs_analysis.dat
269
node_modules/
270
243
-# Typescript v1 declaration files
244
-typings/
245
-
271
# Visual Studio 6 build log
272
*.plg
273
@@ -271,8 +296,8 @@ paket-files/
296
.idea/
297
*.sln.iml
298
274
-# CodeRush
275
-.cr/
299
+# CodeRush personal settings
300
+.cr/personal
301
302
# Python Tools for Visual Studio (PTVS)
303
__pycache__/
@@ -292,4 +317,25 @@ __pycache__/
317
*.btp.cs
318
*.btm.cs
319
*.odx.cs
295
-*.xsd.cs
\ No newline at end of file
320
+*.xsd.cs
321
+
322
+# OpenCover UI analysis results
323
+OpenCover/
324
+
325
+# Azure Stream Analytics local run output
326
+ASALocalRun/
327
+
328
+# MSBuild Binary and Structured Log
329
+*.binlog
330
+
331
+# NVidia Nsight GPU debugger configuration file
332
+*.nvuser
333
+
334
+# MFractors (Xamarin productivity tool) working folder
335
+.mfractor/
336
+
337
+# Local History for Visual Studio
338
+.localhistory/
339
+
340
+# BeatPulse healthcheck temp database
341
+healthchecksdb
src/Directory.Build.props
+1
@@ -17,6 +17,7 @@
17
<Authors>WiX Toolset Team</Authors>
18
<Company>WiX Toolset</Company>
19
<Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
20
+ <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
21
<Product>WiX Toolset</Product>
22
</PropertyGroup>
23
src/wcautil/wcautil.nuspec
+2
-1
@@ -5,7 +5,8 @@
5
<version>$version$</version>
6
<authors>$authors$</authors>
7
<owners>$authors$</owners>
8
- <licenseUrl>https://github.com/wixtoolset/wcautil/blob/master/LICENSE.TXT</licenseUrl>
8
+ <!-- <license type="expression">MS-RL</license> -->
9
+ <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
10
<projectUrl>https://github.com/wixtoolset/wcautil</projectUrl>
11
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12
<description>$description$</description>