huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rel/2.0.0-preview2' into dev

This commit is contained in:
= 2017-06-21 17:10:08 -07:00
parent 2d1a4e33af fc502c7645
commit 7d3461eed4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/repo.targets
View File

@ -381,7 +381,7 @@
<InstallerMaintainerName>Microsoft</InstallerMaintainerName>
<InstallerMaintainerEmail>nugetaspnet@microsoft.com</InstallerMaintainerEmail>
<InstallerVendor>.NET Foundation</InstallerVendor>
<InstallerLicense>Apache</InstallerLicense>
<InstallerLicense>Apache-2.0</InstallerLicense>
<InstallerPackageRevision>1</InstallerPackageRevision>
<InstallerHomepage>https://www.asp.net/</InstallerHomepage>
<InstallerInstallRoot>/usr/share/dotnet</InstallerInstallRoot>

2
tools/debian_config.json
View File

@ -24,7 +24,7 @@
"copyright": "Microsoft",
"license": {
"type": "Apache",
"type": "Apache-2.0",
"full_text": "Copyright (c) .NET Foundation. All rights reserved.\n\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use\nthese files except in compliance with the License. You may obtain a copy of the\nLicense at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License."
}
}