-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '140542e7c5ceaaa632a9a146a1d603f2cd8acfdd' as 'src/clien…
…t/Java'
- Loading branch information
Showing
3,938 changed files
with
9,481 additions
and
848,384 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,193 +1,23 @@ | ||
| ## Ignore generated code | ||
| PackageTest/NugetPackageTest/Generated | ||
| src/generator/AutoRest.NodeJS.Tests/AcceptanceTests/*.js | ||
|
|
||
| ## Ignore user-specific files, temporary files, build results, etc. | ||
| AutoRest/**/Templates/*.cs | ||
| src/**/Templates/*.cs | ||
|
|
||
| # User-specific files | ||
| *.suo | ||
| *.user | ||
| *.sln.docstates | ||
| .vs | ||
| developer/ | ||
| launchSettings.json | ||
|
|
||
| # Build results | ||
| binaries/ | ||
| [Dd]ebug*/ | ||
| [Rr]elease/ | ||
|
|
||
| [Tt]est[Rr]esult* | ||
| [Bb]uild[Ll]og.* | ||
| [Bb]uild.out | ||
|
|
||
| *_i.c | ||
| *_p.c | ||
| *.ilk | ||
| *.meta | ||
| *.obj | ||
| *.pch | ||
| *.pdb | ||
| *.pgc | ||
| *.pgd | ||
| *.rsp | ||
| *.sbr | ||
| *.tlb | ||
| *.tli | ||
| *.tlh | ||
| *.tmp | ||
| *.vspscc | ||
| *.vssscc | ||
| .builds | ||
|
|
||
| *.pidb | ||
|
|
||
| *.log* | ||
| *.scc | ||
| # Visual C++ cache files | ||
| ipch/ | ||
| *.aps | ||
| *.ncb | ||
| *.opensdf | ||
| *.sdf | ||
|
|
||
| # Visual Studio profiler | ||
| *.psess | ||
| *.vsp | ||
|
|
||
| # VS Code settings | ||
| *.vscode | ||
|
|
||
| # Code analysis | ||
| *.CodeAnalysisLog.xml | ||
|
|
||
| # Guidance Automation Toolkit | ||
| *.gpState | ||
|
|
||
| # ReSharper is a Visual Studio add-in | ||
| _ReSharper*/ | ||
| *.[Rr]e[Ss]harper | ||
|
|
||
| # NCrunch | ||
| *.ncrunch* | ||
| .*crunch*.local.xml | ||
|
|
||
| # Installshield output folder | ||
| [Ee]xpress | ||
|
|
||
| # DocProject is a documentation generator add-in | ||
| DocProject/buildhelp/ | ||
| DocProject/Help/*.HxT | ||
| DocProject/Help/*.HxC | ||
| DocProject/Help/*.hhc | ||
| DocProject/Help/*.hhk | ||
| DocProject/Help/*.hhp | ||
| DocProject/Help/Html2 | ||
| DocProject/Help/html | ||
|
|
||
| # Click-Once directory | ||
| publish | ||
|
|
||
| # Publish Web Output | ||
| *.[Pp]ublish.xml | ||
|
|
||
| # Others | ||
| [Bb]in | ||
| [Oo]bj | ||
| sql | ||
| *.Cache | ||
| ClientBin | ||
| [Ss]tyle[Cc]op.* | ||
| ~$* | ||
| *.dbmdl | ||
|
|
||
| # Build tasks | ||
| [Tt]ools/*.dll | ||
| build | ||
| *.class | ||
| target | ||
| gen | ||
|
|
||
| # Mobile Tools for Java (J2ME) | ||
| .mtj.tmp/ | ||
| tmp | ||
|
|
||
| # Package Files # | ||
| *.jar | ||
| *.war | ||
| *.ear | ||
| *.MF | ||
| .gitrevision | ||
| .gradle | ||
|
|
||
| # Azure Tooling # | ||
| node_modules | ||
| .ntvs_analysis.dat | ||
|
|
||
| # Eclipse # | ||
| *.pydevproject | ||
| .project | ||
| .metadata | ||
| bin/** | ||
| tmp/** | ||
| tmp/**/* | ||
| *.bak | ||
| *.swp | ||
| *~.nib | ||
| local.properties | ||
| .classpath | ||
| .settings/ | ||
| .loadpath | ||
|
|
||
| # Xamarin # | ||
| *.userprefs | ||
| # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml | ||
| hs_err_pid* | ||
|
|
||
| # Other Tooling # | ||
| .classpath | ||
| .project | ||
| target | ||
| build | ||
| reports | ||
| .gradle | ||
| # ide | ||
| .idea | ||
| *.iml | ||
| Tools/7-Zip | ||
| .gitrevision | ||
|
|
||
| # Sensitive files | ||
| *.keys | ||
| *.pfx | ||
| *.cer | ||
| *.pem | ||
| *.jks | ||
|
|
||
| # Backup & report files from converting a project to a new version of VS. | ||
| _UpgradeReport_Files/ | ||
| Backup*/ | ||
| UpgradeLog*.XML | ||
|
|
||
| # NuGet | ||
| packages | ||
|
|
||
| # Mac OS # | ||
| .DS_Store | ||
| .DS_Store? | ||
|
|
||
| # Windows # | ||
| Thumbs.db | ||
|
|
||
| # Mono | ||
| *dll.mdb | ||
| *exe.mdb | ||
|
|
||
| #old nuget restore folder | ||
| .nuget/ | ||
| src/generator/AutoRest.Ruby*Tests/Gemfile.lock | ||
| src/generator/AutoRest.Ruby*/*/RspecTests/Generated/* | ||
|
|
||
| #netcore | ||
| /NetCore | ||
| *.lock.json | ||
|
|
||
| #dnx installation | ||
| dnx-clr-win-x86*/ | ||
| dnx-coreclr-win-x86*/ | ||
| /dnx | ||
|
|
||
| # Gemfile.lock | ||
| Gemfile.lock |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,14 @@ | ||
| language: csharp | ||
| sudo: required | ||
| dist: trusty | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - deadsnakes | ||
| packages: | ||
| # Packages required for android build | ||
| - libc6-i386 | ||
| - lib32stdc++6 | ||
| - lib32gcc1 | ||
| - lib32ncurses5 | ||
| - lib32z1 | ||
| # packages for python | ||
| - python3.5 | ||
| install: | ||
| # Install npm | ||
| - 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 | ||
| # Install ruby dependencies | ||
| - rvm use 2.3.0 --install --binary --fuzzy | ||
| - 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 | ||
| - sudo apt-get update | ||
| - sudo apt-get install dotnet-dev-1.0.0-preview2-003121 -y | ||
| language: android | ||
| android: | ||
| components: | ||
| - build-tools-23.0.1 | ||
| - android-23 | ||
| - platform-tools | ||
| - extra-android-support | ||
| - extra-google-m2repository | ||
| - extra-android-m2repository | ||
| sudo: false | ||
| script: | ||
| - gulp | ||
| after_script: | ||
| - echo "========== Server log: ============" | ||
| - pwd | ||
| - ls -al | ||
| - ls -al TestResults | ||
| - cat TestResults/*.log | ||
| notifications: | ||
| slack: | ||
| secure: d0PFVLcyqcMxNtmZ8JaEpIBzXbUbZCgKs8QtBB5qEIXDnxflSR3AhczlILNhTBKtMEBlwVzsz65yP09XcmvB6xpAfJbHqSRzk2frKa5viPcAD8Wr/NYamt9/UiTCsnql8MqzjVy0tLdMscXKRmsUey4YF570zl0b7gAbq7XTqxM= | ||
| - mvn clean install | ||
| - mvn checkstyle:check | ||
| - cd ./azure-android-client-authentication && ./gradlew check |
Oops, something went wrong.