Skip to content
Snippets Groups Projects
Commit 39b4f63f authored by sbarker's avatar sbarker
Browse files

Merge branch 'release/2.1.1'

parents 998b596d 255f2db6
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks> <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
<Version>2.0.0</Version> <Version>2.1.1</Version>
<Authors>areynold</Authors> <Authors>areynold</Authors>
<Company>Beckman Institute for Advanced Science &amp; Technology; University of Illinois at Urbana-Champaign</Company> <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> <Copyright>Copyright 2018, University of Illinois Board of Trustees</Copyright>
...@@ -11,7 +11,10 @@ ...@@ -11,7 +11,10 @@
<RepositoryUrl>https://gitlab.engr.illinois.edu/beckmancomms/beckmancomms-api-datatransferobjects.git</RepositoryUrl> <RepositoryUrl>https://gitlab.engr.illinois.edu/beckmancomms/beckmancomms-api-datatransferobjects.git</RepositoryUrl>
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<PackageTags>mvc, dto, api, beckman, uiuc, illinois</PackageTags> <PackageTags>mvc, dto, api, beckman, uiuc, illinois</PackageTags>
<PackageReleaseNotes> <PackageReleaseNotes>2.1.1:
* Fixed name of priority attribute.
2.1.0:
* Added a priority to the PersonDto object needed to sort items in the new directory pages.
2.0.0: 2.0.0:
* Add netstandard support. * Add netstandard support.
* Roll in v2 alpha releases. * Roll in v2 alpha releases.
...@@ -76,11 +79,13 @@ ...@@ -76,11 +79,13 @@
0.0.1: 0.0.1:
* Roll in v2 alpha releases. * Roll in v2 alpha releases.
* Package initial v1, v2 data transfer objects. * Package initial v1, v2 data transfer objects.
</PackageReleaseNotes> </PackageReleaseNotes>
<NeutralLanguage>en-US</NeutralLanguage> <NeutralLanguage>en-US</NeutralLanguage>
<AssemblyVersion>2.0.0.0</AssemblyVersion> <AssemblyVersion>2.1.1.0</AssemblyVersion>
<PackageLicenseUrl>https://gitlab.engr.illinois.edu/beckmancomms/beckmancomms-api-datatransferobjects/blob/master/License.md</PackageLicenseUrl> <PackageLicenseUrl>https://gitlab.engr.illinois.edu/beckmancomms/beckmancomms-api-datatransferobjects/blob/master/License.md</PackageLicenseUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<FileVersion>2.1.1.0</FileVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.4|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.4|AnyCPU'">
......
...@@ -101,5 +101,7 @@ namespace BeckmanComms.Api.DataTransferObjects.V2.Directory ...@@ -101,5 +101,7 @@ namespace BeckmanComms.Api.DataTransferObjects.V2.Directory
/// Collection containing staff member's group affiliations. /// Collection containing staff member's group affiliations.
/// </summary> /// </summary>
public IEnumerable<AffiliationDto> Affiliations { get; set; } public IEnumerable<AffiliationDto> Affiliations { get; set; }
public int Priority { get; set; }
} }
} }
\ 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