Merge branch 'dev' into releaseScripts

microsoftgraph · May 21, 2019 · 5ec8168 · 5ec8168
2 parents 6e7ed02 + fc2116b
commit 5ec8168
Show file tree

Hide file tree

Showing 87 changed files with 3,362 additions and 874 deletions.
diff --git a/Microsoft.Graph.sln b/Microsoft.Graph.sln
@@ -1,26 +1,15 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5E0B65FC-67B7-41F8-87BF-96D6A342C438}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6496B661-8321-4D07-ACC2-B6602649293C}"
-	ProjectSection(SolutionItems) = preProject
-		src\Microsoft.Graph\Constants.cs = src\Microsoft.Graph\Constants.cs
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Graph", "src\Microsoft.Graph\Microsoft.Graph.csproj", "{660FA73B-987D-4085-A230-1B04F7EAEFBC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Graph.Test", "tests\Microsoft.Graph.Test\Microsoft.Graph.Test.csproj", "{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{660FA73B-987D-4085-A230-1B04F7EAEFBC} = {660FA73B-987D-4085-A230-1B04F7EAEFBC}
-		{9F04608C-D845-4445-83B1-E6D4EEE38CBC} = {9F04608C-D845-4445-83B1-E6D4EEE38CBC}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Graph.Core", "src\Microsoft.Graph.Core\Microsoft.Graph.Core.csproj", "{9F04608C-D845-4445-83B1-E6D4EEE38CBC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Graph.Core.Test", "tests\Microsoft.Graph.Core.Test\Microsoft.Graph.Core.Test.csproj", "{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Graph.DotnetCore.Core.Test", "tests\Microsoft.Graph.DotnetCore.Core.Test\Microsoft.Graph.DotnetCore.Core.Test.csproj", "{A337BD4B-5C76-4BC5-8EC2-2EE7B834D030}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Graph.DotnetCore.Test", "tests\Microsoft.Graph.DotnetCore.Test\Microsoft.Graph.DotnetCore.Test.csproj", "{A46FC884-EDDC-4617-9B52-37017A90241D}"
@@ -53,18 +42,6 @@ Global
 		{660FA73B-987D-4085-A230-1B04F7EAEFBC}.Release|x64.Build.0 = Release|Any CPU
 		{660FA73B-987D-4085-A230-1B04F7EAEFBC}.Release|x86.ActiveCfg = Release|Any CPU
 		{660FA73B-987D-4085-A230-1B04F7EAEFBC}.Release|x86.Build.0 = Release|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Debug|ARM.Build.0 = Debug|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Debug|x64.Build.0 = Debug|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Debug|x86.Build.0 = Debug|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Release|ARM.ActiveCfg = Release|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Release|x64.ActiveCfg = Release|Any CPU
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE}.Release|x86.ActiveCfg = Release|Any CPU
 		{9F04608C-D845-4445-83B1-E6D4EEE38CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9F04608C-D845-4445-83B1-E6D4EEE38CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9F04608C-D845-4445-83B1-E6D4EEE38CBC}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -81,18 +58,6 @@ Global
 		{9F04608C-D845-4445-83B1-E6D4EEE38CBC}.Release|x64.Build.0 = Release|Any CPU
 		{9F04608C-D845-4445-83B1-E6D4EEE38CBC}.Release|x86.ActiveCfg = Release|Any CPU
 		{9F04608C-D845-4445-83B1-E6D4EEE38CBC}.Release|x86.Build.0 = Release|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Debug|x64.Build.0 = Debug|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Debug|x86.Build.0 = Debug|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Release|x64.ActiveCfg = Release|Any CPU
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C}.Release|x86.ActiveCfg = Release|Any CPU
 		{A337BD4B-5C76-4BC5-8EC2-2EE7B834D030}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A337BD4B-5C76-4BC5-8EC2-2EE7B834D030}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A337BD4B-5C76-4BC5-8EC2-2EE7B834D030}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -131,9 +96,9 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{660FA73B-987D-4085-A230-1B04F7EAEFBC} = {5E0B65FC-67B7-41F8-87BF-96D6A342C438}
-		{025D498D-0FF5-4BE2-89ED-3D90D407DFFE} = {6496B661-8321-4D07-ACC2-B6602649293C}
 		{9F04608C-D845-4445-83B1-E6D4EEE38CBC} = {5E0B65FC-67B7-41F8-87BF-96D6A342C438}
-		{5169EDAD-1E05-42A5-A241-D6FA78A02C5C} = {6496B661-8321-4D07-ACC2-B6602649293C}
+		{A337BD4B-5C76-4BC5-8EC2-2EE7B834D030} = {6496B661-8321-4D07-ACC2-B6602649293C}
+		{A46FC884-EDDC-4617-9B52-37017A90241D} = {6496B661-8321-4D07-ACC2-B6602649293C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0DB06E6E-58F0-497F-9ECC-00DD03BA9357}

diff --git a/src/Microsoft.Graph/Microsoft.Graph.csproj b/src/Microsoft.Graph/Microsoft.Graph.csproj
@@ -23,24 +23,20 @@
     <!-- VersionPrefix minor version is not required to be manually set. It will be updated automatically. Major and patch versions must be automatically set. -->
     <VersionSuffix>
     </VersionSuffix>
-    <PackageReleaseNotes></PackageReleaseNotes>
+    <PackageReleaseNotes>
+    </PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.1|AnyCPU'">
     <DocumentationFile>bin\Release\Microsoft.Graph.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Graph.Core\Microsoft.Graph.Core.csproj" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System" />
     <Reference Include="System.Net.Http" />
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="Newtonsoft.Json" Version="6.0.1" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="System.Net.Http" Version="4.3.3" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Graph.Core" Version="1.*" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\LICENSE.txt">

diff --git a/...icrosoft.Graph.DotnetCore.Core.Test/Authentication/DelegateAuthenticationProviderTests.cs b/...icrosoft.Graph.DotnetCore.Core.Test/Authentication/DelegateAuthenticationProviderTests.cs
@@ -2,16 +2,12 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using Xunit;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Authentication
 {
+    using System.Net.Http;
+    using System.Net.Http.Headers;
+    using System.Threading.Tasks;
+    using Xunit;
     public class DelegateAuthenticationProviderTests
     {
         [Fact]

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Exceptions/ErrorTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Exceptions/ErrorTests.cs
@@ -2,15 +2,11 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Exceptions
 {
+    using System;
+    using System.Text;
+    using Xunit;
     public class ErrorTests
     {
         [Fact(Skip = "Changed the signature of ServiceException.ToString() in ccecc486cce5769313c0cb59ab56142d1b43ce5a")]

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Exceptions/ServiceExceptionTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Exceptions/ServiceExceptionTests.cs
@@ -2,14 +2,10 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Xunit;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Exceptions
 {
+    using System;
+    using Xunit;
     public class ServiceExceptionTests
     {
         [Fact]

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Extensions/BaseRequestExtensionsTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Extensions/BaseRequestExtensionsTests.cs
@@ -1,12 +1,8 @@
 namespace Microsoft.Graph.DotnetCore.Core.Test.Extensions
 {
     using Microsoft.Graph.DotnetCore.Core.Test.Mocks;
-    using Microsoft.Graph.DotnetCore.Core.Test.Requests;
-    using Moq;
     using System;
-    using System.IO;
     using System.Net.Http;
-    using System.Threading;
     using System.Threading.Tasks;
     using Xunit;
     public class BaseRequestExtensionsTests: IDisposable

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Helpers/ExtractSelectHelperTest.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Helpers/ExtractSelectHelperTest.cs
@@ -2,15 +2,11 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-using Xunit;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Helpers
 {
+    using System;
+    using System.Linq.Expressions;
+    using Xunit;
     public class ExtractSelectHelperTest
     {
         /// <summary>

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Helpers/StringHelperTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Helpers/StringHelperTests.cs
@@ -2,14 +2,9 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Xunit;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Helpers
 {
+    using Xunit;
     public class StringHelperTests
     {
         [Fact]

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Helpers/UrlHelperTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Helpers/UrlHelperTests.cs
@@ -2,14 +2,10 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Xunit;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Helpers
 {
+    using System;
+    using Xunit;
     public class UrlHelperTests
     {
         [Fact]

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Microsoft.Graph.DotnetCore.Core.Test.csproj b/tests/Microsoft.Graph.DotnetCore.Core.Test/Microsoft.Graph.DotnetCore.Core.Test.csproj
@@ -13,11 +13,12 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+  <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.Graph.Core\Microsoft.Graph.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Graph" Version="1.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="xunit" Version="2.2.0" />

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/ExceptionHttpMessageHandler.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/ExceptionHttpMessageHandler.cs
@@ -2,15 +2,12 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Mocks
 {
+    using System;
+    using System.Net.Http;
+    using System.Threading;
+    using System.Threading.Tasks;
     public class ExceptionHttpMessageHandler : HttpMessageHandler
     {
         private Exception exceptionToThrow;

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/MockHttpProvider.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/MockHttpProvider.cs
@@ -2,15 +2,11 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Mocks
 {
+    using Moq;
+    using System.Net.Http;
+    using System.Threading.Tasks;
     public class MockHttpProvider : Mock<IHttpProvider>
     {
         public MockHttpProvider(HttpResponseMessage httpResponseMessage, ISerializer serializer = null)

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/MockProgress.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/MockProgress.cs
@@ -2,14 +2,10 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Mocks
 {
+    using Moq;
+    using System;
     public class MockProgress : Mock<IProgress<AsyncOperationStatus>>
     {
         public MockProgress()

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/MockRedirctHandler.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/MockRedirctHandler.cs
@@ -2,12 +2,11 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Threading;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Mocks
 {
+    using System.Net.Http;
+    using System.Threading.Tasks;
+    using System.Threading;
     public class MockRedirectHandler : HttpMessageHandler
     {
         private HttpResponseMessage _response1

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/MockSerializer.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/MockSerializer.cs
@@ -2,14 +2,9 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Mocks
 {
+    using Moq;
     public class MockSerializer : Mock<ISerializer>
     {
         public MockSerializer()

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/TestHttpMessageHandler.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/TestHttpMessageHandler.cs
@@ -2,15 +2,13 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace Microsoft.Graph.DotnetCore.Core.Test.Mocks
 {
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Threading;
+    using System.Threading.Tasks;
     public class TestHttpMessageHandler : HttpMessageHandler
     {
         private Action<HttpRequestMessage> requestMessageDelegate;