Update to autorest 2

Author: Vlad Barosan

.travis.yml

@@ -6,11 +6,13 @@ env:
   - MODE=main
 install:
     # Install runtime
-  - |-
-    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-rc4-004769 -y
+  - 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 7.10.0
+  - npm install -g npm@'>=5.4.0'
+  - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
+  - sudo mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
+  - sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
+  - sudo apt-get update
+  - sudo apt-get install dotnet-sdk-2.0.0 -y
 script:
   - npm install
   - ./node_modules/gulp/bin/gulp.js

README.md

@@ -1,6 +1,6 @@
 ### How to install
 ```
-npm install -g [email protected].7
+npm install -g [email protected].8
 ```
 
 ### Command Usage
@@ -27,11 +27,11 @@ Options:
 ## Build dependencies
 - [Node](https://nodejs.org) (6.9.5 or higher)
 - [Node Package Manager](https://www.npmjs.com/package/npm)
-- [.NET CLI tools](https://github.com/dotnet/cli#installers-and-binaries) build -004812 or later (after 02/14/2017)
+- [.NET CLI tools](https://github.com/dotnet/cli/releases) version 2.0.0 or higher
 > You want the **.NET Core SDK Binaries** for your platform <br>
 >
 > `dotnet --version ` <br>
-> ` 1.0.0-rc4-004769 ` <br>
+> ` 2.0.2 ` <br>
 
 ## Build scripts
 ### How to build

lib/validators/openApiDiff.js

@@ -24,7 +24,7 @@ class OpenApiDiff {
    * @param {object} options The configuration options.
    *
    * @param {boolean} [options.json] A boolean flag indicating whether output format of the messages is json.
-   * 
+   *
    * @param {boolean} [options.matchApiVersion] A boolean flag indicating whether to consider api-version while comparing.
    *
    * @returns {object} OpenApiDiff Returns the configured OpenApiDiff object.
@@ -72,18 +72,7 @@ class OpenApiDiff {
   dotNetPath() {
     log.silly(`dotNetPath is being called`);
 
-    // try global installation directory
-    let result = path.join(os.homedir(), ".autorest", "frameworks", "dotnet");
-    if (fs.existsSync(result)) {
-      return result;
-    }
-
-    result = path.join(os.homedir(), ".autorest", "frameworks", "dotnet.exe");
-    if (fs.existsSync(result)) {
-      return result;
-    }
-
-    // hope there is one in the PATH
+    // Assume that dotnet is in the PATH
     return "dotnet";
   }
 
@@ -97,13 +86,15 @@ class OpenApiDiff {
 
     // When oad is installed globally
     let result = path.join(__dirname, "..", "..", "node_modules", "autorest", "app.js");
-    if (fs.existsSync(result))
+    if (fs.existsSync(result)) {
       return `node ${result}`;
+    }
 
     // When oad is installed locally
     result = path.join(__dirname, "..", "..", "..", "autorest", "app.js");
-    if (fs.existsSync(result))
+    if (fs.existsSync(result)) {
       return `node ${result}`;
+    }
 
     // Assume that autorest is in the path
     return 'autorest';

openapi-diff/src/common/package-fallback.proj

@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 </Project>

openapi-diff/src/common/project-library.proj

@@ -3,29 +3,28 @@
   <Import Project="$(common)common-package-references.proj" />
   <Import Project="$(common)project-library.proj" />
   <Import Project="$(common)package-info.proj" />
-  <Import Project="$(common)package-fallback.proj" />
-  
+
   <PropertyGroup>
     <AssemblyName>OpenApiDiff.Core</AssemblyName>
     <PackageTags>Microsoft AutoRest</PackageTags>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <Compile Remove="Extensibility\**" />
     <EmbeddedResource Remove="Extensibility\**" />
     <None Remove="Extensibility\**" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="YamlDotNet.Signed" Version="3.8.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.0" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Reference Include="AutoRest.Swagger">
-      <HintPath>..\..\modeler\AutoRest.Swagger\bin\Debug\netstandard1.3\AutoRest.Swagger.dll</HintPath>
+      <HintPath>..\..\modeler\AutoRest.Swagger\bin\Debug\netstandard2.0\AutoRest.Swagger.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

openapi-diff/src/core/OpenApiDiff.Core/OpenApiDiff.Core.csproj

@@ -2,13 +2,11 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), common/common.proj ))/common/common.proj" />
   <Import Project="$(common)common-package-references.proj" />
   <Import Project="$(common)package-info.proj" />
-  <Import Project="$(common)package-fallback.proj" />
- 
+
   <PropertyGroup>
-    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers> 
+    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>OpenApiDiff</AssemblyName>
     <PackageTags>Microsoft OpenApiDiff</PackageTags>
     <Version>0.1.0</Version>
@@ -19,7 +17,7 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
   </PropertyGroup>
- 
+
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>

openapi-diff/src/core/OpenApiDiff/OpenApiDiff.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), common/common.proj ))/common/common.proj" />
   <Import Project="$(common)copy-resource-to-output.proj" />
-  <Import Project="$(common)package-fallback.proj" />
   <Import Project="$(common)project-xunittest.proj" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -86,11 +85,11 @@
     <Content Include="Resource\Swagger\old\version_check_03.json" />
     <Content Include="Resource\Swagger\old\version_check_04.json" />
   </ItemGroup>
- 
+
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)src/modeler/AutoRest.Swagger/AutoRest.Swagger.csproj" />
     <ProjectReference Include="..\..\core\OpenApiDiff.Core\OpenApiDiff.Core.csproj" />
   </ItemGroup>
- 
+
   <ProjectExtensions><VisualStudio><UserProperties /></VisualStudio></ProjectExtensions>
 </Project>

openapi-diff/src/modeler/AutoRest.Swagger.Tests/AutoRest.Swagger.Tests.csproj

@@ -3,8 +3,7 @@
   <Import Project="$(common)common-package-references.proj" />
   <Import Project="$(common)project-library.proj" />
   <Import Project="$(common)package-info.proj" />
-  <Import Project="$(common)package-fallback.proj" />
-  
+
   <PropertyGroup>
     <AssemblyName>AutoRest.Swagger</AssemblyName>
     <PackageTags>Microsoft AutoRest Generator Extensions</PackageTags>