Merge master

Author: ginach

.gitignore

@@ -8,6 +8,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.vs/
 
 # Build results
 **/[Dd]ebug/

.nuget/packages.config

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="xunit.runners" version="1.9.2" />
-</packages>
+</packages>
+
+

GraphODataTemplateWriter.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6ACF6CEE-A594-4DFE-9286-C7154E91738B}"
 	ProjectSection(SolutionItems) = preProject
@@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6ACF6C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphODataTemplateWriter", "src\GraphODataTemplateWriter\GraphODataTemplateWriter.csproj", "{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Templates", "Templates\Templates.csproj", "{5F526973-F69E-4C26-B8AD-612590A17A9E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -22,6 +24,8 @@ Global
 		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6B5202F-4F66-428A-AB92-0AAA11BA81DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F526973-F69E-4C26-B8AD-612590A17A9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F526973-F69E-4C26-B8AD-612590A17A9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

LICENSE

@@ -22,4 +22,6 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS 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 IN THE
-SOFTWARE.
+SOFTWARE.
+
+

README.md

@@ -109,6 +109,10 @@ The type of template.
 To set the name of the template using the `Name` format string. You can insert `<Class>`, `<Property>`, `<Method>`, and `<Container>` the values will be replaced by the names of the corresponding object.  If you insert an item that doesn't exist it will be replaced with an empty string.  
 Note: You can also set the template name from inside the template by : `host.SetTemplateName("foo");`
 
+#### Template Editing
+
+The solution contains a non-building project to host the actual T4 templates and make browsing/editing them easier.  New template files will be automatically discovered by this project.
+
 #### Includes/Excludes
 
 There may be specific times when you want to exclude or only process certain objects from the SubProcessor. To Do this you can either set a semicolon delimited list of objects you wanted to include : `Include : foo;bar`. This will only process objects whose names are foo or bar.  The opposite of this is the exclude setting where the SubProcessor will include all objects except for those whose names are in the exclude list, exclude and include can not be used together.

Templates/Android/BaseModel.template.tt

@@ -19,11 +19,11 @@
         if (c is OdcmMethod) {
             return ((OdcmMethod)c).Class.Name.ToUpperFirstChar() + c.Name.Substring(c.Name.IndexOf(".") + 1).ToUpperFirstChar();
         } else if (c is OdcmProperty && c.AsOdcmProperty().IsCollection) {
-            return c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
-        } else if (c is OdcmProperty && c.AsOdcmProperty().Type is OdcmPrimitiveType) {
-            return ClassTypeName(c) + c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
+            return c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
+        } else if (c is OdcmProperty && c.AsOdcmProperty().Projection.Type is OdcmPrimitiveType) {
+            return ClassTypeName(c) + c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
         } else if (c is OdcmProperty) {
-            return c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
+            return c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
         }
         return c.Name.ToUpperFirstChar();
     }
@@ -394,7 +394,7 @@
         if (c is OdcmMethod) {
             return c.AsOdcmMethod().Class.Name.ToUpperFirstChar();
         } else if (c is OdcmProperty && c.AsOdcmProperty().Class is OdcmServiceClass) {
-            return c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
+            return c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
         } else if (c is OdcmProperty) {
             return c.AsOdcmProperty().Class.Name.ToUpperFirstChar();
         }
@@ -584,7 +584,7 @@ public {1} {2}{3}{4} {{";
 
 ";
 
-        foreach (var property in properties.Where(p => !p.Type.Name.Equals("Stream")))
+        foreach (var property in properties.Where(p => !p.Projection.Type.Name.Equals("Stream")))
         {
             var propertyName = property.Name.ToUpperFirstChar();
             var propertyType = "";

Templates/Android/generated/BaseClient.java.tt

@@ -65,7 +65,7 @@ foreach (var prop in model.EntityContainer.Properties)
     /**
      * Gets <#=TypeRequestBuilder(c)#>.
      *
-     * @return the <#=prop.Type.GetTypeString()#>.
+     * @return the <#=prop.Projection.Type.GetTypeString()#>.
      */
     public <#=ITypeRequestBuilder(prop)#> get<#=propertyName#>() {
         return new <#=TypeRequestBuilder(prop)#>(getServiceRoot() + "/<#=prop.Name#>", (<#=IClientType(c)#>)this, null);

Templates/Android/generated/BaseEntityStreamRequestBuilder.java.tt

@@ -89,7 +89,7 @@ if (c.AsOdcmClass() != null)
 #>
 
 <#
-    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Type is OdcmMediaClass))
+    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Projection.Type is OdcmMediaClass))
     {
         var propName = prop.Name.ToCheckedCase();
 #>

Templates/Android/generated/IBaseClient.java.tt

@@ -38,7 +38,7 @@ foreach (var prop in model.EntityContainer.Properties)
     /**
      * Gets <#=TypeRequestBuilder(c)#>.
      *
-     * @return the <#=prop.Type.GetTypeString()#>.
+     * @return the <#=prop.Projection.Type.GetTypeString()#>.
      */
     <#=ITypeRequestBuilder(prop)#> get<#=propertyName#>();
 <#

Templates/Android/generated/IBaseEntityStreamRequestBuilder.java.tt

@@ -65,7 +65,7 @@ if (c.AsOdcmClass() != null)
 #>
 
 <#
-    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Type is OdcmMediaClass))
+    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Projection.Type is OdcmMediaClass))
     {
         var propName = prop.Name.ToCheckedCase();
 #>