Skip to content

Commit

Permalink
Oct2018 update (#313)
Browse files Browse the repository at this point in the history
* Updated base ad hoc functional to save the access token.
* Added DriveItem preview functionality
* Net framework targets should use the Net framework version of System.Net.Http. Fixes #312
* Updated models with updated doc comments
* Bumped version.
  • Loading branch information
MIchaelMainer authored Oct 31, 2018
1 parent 42fc1b8 commit d7607bc
Show file tree
Hide file tree
Showing 192 changed files with 1,123 additions and 183 deletions.
16 changes: 8 additions & 8 deletions src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@
<Description>Microsoft Graph Core Client Library implements core functionality used by Microsoft Graph Client Libraries.</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>Microsoft Graph Core Client Library</AssemblyTitle>
<VersionPrefix>1.11.0</VersionPrefix>
<FileVersion>1.11.0</FileVersion>
<AssemblyVersion>1.11.0</AssemblyVersion>
<VersionPrefix>1.12.0</VersionPrefix>
<FileVersion>1.12.0</FileVersion>
<AssemblyVersion>1.12.0</AssemblyVersion>
<Authors>Microsoft</Authors>
<TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
<PreserveCompilationContext>false</PreserveCompilationContext>
<AssemblyName>Microsoft.Graph.Core</AssemblyName>
<PackageId>Microsoft.Graph.Core</PackageId>
<PackageTags>Microsoft Office365;Graph;GraphServiceClient;Outlook;OneDrive;AzureAD;GraphAPI;Productivity;SharePoint;Intune;SDK</PackageTags>
<PackageReleaseNotes>
September 2018 Release Summary (version 1.11.0)
October 2018 Release Summary (version 1.12.0)

- exposed the HttpProvider constructor
- Retry handler added.
- Added client factory.
- Removed System.Net.Http package reference for .Net target.
</PackageReleaseNotes>
<PackageProjectUrl>https://developer.microsoft.com/graph</PackageProjectUrl>
<PackageLicenseUrl>http://aka.ms/devservicesagreement</PackageLicenseUrl>
Expand All @@ -35,7 +37,7 @@ September 2018 Release Summary (version 1.11.0)
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Version>1.11.0</Version>
<Version>1.12.0</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.1|AnyCPU'">
<DocumentationFile>bin\Release\netstandard1.1\Microsoft.Graph.Core.xml</DocumentationFile>
Expand All @@ -58,8 +60,6 @@ September 2018 Release Summary (version 1.11.0)
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Net.Http" Version="4.3.3" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Microsoft.Graph.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.11.0")]
[assembly: AssemblyFileVersion("1.11.0.0")]
[assembly: AssemblyVersion("1.12.0")]
[assembly: AssemblyFileVersion("1.12.0.0")]

#if DEBUG
[assembly: InternalsVisibleTo("Microsoft.Graph.Core.Test")]
Expand Down
28 changes: 12 additions & 16 deletions src/Microsoft.Graph/Microsoft.Graph.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
<Description>Microsoft Graph Client Library allows you to call Office 365, Azure AD and other Microsoft services through a single unified developer experience.</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>Microsoft Graph Client Library</AssemblyTitle>
<VersionPrefix>1.11.0</VersionPrefix>
<FileVersion>1.11.0</FileVersion>
<AssemblyVersion>1.11.0</AssemblyVersion>
<VersionPrefix>1.12.0</VersionPrefix>
<FileVersion>1.12.0</FileVersion>
<AssemblyVersion>1.12.0</AssemblyVersion>
<Authors>Microsoft</Authors>
<TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
<PreserveCompilationContext>false</PreserveCompilationContext>
<AssemblyName>Microsoft.Graph</AssemblyName>
<PackageId>Microsoft.Graph</PackageId>
<PackageTags>Microsoft Office365;Graph;GraphServiceClient;Outlook;OneDrive;AzureAD;GraphAPI;Productivity;SharePoint;Intune;SDK</PackageTags>
<PackageReleaseNotes>
September 2018 Release Summary (version 1.11.0)
October 2018 Release Summary (version 1.12.0)

- Support the new Security Alerts API
- Updates to the Intune API
- Insights functionality updated for the user entity
- MailTips are now enabled
- Update to the subscription entity and additional documentation comments propagated to the IntelliSense file.
- EducationClass entities now support adding reference navigation to the teachers and members entity collections.
- New DriveItemPreviewRequestBody.cs is the request body content for the preview action bound to the driveItem entity.
- New ItemPreviewInfo.cs is returned by the preview action.
- Added odataType to base types.
- New doc comments for IntelliSense.
- New DriveItemPreviewRequest.cs and DriveItemPreviewRequestBuilder.cs requests. DriveItemRequestBuilder.cs updated to support the DriveItem preview functionality.
- Removed System.Net.Http package reference for .Net target.
</PackageReleaseNotes>
<PackageProjectUrl>https://developer.microsoft.com/graph</PackageProjectUrl>
<PackageLicenseUrl>http://aka.ms/devservicesagreement</PackageLicenseUrl>
Expand All @@ -40,7 +40,7 @@ September 2018 Release Summary (version 1.11.0)
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Version>1.11.0</Version>
<Version>1.12.0</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.1|AnyCPU'">
<DocumentationFile>bin\Release\Microsoft.Graph.xml</DocumentationFile>
Expand All @@ -49,11 +49,6 @@ September 2018 Release Summary (version 1.11.0)
<ItemGroup>
<ProjectReference Include="..\Microsoft.Graph.Core\Microsoft.Graph.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Net.Http" Version="4.3.3">
<!--<ExcludeAssets>All</ExcludeAssets>-->
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="System.Net.Http" />
Expand All @@ -62,5 +57,6 @@ September 2018 Release Summary (version 1.11.0)
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="System.Net.Http" Version="4.3.3" />
</ItemGroup>
</Project>
9 changes: 9 additions & 0 deletions src/Microsoft.Graph/Models/Generated/ActivityHistoryItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,54 +23,63 @@ public partial class ActivityHistoryItem : Entity

/// <summary>
/// Gets or sets status.
/// Set by the server. A status code used to identify valid objects. Values: active, updated, deleted, ignored.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "status", Required = Newtonsoft.Json.Required.Default)]
public Status? Status { get; set; }

/// <summary>
/// Gets or sets active duration seconds.
/// Optional. The duration of active user engagement. if not supplied, this is calculated from the startedDateTime and lastActiveDateTime.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "activeDurationSeconds", Required = Newtonsoft.Json.Required.Default)]
public Int32? ActiveDurationSeconds { get; set; }

/// <summary>
/// Gets or sets created date time.
/// Set by the server. DateTime in UTC when the object was created on the server.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "createdDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? CreatedDateTime { get; set; }

/// <summary>
/// Gets or sets last active date time.
/// Optional. UTC DateTime when the historyItem (activity session) was last understood as active or finished - if null, historyItem status should be Ongoing.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "lastActiveDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? LastActiveDateTime { get; set; }

/// <summary>
/// Gets or sets last modified date time.
/// Set by the server. DateTime in UTC when the object was modified on the server.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "lastModifiedDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? LastModifiedDateTime { get; set; }

/// <summary>
/// Gets or sets expiration date time.
/// Optional. UTC DateTime when the historyItem will undergo hard-delete. Can be set by the client.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "expirationDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? ExpirationDateTime { get; set; }

/// <summary>
/// Gets or sets started date time.
/// Required. UTC DateTime when the historyItem (activity session) was started. Required for timeline history.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "startedDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? StartedDateTime { get; set; }

/// <summary>
/// Gets or sets user timezone.
/// Optional. The timezone in which the user's device used to generate the activity was located at activity creation time. Values supplied as Olson IDs in order to support cross-platform representation.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "userTimezone", Required = Newtonsoft.Json.Required.Default)]
public string UserTimezone { get; set; }

/// <summary>
/// Gets or sets activity.
/// Optional. NavigationProperty/Containment; navigation property to the associated activity.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "activity", Required = Newtonsoft.Json.Required.Default)]
public UserActivity Activity { get; set; }
Expand Down
Loading

0 comments on commit d7607bc

Please sign in to comment.