aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2018-12-22 09:55:02 -0800
committerRob Mensching <rob@firegiant.com>2018-12-22 10:01:46 -0800
commit8f18a68edca97a944b2fbfeab7a41596b159f146 (patch)
tree137c3042865e32bcfcc484df16bbf46e3bc2bbfa /src
parentf429f6c3710a361446c32d54f398c6db5db89620 (diff)
downloadwix-8f18a68edca97a944b2fbfeab7a41596b159f146.tar.gz
wix-8f18a68edca97a944b2fbfeab7a41596b159f146.tar.bz2
wix-8f18a68edca97a944b2fbfeab7a41596b159f146.zip
Update to latest .gitignore and prep for new NuGet license format
Diffstat (limited to 'src')
-rw-r--r--src/Directory.Build.props1
-rw-r--r--src/dutil/dutil.nuspec3
2 files changed, 3 insertions, 1 deletions
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 @@
17 <Authors>WiX Toolset Team</Authors> 17 <Authors>WiX Toolset Team</Authors>
18 <Company>WiX Toolset</Company> 18 <Company>WiX Toolset</Company>
19 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> 19 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
20 <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
20 <Product>WiX Toolset</Product> 21 <Product>WiX Toolset</Product>
21 </PropertyGroup> 22 </PropertyGroup>
22 23
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 @@
5 <version>$version$</version> 5 <version>$version$</version>
6 <authors>$authors$</authors> 6 <authors>$authors$</authors>
7 <owners>$authors$</owners> 7 <owners>$authors$</owners>
8 <licenseUrl>https://github.com/wixtoolset/dutil/blob/master/LICENSE.TXT</licenseUrl> 8 <!-- <license type="expression">MS-RL</license> -->
9 <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
9 <projectUrl>https://github.com/wixtoolset/dutil</projectUrl> 10 <projectUrl>https://github.com/wixtoolset/dutil</projectUrl>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 <description>$description$</description> 12 <description>$description$</description>