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

Merge branch 'release/2.0.0-alpha10'

parents 444a6583 a4e3153d
No related branches found
Tags 2.0.0-alpha10
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
......
......@@ -2,6 +2,74 @@
<PropertyGroup>
<TargetFramework>net45</TargetFramework>
<Version>2.0.0-alpha10</Version>
<Authors>areynold</Authors>
<Company>Beckman Institute for Advanced Science &amp; Technology; University of Illinois at Urbana-Champaign</Company>
<Copyright>Copyright 2018, University of Illinois Board of Trustees</Copyright>
<Description>Model classes for use with the Beckman Institute web API.</Description>
<PackageProjectUrl>https://gitlab.engr.illinois.edu/beckmancomms/beckmancomms-api-datatransferobjects</PackageProjectUrl>
<RepositoryUrl>https://gitlab.engr.illinois.edu/beckmancomms/beckmancomms-api-datatransferobjects.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>mvc, dto, api, beckman, uiuc, illinois</PackageTags>
<PackageReleaseNotes>2.0.0-alpha10:
* Add Status and HomeUnit properties to PersonDto.
* Add NCSA license file.
* Update nuget packaging instructions for Visual Studio.
2.0.0-alpha09:
* Add nullable EventDto recurrence ID.
* Make EventDto.EndDate nullable.
2.0.0-alpha08:
* Add group type property to GroupDto.
2.0.0-alpha07:
* Add calendar option for digital signs feed.
2.0.0-alpha06:
* Correct bad package build.
2.0.0-alpha05:
* Remove redundant net46 target.
* Remove broken, unused netstandard1.4 target.
2.0.0-alpha04:
* Add DTOs for Event and Calendar API v2.
* Update copyright.
2.0.0-alpha03:
* Use decimal instead of double for DishDto prices.
2.0.0-alpha02:
* Add V2 cafe DTOs.
2.0.0-alpha01:
* Correct class namespaces to reference assembly name.
1.1.0-alpha01:
* Add initial V2 directory DTOs.
1.0.0:
* Migrate to .net standard library project.
* Rename project. (Was Api.DataTransferObjects.).
* Include only live (v1) api DTOs.
0.0.4:
* Correct project link.
* Set System.Xml.XmlSerializer dependency.
0.0.3:
* Correct docstring typo.
0.0.2:
* Add v1, v2 docstrings.
0.0.1:
* 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'">
......
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>BeckmanComms.Api.DataTransferObjects</id>
<version>2.0.0-alpha09</version>
<title>Beckman API Data Transfer Objects</title>
<authors>areynold</authors>
<owners>Beckman Institute; University of Illinois</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectUrl>https://gitlab.engr.illinois.edu/beckmancomms/beckmancomms-api-datatransferobjects</projectUrl>
<description>Model classes for use with the Beckman Institute web API.</description>
<summary>Model classes for use with the Beckman Institute web API.</summary>
<releaseNotes>
2.0.0-alpha09:
* Add nullable EventDto recurrence ID.
* Make EventDto.EndDate nullable.
2.0.0-alpha08:
* Add group type property to GroupDto.
2.0.0-alpha07:
* Add calendar option for digital signs feed.
2.0.0-alpha06:
* Correct bad package build.
2.0.0-alpha05:
* Remove redundant net46 target.
* Remove broken, unused netstandard1.4 target.
2.0.0-alpha04:
* Add DTOs for Event and Calendar API v2.
* Update copyright.
2.0.0-alpha03:
* Use decimal instead of double for DishDto prices.
2.0.0-alpha02:
* Add V2 cafe DTOs.
2.0.0-alpha01:
* Correct class namespaces to reference assembly name.
1.1.0-alpha01:
* Add initial V2 directory DTOs.
1.0.0:
* Migrate to .net standard library project.
* Rename project. (Was Api.DataTransferObjects.).
* Include only live (v1) api DTOs.
0.0.4:
* Correct project link.
* Set System.Xml.XmlSerializer dependency.
0.0.3:
* Correct docstring typo.
0.0.2:
* Add v1, v2 docstrings.
0.0.1:
* Package initial v1, v2 data transfer objects.
</releaseNotes>
<copyright>Copyright 2018, University of Illinois Board of Trustees</copyright>
<language>en-US</language>
<tags>mvc, dto, api, beckman, uiuc, illinois</tags>
<dependencies>
<group targetFramework=".NETFramework4.5">
<dependency id="System.Xml.XmlSerializer" version="4.3.0" />
<dependency id="System.ComponentModel" version="4.3.0" />
</group>
</dependencies>
</metadata>
<files>
<file src="bin\Release\net45\BeckmanComms.Api.DataTransferObjects.dll" target="lib\net45\BeckmanComms.Api.DataTransferObjects.dll" />
<file src="bin\Release\net45\BeckmanComms.Api.DataTransferObjects.pdb" target="lib\net45\BeckmanComms.Api.DataTransferObjects.pdb" />
<file src="bin\Release\shared\BeckmanComms.Api.DataTransferObjects.xml" target="lib\net45\BeckmanComms.Api.DataTransferObjects.xml" />
</files>
</package>
\ No newline at end of file
......@@ -6,19 +6,10 @@ The DTO project should be repackaged and published with each update to the `Api.
## NuGet Packaging Instructions
0. Install [NuGet Package Explorer](https://chocolatey.org/packages/NugetPackageExplorer).
1. Open `Api.DataTransferObjects.nuspec` in NuGet Package Explorer.
* Expand the **lib** tree in the **Package Contents** pane.
2. Open the `Api.DataTransferObjects\bin` directory in file explorer.
3. In Visual Studio, clean the solution in both Debug and Release modes.
4. In Visual Studio, build the solution in both Debug and Release modes.
5. Drag the `.dll`, `.pdb`, and `.xml` objects from the Debug and Release folders in file explore to their respective directories in the NuGet File Explorer **Package Contents** pane.
6. In the **Package Metadata** pane of NuGet Package Explorer, click the icon to edit package metadata.
* Increment the **Version** field using [semantic versioning](http://semver.org/).
* Summarize version changes in the **Release Notes** field.
* Update package dependencies if needed.
7. Save Metadata (**File > Save Metadata As...**) `Api.DataTransferObjects.nuspec` in the Api.DataTransferObjects project folder and commit to version control.
8. Save package (**File > Save As...**) `G:\NuGetFeed\BeckmanComms.Api.DataTransferObjects.{version}`.
Visual Studio 2017 supports creation of NuGet packages from the IDE.
See <https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package-using-visual-studio> for details.
Publish package to `G:\NuGetFeed\BeckmanComms.Api.DataTransferObjects.{version}`.
### Resources
......
......@@ -37,6 +37,16 @@ namespace BeckmanComms.Api.DataTransferObjects.V2.Directory
/// </summary>
public string Title { get; set; }
/// <summary>
/// Staff member's employment/affiliation status.
/// </summary>
public string Status { get; set; }
/// <summary>
/// Staff member's home university unit.
/// </summary>
public string HomeUnit { get; set; }
/// <summary>
/// Staff member's campus address.
/// </summary>
......
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