Merge branch 'master' of https://github.com/Azure/autorest

jianghaolu · May 25, 2016 · 4652810 · 4652810
2 parents 083672e + de936fb
commit 4652810
Show file tree

Hide file tree

Showing 135 changed files with 872 additions and 1,300 deletions.
diff --git a/.gitignore b/.gitignore
@@ -176,8 +176,6 @@ Thumbs.db
 AutoRest/Generators/Ruby/*Tests/Gemfile.lock
 AutoRest/Generators/Ruby/*/RspecTests/Generated/*
 
-#dnx installation
-dnx-clr-win-x86*/
-dnx-coreclr-win-x86*/
-*.lock.json
-/dnx
+#netcore 
+/NetCore
+*.lock.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: csharp
-sudo: false
-mono:
-  - beta
+sudo: required
+dist: trusty
 addons:
   apt:
     sources:
@@ -16,14 +15,7 @@ addons:
     # packages for python
     - python3.5
 install:
-  # Install libunwind required for DNX
-  - wget http://download.savannah.gnu.org/releases/libunwind/libunwind-1.1.tar.gz
-  - tar xzvf libunwind-1.1.tar.gz
-  - libunwind-1.1/configure --prefix=$HOME/.local
-  - make && make install
-  - export LD_LIBRARY_PATH=$HOME/.local/lib/:$LD_LIBRARY_PATH
   # Install npm
-  - curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | sh && source ~/.dnx/dnvm/dnvm.sh && dnvm upgrade
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 4
   - npm install -g npm@'>=1.4.3'
   - npm install
@@ -38,10 +30,12 @@ install:
   - 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
+  - sudo apt-get update
+  - sudo apt-get install dotnet-dev-1.0.0-preview1-002702 -y
 script:
-  - dnvm install 1.0.0-rc1-final -r mono
-  - dnvm install 1.0.0-rc1-final -r coreclr
-  - dnvm use 1.0.0-rc1-final -r coreclr -persistent
   - gulp
 after_script:
   - echo "========== Server log: ============"

diff --git a/AutoRest.sln b/AutoRest.sln
diff --git a/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs b/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Rest.Generator.Logging
     /// <summary>
     /// Code generation aggregate exception.
     /// </summary>
-#if !DNXCORE50
+#if !PORTABLE
     [Serializable]
 #endif
     public class CodeGenerationException : AggregateException
@@ -38,7 +38,7 @@ public CodeGenerationException(string message, Exception innerException) : base(
         {
         }
 
-#if !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Instantiates a new instance of the CodeGenerationException class.
         /// </summary>

diff --git a/...ourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj b/...ourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\xunit.runner.msbuild.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.props" Condition="Exists('..\..\..\..\packages\xunit.runner.msbuild.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.props')" />
   <Import Project="..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -12,10 +13,8 @@
     <RootNamespace>Microsoft.Rest.Generator.AzureResourceSchema.Tests</RootNamespace>
     <RootNamespace>AutoRest.Generator.AzureResourceSchema.Tests</RootNamespace>
     <AssemblyName>AutoRest.Generator.AzureResourceSchema.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs
@@ -70,7 +70,7 @@ public void AzureCustomBaseUriTests()
             using (var client = new AutoRestParameterizedHostTestClient(new TokenCredentials(Guid.NewGuid().ToString())))
             {
                 // small modification to the "host" portion to include the port and the '.'
-                client.Host = string.Format(CultureInfo.InvariantCulture, "{0}.:{1}", client.Host, Fixture.Port);
+                client.Host = string.Format(CultureInfo.InvariantCulture, "{0}:{1}", client.Host, Fixture.Port);
                 Assert.Equal(HttpStatusCode.OK,
                     client.Paths.GetEmptyWithHttpMessagesAsync("local").Result.Response.StatusCode);
             }

diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.csproj b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.csproj
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.xproj b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.xproj
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Azure.CSharp.Tests.xproj b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Azure.CSharp.Tests.xproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0.25123" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25123</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>43dfef27-2fd7-4827-a669-dfd2dd1cbbcc</ProjectGuid>
+    <RootNamespace>Azure.CSharp.Tests</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
diff --git a/...rp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/Models/ErrorException.cs b/...rp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureBodyDuration.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>

diff --git a/....CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/ErrorException.cs b/....CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsAzureCompositeModelClient.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>

diff --git a/...ure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ErrorException.cs b/...ure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>

diff --git a/...s/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureReport/Models/ErrorException.cs b/...s/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureReport/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureReport.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>