Skip to content
Snippets Groups Projects
Commit c30c6ab5 authored by areynold's avatar areynold
Browse files

Merge branch 'feature/license' into develop

parents 68e9abeb 9ae07e71
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeckmanComms.Api.DataTransferObjects", "BeckmanComms.Api.DataTransferObjects\BeckmanComms.Api.DataTransferObjects.csproj", "{81DCF81E-9A73-4731-8623-EF75FAE263A7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeckmanComms.Api.DataTransferObjects", "BeckmanComms.Api.DataTransferObjects\BeckmanComms.Api.DataTransferObjects.csproj", "{81DCF81E-9A73-4731-8623-EF75FAE263A7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9E02F2F7-271E-4FBB-AAE0-CCDAE69C2E87}"
ProjectSection(SolutionItems) = preProject
License.md = License.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
......@@ -13,6 +13,7 @@
<PackageTags>mvc, dto, api, beckman, uiuc, illinois</PackageTags>
<PackageReleaseNotes>2.0.0-alpha10 (unreleased):
* Add Status and HomeUnit properties to PersonDto.
* Add NCSA license file.
2.0.0-alpha09:
* Add nullable EventDto recurrence ID.
......@@ -66,6 +67,8 @@
* Package initial v1, v2 data transfer objects.</PackageReleaseNotes>
<NeutralLanguage>en-US</NeutralLanguage>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
<PackageLicenseUrl>https://gitlab.engr.illinois.edu/beckmancomms/beckmancomms-api-datatransferobjects/blob/master/License.md</PackageLicenseUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.4|AnyCPU'">
......
University of Illinois/NCSA
Open Source License
Copyright © 2018, The Beckman Institute for Advanced Science and Technology,
University of Illinois at Urbana-Champaign. All rights reserved.
Developed by:
Beckman Communications Office
The Beckman Institute for Advanced Science and Technology
University of Illinois at Urbana-Champaign
<https://beckman.illinois.edu>
```
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution.
Neither the names of The Beckman Institute for Advanced Science and Technology, the University of Illinois at Urbana-Champaign, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission.
```
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment