Merged and fixed azure/master, moved to new Razor tool

.travis.yml

@@ -6,12 +6,6 @@ addons:
     sources:
     - deadsnakes
     packages:
-    # Packages required for android build
-    - libc6-i386
-    - lib32stdc++6
-    - lib32gcc1
-    - lib32ncurses5
-    - lib32z1
     # packages for python
     - python3.5
 before_install:
@@ -30,12 +24,6 @@ install:
   - gem install bundler
   - bundle install
   - pip install --user tox
-  # Install android SDK
-  - mkdir android
-  - wget -qO- "http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz" | tar -zxv -C ./android
-  - echo y | ./android/android-sdk-linux/tools/android update sdk --all --filter platform-tools,android-23,build-tools-23.0.1 --no-ui --force
-  - echo y | ./android/android-sdk-linux/tools/android update sdk --all --filter extra-android-support,extra-android-m2repository,extra-google-m2repository --no-ui --force
-  - export ANDROID_HOME=`pwd`/android/android-sdk-linux
   # Install NetCore RC2
   - sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' 
   - sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893

README.md

@@ -16,9 +16,35 @@ Alternatively it can be installed from [Chocolatey](https://chocolatey.org/) by
 Nightlies are available via MyGet:
 [![AutoRest MyGet](https://img.shields.io/myget/autorest/vpre/autorest.svg?style=flat-square)](https://www.myget.org/gallery/autorest)
 
-AutoRest can be run on OSX and Unix using Mono or by running Docker container:
-
-	docker pull azuresdk/autorest:latest
+AutoRest can be run on macOS and *nix using [Mono](http://www.mono-project.com/download):
+
+  # Download & Unpack Autorest
+  curl -LO https://github.com/Azure/autorest/releases/download/AutoRest-0.16.0/autorest.0.16.0.zip && \
+  unzip autorest.0.16.0.zip -d autorest/ && \
+  cd autorest && \
+
+  # Download Swagger.json example
+  curl -O https://raw.githubusercontent.com/Azure/autorest/master/Samples/petstore/petstore.json && \
+
+  # Run AutoRest using mono
+  mono AutoRest.exe \
+    -CodeGenerator CSharp \
+    -Input petstore.json \
+    -OutputDirectory CSharp_PetStore -Namespace PetStore
+
+Or [Docker](https://docs.docker.com/engine/installation):
+
+  # Download Swagger.json example
+  curl -O https://raw.githubusercontent.com/Azure/autorest/master/Samples/petstore/petstore.json
+
+  # Download latest AutoRest Docker image
+  docker pull azuresdk/autorest:latest
+
+  # Run AutoRest using Docker, mounting the current folder (pwd) into /home inside the container
+  docker run -it --rm -v $(pwd):/home azuresdk/autorest:latest autorest \
+    -CodeGenerator CSharp \
+    -Input /home/petstore.json \
+    -OutputDirectory /home/CSharp_PetStore -Namespace PetStore
 
 ## Building AutoRest
 AutoRest is developed primarily in C# but generates code for multiple languages. See [this link](docs/developer/guide/building-code.md) to build and test AutoRest.

Samples/petstore/CSharp/Models/XmlSerialization.cs

@@ -0,0 +1,90 @@
+namespace Petstore
+{
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Xml;
+    using System.Xml.Linq;
+    internal static class XmlSerialization
+    {
+        internal delegate bool XmlRootDeserializer<T>( XElement root, out T result );
+        internal delegate bool XmlDeserializer<T>( XElement parent, string propertyName, out T result );
+        internal static XmlRootDeserializer<T> Root<T>( XmlDeserializer<T> deserializer ) =>
+            (XElement root, out T result) => deserializer(new XElement("artificialRoot", root), root.Name.LocalName, out result);
+        private static XmlDeserializer<T> Unroot<T>( XmlRootDeserializer<T> deserializer )
+        {
+            return (XElement parent, string propertyName, out T result) => {
+                result = default(T);
+                var element = parent.Element(propertyName);
+                if (element == null)
+                {
+                    return false;
+                }
+                return deserializer(element, out result);
+            };
+        }
+        private static XmlRootDeserializer<T> ToRootDeserializer<T>( System.Func<XElement, T> unsafeDeserializer )
+            => (XElement root, out T result) => {
+                try
+                {
+                    result = unsafeDeserializer(root);
+                    return true;
+                }
+                catch
+                {
+                    result = default(T);
+                    return false;
+                }};
+        internal static XmlDeserializer<T> ToDeserializer<T>( System.Func<XElement, T> unsafeDeserializer )
+            => Unroot(ToRootDeserializer(unsafeDeserializer));
+        internal static XmlDeserializer<IList<T>> CreateListXmlDeserializer<T>( XmlDeserializer<T> elementDeserializer, string elementTagName = null /*if isWrapped = false*/ )
+        {
+            if (elementTagName != null)
+            {
+                // create non-wrapped deserializer and forward
+                var slave = CreateListXmlDeserializer( elementDeserializer );
+                return (XElement parent, string propertyName, out IList<T> result) => {
+                    result = null;
+                    var wrapper = parent.Element(propertyName);
+                    return wrapper != null && slave(wrapper, elementTagName, out result);
+                };
+            }
+            var rootElementDeserializer = Root(elementDeserializer);
+            return (XElement parent, string propertyName, out IList<T> result) => {
+                result = new List<T>();
+                foreach (var element in parent.Elements(propertyName))
+                {
+                    T elementResult;
+                    if (!rootElementDeserializer(element, out elementResult))
+                    {
+                        return false;
+                    }
+                    result.Add(elementResult);
+                }
+                return true;
+            };
+        }
+        internal static XmlDeserializer<IDictionary<string, T>> CreateDictionaryXmlDeserializer<T>( XmlDeserializer<T> elementDeserializer )
+        {
+            return (XElement parent, string propertyName, out IDictionary<string, T> result) => {
+                result = null;
+                var childElement = parent.Element(propertyName);
+                if (childElement == null)
+                {
+                    return false;
+                }
+                result = new Dictionary<string, T>();
+                foreach (var element in childElement.Elements())
+                {
+                    T elementResult;
+                    if (!elementDeserializer(childElement, element.Name.LocalName, out elementResult))
+                    {
+                        return false;
+                    }
+                    result.Add(element.Name.LocalName, elementResult);
+                }
+                return true;
+            };
+        }
+    }
+}
+

Tools/dockerfiles/Dockerfile

@@ -1,20 +1,20 @@
 FROM mono:4.2
 
-# all in one RUN to produce less, smaller layers
+ARG AUTOREST_VERSION=0.16.0
+
+ADD autorest /opt/autorest/autorest
+
+# all-in-one RUN to produce smaller image with less layers
 RUN apt-get -qqy update && \
 	apt-get -qqy upgrade && \
-	apt-get -qqy install wget unzip && \
+	apt-get -qqy install bsdtar && \
 	apt-get clean && \
-	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN bash -c "\
-	mkdir /opt/autorest && \
-	cd /opt/autorest && \
-	wget https://github.com/Azure/autorest/releases/download/AutoRest-0.16.0/autorest.0.16.0.zip && \
-	unzip autorest.0.16.0.zip"
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
 
-ADD autorest /opt/autorest/autorest
+	curl -#SL https://github.com/Azure/autorest/releases/download/AutoRest-$AUTOREST_VERSION/autorest.$AUTOREST_VERSION.zip | \
+	bsdtar -xvf- -C /opt/autorest/ && \
+	chmod +x /opt/autorest/autorest
 
 ENV PATH "$PATH:/opt/autorest/"
 
-WORKDIR /opt/autorest/
+WORKDIR /opt/autorest/

Tools/setup-developerworkstation.ps1

@@ -13,25 +13,6 @@ write-host -fore Yellow "YES"
 write-host -fore cyan "Info: making temp directory."
 $null = mkdir -ea 0 c:\tmp
 
-Function Get-AndroidHomeFromRegistry
-{
-    if ([environment]::GetEnvironmentVariable("ProgramFiles(x86)")) {
-        $androidRegistryKey = "HKLM:\SOFTWARE\Wow6432Node\Android SDK Tools"
-    }
-    else {
-        $androidRegistryKey = "HKLM:\SOFTWARE\Android SDK Tools"
-    }
-
-    if (Test-Path $androidRegistryKey) {
-        $path = (Get-ItemProperty $androidRegistryKey Path).Path
-
-        if (-not (Test-Path -ea 0 $path)) {
-            $path = $null
-        }
-    }
-    return $path
-}
-
 function DiffPathFromRegistry {
     $u = ([System.Environment]::GetEnvironmentVariable( "path", 'User'))
     $m = ([System.Environment]::GetEnvironmentVariable( "path", 'Machine'))
@@ -72,16 +53,6 @@ if( !(get-command -ea 0 java.exe) ) {
 write-host -fore darkcyan "      Setting JAVA_HOME environment key."
 ([System.Environment]::SetEnvironmentVariable('JAVA_HOME',  (resolve-path "$((get-command -ea 0 javac).Source)..\..\..").Path , "Machine" ))
 
-# install Android SDK
-if( ! (Get-AndroidHomeFromRegistry) ) {
-    write-host -fore cyan "Info: Installing Android SDK."
-    $null = install-package -provider chocolatey android-sdk -force
-    if( ! (Get-AndroidHomeFromRegistry) ) { return write-error "No Android SDK Installed" }
-    # set the environment variable for the user.
-}
-write-host -fore darkcyan "      setting ANDROID_HOME environment key."
-([System.Environment]::SetEnvironmentVariable('ANDROID_HOME', (Get-AndroidHomeFromRegistry) ,'Machine'))
-
 # Install node.js
 if( !(get-command -ea 0 node.exe) ) { 
     write-host -fore cyan "Info: Installing NodeJS."
@@ -307,19 +278,19 @@ if( !(get-command -ea 0 tox.exe) ) {
     if( !(get-command -ea 0 tox.exe) ) { return write-error "No TOX  in PATH." }
 }
 
-# install gradle
-if( !(get-command -ea 0 gradle.bat) ) { 
-    write-host -fore cyan "Info: Downloading Gradle"
-    (New-Object System.Net.WebClient).DownloadFile("https://services.gradle.org/distributions/gradle-3.1-all.zip", "c:\tmp\gradle-3.1-all.zip" )
-    if( !(test-path -ea 0  "c:\tmp\gradle-3.1-all.zip") ) { return write-error "Unable to download Gradle" }
-    write-host -fore darkcyan "      Unpacking Gradle."
-    Expand-Archive C:\tmp\gradle-3.1-all.zip -DestinationPath c:\
-    write-host -fore darkcyan "      Adding gradle to system PATH."
+# install maven
+if( !(get-command -ea 0 mvn.cmd) ) { 
+    write-host -fore cyan "Info: Downloading Maven"
+    (New-Object System.Net.WebClient).DownloadFile("http://www-eu.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip", "c:\tmp\apache-maven-3.3.9-bin.zip" )
+    if( !(test-path -ea 0  "c:\tmp\apache-maven-3.3.9-bin.zip") ) { return write-error "Unable to download Maven" }
+    write-host -fore darkcyan "      Unpacking Maven."
+    Expand-Archive C:\tmp\apache-maven-3.3.9-bin.zip -DestinationPath c:\
+    write-host -fore darkcyan "      Adding mvn to system PATH."
     $p = ([System.Environment]::GetEnvironmentVariable( "path", 'Machine'))
-    $p = "$p;c:\gradle-3.1\bin"
+    $p = "$p;c:\apache-maven-3.3.9\bin"
     ([System.Environment]::SetEnvironmentVariable( "path", $p,  'Machine'))
     ReloadPathFromRegistry
-    if( !(get-command -ea 0 gradle.bat) ) { return write-error "No Gradle in PATH." }
+    if( !(get-command -ea 0 mvn.cmd) ) { return write-error "No Maven in PATH." }
 }
 
 #install go 

Tools/verify-settings.ps1

@@ -203,32 +203,6 @@ function Find-OrAdd ( $cmd , $folders = @("${env:ProgramFiles(x86)}","${env:Prog
     }
 }
 
-Function Get-AndroidHomeFromRegistry
-{
-    # if ([Environment]::Is64BitOperatingSystem)
-    # powershell v1 doesn't have is 64 bit flag.
-    if ([environment]::GetEnvironmentVariable("ProgramFiles(x86)"))
-    {
-        $androidRegistryKey = "HKLM:\SOFTWARE\Wow6432Node\Android SDK Tools"
-    }
-    else
-    {
-        $androidRegistryKey = "HKLM:\SOFTWARE\Android SDK Tools"
-    }
-
-    if (Test-Path $androidRegistryKey)
-    {
-        $path = (Get-ItemProperty $androidRegistryKey Path).Path
-
-        if (-not (Test-Path $path))
-        {
-            $path = $null
-        }
-    }
-
-    return $path
-}
-
 find-orAdd "dotnet.exe" -hint "See: https://www.microsoft.com/net/core#windows"
 find-orAdd "msbuild.exe" -hint "Install Visual studio 2015"
 
@@ -239,7 +213,7 @@ find-orAdd "gulp.cmd" -hint "maybe use 'npm install -g gulp'" -folders @("${env:
 
 find-orAdd "ruby.exe" (@() +  ((dir -ea 0 c:\ruby*).fullname) + @( "${env:ProgramFiles(x86)}","${env:ProgramFiles}","c:\tools")) -hint "see http://rubyinstaller.org/downloads/"
 
-find-orAdd "gradle.bat" ( @( "${env:ProgramFiles(x86)}","${env:ProgramFiles}","c:\tools")) -hint "see http://gradle.org/gradle-download/"
+find-orAdd "mvn.cmd" ( @( "${env:ProgramFiles(x86)}","${env:ProgramFiles}","c:\tools")) -hint "see https://maven.apache.org/download.cgi"
 
 find-orAdd "python.exe" (@() +  ((dir -ea 0 c:\python*).fullname) + @( "${env:ProgramFiles(x86)}","${env:ProgramFiles}","c:\tools")) -hint "https://www.python.org/downloads/"
 find-orAdd "tox.exe" (@() +  ((dir -ea 0 c:\python*).fullname) + @( "${env:ProgramFiles(x86)}","${env:ProgramFiles}","c:\tools"))   -hint "maybe use 'pip install tox'"
@@ -259,19 +233,6 @@ if( (!$env:JAVA_HOME) -or (!(test-path  -PathType Container $env:JAVA_HOME )) )
     }
 }
 
-# use this to add the missing SDK
-# .\Install-AndroidSDK.ps1  -RequestedAndroidPackages android-23 -apilevel 23
-
-if( (!$env:ANDROID_HOME) -or (!(test-path  -PathType Container $env:ANDROID_HOME )) ) {
-    $android = Get-AndroidHomeFromRegistry
-    if (! $android ) {
-        write-host -fore red "Environment variable ANDROID_HOME not set correctly."
-        $failing = $true
-    } else {
-        $env:ANDROID_HOME= $android
-    }
-}
-
 if( !$failing  ) {
     write-host -fore green "`n`nTools/Environment are OK"
 } else {

attic/build.proj.xml

@@ -102,6 +102,7 @@
   <!-- CodeGenerator projects that can be built into packages -->
   <ItemGroup>
     <PackageableLibraries Include="$(LibraryRoot)/src/core/AutoRest/project.json" />
+    <PackageableLibraries Include="$(LibraryRoot)/src/dev/AutoRest.Preview/project.json" />
   </ItemGroup>
 
   <!-- Our Custom Tasks -->
@@ -181,6 +182,7 @@
   <-->
   <ItemGroup>
     <XProjFiles Include="src/core/AutoRest/AutoRest.xproj" />
+    <XProjFiles Include="src/dev/AutoRest.Preview/AutoRest.Preview.xproj" />
     <XProjFiles Include="src/core/AutoRest.Core/AutoRest.Core.xproj" />
     <XProjFiles Include="src/core/AutoRest.Core.Tests/AutoRest.Core.Tests.xproj" />
     <XProjFiles Include="src/core/AutoRest.Extensions/AutoRest.Extensions.xproj" />

attic/gulpfile.js

@@ -361,23 +361,6 @@ gulp.task('regenerate:expected:javaazurefluent', function(cb){
   }, cb);
 })
 
-gulp.task('test:clientruntime:java:init', ['test:java:init'], function(){
-  return gulp.src('./').pipe(shell(basePathOrThrow() + '/gradlew :client-runtime:check'));
-});
-gulp.task('test:clientruntime:javaazure:init', ['test:clientruntime:java:init'], function(){
-  return gulp.src('./').pipe(shell(basePathOrThrow() + '/gradlew :azure-client-runtime:check'));
-});
-
-gulp.task('test:java:init', function(cb){
-   if(fs.existsSync(basePathOrThrow()+'/src/client')){
-     // clean the src/client dir
-     del.sync(['./src/client/'], cb);
-   } 
-   fs.mkdir(basePathOrThrow()+'/src/client/');
-   //clone the Java ClientRuntime repo
-   return gulp.src('./').pipe(shell('git clone --branch v1.0.0-beta3 https://github.com/azure/autorest-clientruntime-for-java.git src/client/Java --depth=1'));
-});
-
 gulp.task('regenerate:expected:java', function(cb){
   mappings = {};
   for (var key in defaultMappings) {
@@ -792,8 +775,8 @@ gulp.task('test:ruby:azure', ['regenerate:expected:rubyazure'], shell.task('ruby
 gulp.task('test:python', function(cb){ runAsync('tox', {cwd: './src/generator/AutoRest.Python.Tests/'}, cb) });
 gulp.task('test:python:azure', function(cb){ runAsync('tox', {cwd: './src/generator/AutoRest.Python.Azure.Tests/'}, cb) });
 
-gulp.task('test:java', ['test:java:init', 'test:clientruntime:java:init', 'test:clientruntime:javaazure:init'], shell.task(basePathOrThrow() + '/gradlew :codegen-tests:check', {cwd: './', verbosity: 3}));
-gulp.task('test:java:azure', shell.task(basePathOrThrow() + '/gradlew :azure-codegen-tests:check', {cwd: './', verbosity: 3}));
+gulp.task('test:java', shell.task('mvn test -pl src/generator/AutoRest.Java.Tests', {verbosity: 3}));
+gulp.task('test:java:azure', shell.task('mvn test -pl src/generator/AutoRest.Java.Azure.Tests', {verbosity: 3}));
 
 gulp.task('test:go', ['regenerate:expected:go'], shell.task([
     'glide up',