Merge dev into master for typewriter release

.github/pull_request_template.md

@@ -0,0 +1,13 @@
+## Summary
+
+Give a description of what your pull request does and what platform[s] it targets. Use the *breaking changes* tag if applicable. Breaking changes can include changes to generated code files which will impact API signature or behaviors, and changes to directory structures which may impact DevOp pipelines and scripts.
+
+## Generated code differences
+
+Pull requests that result in changes to generated code and/or directory structures should include example diffs of the resulting changes. This makes code review much easier.
+
+## Command line arguments to run these changes
+
+Provide the command line arguments here so that reviewers can quickly repro the results of changes.
+
+## Links to issues or work items this PR addresses

.nuget/nuget.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
-</configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="O365 Exchange ADO" value="https://o365exchange.pkgs.visualstudio.com/_packaging/MicrosoftGraph/nuget/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>

GraphODataTemplateWriter.Test/ContainmentTests.cs

@@ -57,7 +57,7 @@ public void TestImplicitEntitySet()
             var type = model.GetEntityTypes().Where(t => t.Name == "testEntity").First();
             var prop = type.Properties.Where(p => p.Name == "testNav").First();
 
-            OdcmProperty result = OdcmModelExtensions.GetServiceCollectionNavigationPropertyForPropertyType(prop);
+            OdcmProperty result = OdcmModelExtensions.GetServiceCollectionNavigationPropertyForPropertyType(prop, model);
             var singleton = model.GetEntityTypes().Where(t => t.Name == "testSingleton").First();
             Assert.AreEqual(singleton.Name, result.Name);
         }
@@ -72,7 +72,7 @@ public void TestNoValidEntitySet()
             var type = model.GetEntityTypes().Where(t => t.Name == "testEntity").First();
             var prop = type.Properties.Where(p => p.Name == "testInvalidNav").First(); ;
 
-            OdcmProperty result = OdcmModelExtensions.GetServiceCollectionNavigationPropertyForPropertyType(prop);
+            OdcmProperty result = OdcmModelExtensions.GetServiceCollectionNavigationPropertyForPropertyType(prop, model);
             Assert.IsNull(result);
         }
 
@@ -86,7 +86,7 @@ public void TestExplicitEntitySet()
             var type = model.GetEntityTypes().Where(t => t.Name == "testEntity").First();
             var prop = type.Properties.Where(p => p.Name == "testExplicitNav").First();
 
-            OdcmProperty result = OdcmModelExtensions.GetServiceCollectionNavigationPropertyForPropertyType(prop);
+            OdcmProperty result = OdcmModelExtensions.GetServiceCollectionNavigationPropertyForPropertyType(prop, model);
 
             var entitySet = model.EntityContainer.Properties.Where(t => t.Name == "testTypes").First();
             Assert.AreEqual(entitySet.Name, result.Name);

GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GraphODataTemplateWriter.Test</RootNamespace>
     <AssemblyName>GraphODataTemplateWriter.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -19,6 +19,7 @@
     <TestProjectType>UnitTest</TestProjectType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,10 +32,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -69,8 +70,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" />
 </Project>

GraphODataTemplateWriter.Test/TypeHelperTests.cs

@@ -91,5 +91,65 @@ public void Description_Doesnt_Contain_Uncommented_NewLine_For_PHP()
 
             Assert.AreEqual(expectedOutputString, sanitizedString, "GetSanitizedLongDescription is not handling escaped CRLF.");
         }
+
+        [TestMethod]
+        public void Namespace_Shouldnt_Contain_Whitespace_For_CSharp()
+        {
+            var testNamespace = new OdcmNamespace("Microsoft.OutlookServices");
+
+            var namespaceName = TypeHelperCSharp.GetNamespaceName(testNamespace);
+
+            Assert.AreEqual(namespaceName, "Microsoft.OutlookServices");
+        }
+
+        [TestMethod]
+        public void Namespace_Should_PascalCase_For_CSharp()
+        {
+            var testNamespace = new OdcmNamespace("microsoft.graph");
+
+            var namespaceName = TypeHelperCSharp.GetNamespaceName(testNamespace);
+
+            Assert.AreEqual(namespaceName, "Microsoft.Graph");
+        }
+
+        [TestMethod]
+        public void PHPMainNamespace_Generated_For_V1()
+        {
+            var testNamespace = "microsoft.graph";
+            const string expectedPHPNamespace = "Microsoft\\Graph";
+
+            var actualPHPNamespace = TypeHelperPHP.GetPHPNamespace(testNamespace);
+            Assert.AreEqual(expectedPHPNamespace, actualPHPNamespace);
+        }
+
+        [TestMethod]
+        public void PHPMainNamespace_Generated_For_Beta()
+        {
+            var testNamespace = "microsoft.graph";
+            const string expectedPHPNamespace = "Beta\\Microsoft\\Graph";
+
+            var actualPHPNamespace = TypeHelperPHP.GetPHPNamespace(testNamespace, "Beta");
+            Assert.AreEqual(expectedPHPNamespace, actualPHPNamespace);
+        }
+
+        [TestMethod]
+        public void PHPSubNamespace_Generated_For_V1()
+        {
+            var testNamespace = "microsoft.graph.callRecords";
+            const string expectedPHPNamespace = "Microsoft\\Graph\\CallRecords";
+
+            var actualPHPNamespace = TypeHelperPHP.GetPHPNamespace(testNamespace);
+            Assert.AreEqual(expectedPHPNamespace, actualPHPNamespace);
+        }
+
+        [TestMethod]
+        public void PHPSubNamespace_Generated_For_Beta()
+        {
+            var testNamespace = "microsoft.graph.callRecords";
+            const string expectedPHPNamespace = "Beta\\Microsoft\\Graph\\CallRecords";
+
+            var actualPHPNamespace = TypeHelperPHP.GetPHPNamespace(testNamespace, "Beta");
+            Assert.AreEqual(expectedPHPNamespace, actualPHPNamespace);
+        }
     }
 }

GraphODataTemplateWriter.Test/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MSTest.TestAdapter" version="1.1.18" targetFramework="net461" />
-  <package id="MSTest.TestFramework" version="1.1.18" targetFramework="net461" />
+  <package id="MSTest.TestAdapter" version="1.2.1" targetFramework="net472" />
+  <package id="MSTest.TestFramework" version="1.2.1" targetFramework="net472" />
 </packages>