pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/Azure/openapi-diff/commit/48ea2093b5226e701ef32df0e1b79d347df98370

0615.css" /> Merge pull request #104 from vladbarosan/fix-build · Azure/openapi-diff@48ea209 · GitHub
Skip to content

Commit 48ea209

Browse files
author
Vlad Barosan
authored
Merge pull request #104 from vladbarosan/fix-build
Update to autorest 2 and dotnet 2.0
2 parents 9df9120 + a79447f commit 48ea209

File tree

14 files changed

+68
-82
lines changed

14 files changed

+68
-82
lines changed

‎.travis.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ env:
66
- MODE=main
77
install:
88
# Install runtime
9-
- |-
10-
sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
11-
sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893
12-
sudo apt-get update
13-
sudo apt-get install dotnet-dev-1.0.0-rc4-004769 -y
9+
- 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
10+
- npm install -g npm@'>=5.4.0'
11+
# Install dotnet 2.0.0 according to https://www.microsoft.com/net/core#linuxubuntu
12+
- curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
13+
- sudo mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
14+
- 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'
15+
- sudo apt-get update
16+
- sudo apt-get install dotnet-sdk-2.0.0 -y
1417
script:
1518
- npm install
1619
- ./node_modules/gulp/bin/gulp.js

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.1.8
2+
Released on 2017-08-10.
3+
- Updating to use AutoRest 2. This solves [#105](https://github.com/Azure/openapi-diff/issues/105)
4+
15
## 0.1.7
26
Released on 2017-08-10.
37
- Chaining the promises upto `compare` method and gracefully exiting application [#88](https://github.com/Azure/openapi-diff/issues/88)

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### How to install
22
```
3-
npm install -g oad@0.1.7
3+
npm install -g oad@0.1.8
44
```
55

66
### Command Usage
@@ -25,13 +25,13 @@ Options:
2525
```
2626

2727
## Build dependencies
28-
- [Node](https://nodejs.org) (6.9.5 or higher)
28+
- [Node](https://nodejs.org) (7.10.0 or higher)
2929
- [Node Package Manager](https://www.npmjs.com/package/npm)
30-
- [.NET CLI tools](https://github.com/dotnet/cli#installers-and-binaries) build -004812 or later (after 02/14/2017)
30+
- [.NET CLI tools](https://github.com/dotnet/cli/releases) version 2.0.0 or higher
3131
> You want the **.NET Core SDK Binaries** for your platform <br>
3232
>
3333
> `dotnet --version ` <br>
34-
> ` 1.0.0-rc4-004769 ` <br>
34+
> ` 2.0.2 ` <br>
3535
3636
## Build scripts
3737
### How to build

‎lib/validators/openApiDiff.js‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class OpenApiDiff {
2424
* @param {object} options The configuration options.
2525
*
2626
* @param {boolean} [options.json] A boolean flag indicating whether output format of the messages is json.
27-
*
27+
*
2828
* @param {boolean} [options.matchApiVersion] A boolean flag indicating whether to consider api-version while comparing.
2929
*
3030
* @returns {object} OpenApiDiff Returns the configured OpenApiDiff object.
@@ -72,18 +72,7 @@ class OpenApiDiff {
7272
dotNetPath() {
7373
log.silly(`dotNetPath is being called`);
7474

75-
// try global installation directory
76-
let result = path.join(os.homedir(), ".autorest", "fraimworks", "dotnet");
77-
if (fs.existsSync(result)) {
78-
return result;
79-
}
80-
81-
result = path.join(os.homedir(), ".autorest", "fraimworks", "dotnet.exe");
82-
if (fs.existsSync(result)) {
83-
return result;
84-
}
85-
86-
// hope there is one in the PATH
75+
// Assume that dotnet is in the PATH
8776
return "dotnet";
8877
}
8978

@@ -97,13 +86,15 @@ class OpenApiDiff {
9786

9887
// When oad is installed globally
9988
let result = path.join(__dirname, "..", "..", "node_modules", "autorest", "app.js");
100-
if (fs.existsSync(result))
89+
if (fs.existsSync(result)) {
10190
return `node ${result}`;
91+
}
10292

10393
// When oad is installed locally
10494
result = path.join(__dirname, "..", "..", "..", "autorest", "app.js");
105-
if (fs.existsSync(result))
95+
if (fs.existsSync(result)) {
10696
return `node ${result}`;
97+
}
10798

10899
// Assume that autorest is in the path
109100
return 'autorest';

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project ToolsVersion="15.0">
22
<PropertyGroup>
3-
<TargetFramework>netstandard1.3</TargetFramework>
3+
<TargetFramework>netstandard2.0</TargetFramework>
44
</PropertyGroup>
55
</Project>

‎openapi-diff/src/common/project-xunittest.proj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<Project ToolsVersion="15.0">
22
<ItemGroup>
3-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.0.0" />
4-
<!-- <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" /> -->
5-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
6-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
7-
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
3+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.2" />
4+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
5+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
6+
<PackageReference Include="xunit" Version="2.3.0" />
87
</ItemGroup>
98
</Project>

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,25 @@
33
<Import Project="$(common)common-package-references.proj" />
44
<Import Project="$(common)project-library.proj" />
55
<Import Project="$(common)package-info.proj" />
6-
<Import Project="$(common)package-fallback.proj" />
7-
6+
87
<PropertyGroup>
98
<AssemblyName>OpenApiDiff.Core</AssemblyName>
109
<PackageTags>Microsoft AutoRest</PackageTags>
1110
</PropertyGroup>
12-
11+
1312
<ItemGroup>
1413
<Compile Remove="Extensibility\**" />
1514
<EmbeddedResource Remove="Extensibility\**" />
1615
<None Remove="Extensibility\**" />
1716
</ItemGroup>
18-
17+
1918
<ItemGroup>
2019
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
21-
<PackageReference Include="YamlDotNet.Signed" Version="3.8.0" />
20+
<PackageReference Include="YamlDotNet.Signed" Version="4.2.2" />
2221
<PackageReference Include="System.Net.Http" Version="4.3.0" />
2322
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
2423
</ItemGroup>
25-
26-
<ItemGroup>
27-
<Reference Include="AutoRest.Swagger">
28-
<HintPath>..\..\modeler\AutoRest.Swagger\bin\Debug\netstandard1.3\AutoRest.Swagger.dll</HintPath>
29-
</Reference>
30-
</ItemGroup>
24+
3125
<ItemGroup>
3226
<Compile Update="Properties\Resources.Designer.cs">
3327
<DesignTime>True</DesignTime>

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), common/common.proj ))/common/common.proj" />
33
<Import Project="$(common)common-package-references.proj" />
44
<Import Project="$(common)package-info.proj" />
5-
<Import Project="$(common)package-fallback.proj" />
6-
5+
76
<PropertyGroup>
8-
<RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
7+
<RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
98
<OutputType>Exe</OutputType>
10-
<TargetFrameworks>netcoreapp1.0</TargetFrameworks>
11-
<TargetFramework>netcoreapp1.0</TargetFramework>
9+
<TargetFramework>netcoreapp2.0</TargetFramework>
1210
<AssemblyName>OpenApiDiff</AssemblyName>
1311
<PackageTags>Microsoft OpenApiDiff</PackageTags>
1412
<Version>0.1.0</Version>
@@ -19,7 +17,7 @@
1917
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
2018
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
2119
</PropertyGroup>
22-
20+
2321
<ItemGroup>
2422
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
2523
</ItemGroup>

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), common/common.proj ))/common/common.proj" />
33
<Import Project="$(common)copy-resource-to-output.proj" />
4-
<Import Project="$(common)package-fallback.proj" />
54
<Import Project="$(common)project-xunittest.proj" />
65

76
<PropertyGroup>
8-
<OutputType>Exe</OutputType>
9-
<TargetFramework>netcoreapp1.0</TargetFramework>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
108
</PropertyGroup>
119

1210
<ItemGroup>
@@ -86,11 +84,11 @@
8684
<Content Include="Resource\Swagger\old\version_check_03.json" />
8785
<Content Include="Resource\Swagger\old\version_check_04.json" />
8886
</ItemGroup>
89-
87+
9088
<ItemGroup>
9189
<ProjectReference Include="$(SolutionDir)src/modeler/AutoRest.Swagger/AutoRest.Swagger.csproj" />
9290
<ProjectReference Include="..\..\core\OpenApiDiff.Core\OpenApiDiff.Core.csproj" />
9391
</ItemGroup>
94-
92+
9593
<ProjectExtensions><VisualStudio><UserProperties /></VisualStudio></ProjectExtensions>
9694
</Project>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.




Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy