Update to latest .gitignore and prep for new NuGet license format

author: Rob Mensching <rob@firegiant.com> 2018-12-22 09:55:02 -0800
committer: Rob Mensching <rob@firegiant.com> 2018-12-22 10:01:46 -0800
commit: 8f18a68edca97a944b2fbfeab7a41596b159f146 (patch)
tree: 137c3042865e32bcfcc484df16bbf46e3bc2bbfa
parent: f429f6c3710a361446c32d54f398c6db5db89620 (diff)
download: wix-8f18a68edca97a944b2fbfeab7a41596b159f146.tar.gz
wix-8f18a68edca97a944b2fbfeab7a41596b159f146.tar.bz2
wix-8f18a68edca97a944b2fbfeab7a41596b159f146.zip
3 files changed, 62 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 3c6208a8..3e8a1553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 # User-specific files
+*.rsuser
 *.suo
 *.user
 *.userosscache
@@ -19,16 +20,21 @@
 [Rr]eleases/
 x64/
 x86/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
-# Visual Studio 2015 cache/options directory
+# Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
+# Visual Studio 2017 auto generated files
+Generated\ Files/
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -49,16 +55,21 @@ BenchmarkDotNet.Artifacts/
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
+# StyleCop
+StyleCopReport.xml
+# Files built by Visual Studio
 *_i.c
 *_p.c
-*_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
+*.iobj
 *.pch
 *.pdb
+*.ipdb
 *.pgc
 *.pgd
 *.rsp
@@ -68,6 +79,7 @@ artifacts/
 *.tlh
 *.tmp
 *.tmp_proj
+*_wpftmp.csproj
 *.log
 *.vspscc
 *.vssscc
@@ -96,6 +108,9 @@ ipch/
 *.vspx
 *.sap
+# Visual Studio Trace Files
+*.e2e
 # TFS 2012 Local Workspace
 $tf/
@@ -116,6 +131,10 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -164,11 +183,11 @@ PublishScripts/
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
-**/packages/*
+**/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
-!**/packages/build/
+!**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
+#!**/[Pp]ackages/repositories.config
 # NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets
@@ -192,7 +211,7 @@ _pkginfo.txt
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!?*.[Cc]ache/
 # Others
 ClientBin/
@@ -205,9 +224,15 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
 # Since there are multiple workflows, uncomment next line to ignore bower_components
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
+# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
+**/wwwroot/lib/
 # RIA/Silverlight projects
 Generated_Code/
@@ -219,6 +244,8 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
 # SQL Server files
 *.mdf
@@ -229,6 +256,7 @@ UpgradeLog*.htm
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
+*.rptproj.rsuser
 # Microsoft Fakes
 FakesAssemblies/
@@ -240,9 +268,6 @@ FakesAssemblies/
 .ntvs_analysis.dat
 node_modules/
-# Typescript v1 declaration files
-typings/
 # Visual Studio 6 build log
 *.plg
@@ -271,8 +296,8 @@ paket-files/
 .idea/
 *.sln.iml
-# CodeRush
+# CodeRush personal settings
-.cr/
+.cr/personal
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
@@ -292,4 +317,25 @@ __pycache__/
 *.btp.cs
 *.btm.cs
 *.odx.cs
-*.xsd.cs
-\ No newline at end of file
+*.xsd.cs
+# OpenCover UI analysis results
+OpenCover/
+# Azure Stream Analytics local run output
+ASALocalRun/
+# MSBuild Binary and Structured Log
+*.binlog
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+# Local History for Visual Studio
+.localhistory/
+# BeatPulse healthcheck temp database 
+healthchecksdb
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f09c622b..e853e22d 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -17,6 +17,7 @@
    <Authors>WiX Toolset Team</Authors>
    <Company>WiX Toolset</Company>
    <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
+    <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
    <Product>WiX Toolset</Product>
  </PropertyGroup>
diff --git a/src/dutil/dutil.nuspec b/src/dutil/dutil.nuspec
index fd40b1d9..7cf7483e 100644
--- a/src/dutil/dutil.nuspec
+++ b/src/dutil/dutil.nuspec
@@ -5,7 +5,8 @@
    <version>$version$</version>
    <authors>$authors$</authors>
    <owners>$authors$</owners>
-    <licenseUrl>https://github.com/wixtoolset/dutil/blob/master/LICENSE.TXT</licenseUrl>
+    <!-- <license type="expression">MS-RL</license> -->
+    <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
    <projectUrl>https://github.com/wixtoolset/dutil</projectUrl>
    <requireLicenseAcceptance>false</requireLicenseAcceptance>
    <description>$description$</description>
author	Rob Mensching <rob@firegiant.com>	2018-12-22 09:55:02 -0800
committer	Rob Mensching <rob@firegiant.com>	2018-12-22 10:01:46 -0800
commit	8f18a68edca97a944b2fbfeab7a41596b159f146 (patch)
tree	137c3042865e32bcfcc484df16bbf46e3bc2bbfa
parent	f429f6c3710a361446c32d54f398c6db5db89620 (diff)
download	wix-8f18a68edca97a944b2fbfeab7a41596b159f146.tar.gz wix-8f18a68edca97a944b2fbfeab7a41596b159f146.tar.bz2 wix-8f18a68edca97a944b2fbfeab7a41596b159f146.zip