Browse Source

Attempt fix build

Former-commit-id: 33d7084038afc80a27153dc4596deb6aa8d433cb
Former-commit-id: 00a97eb3672b6afe23d1a87f47fe61b426b2f25e
Former-commit-id: 74bc2c10a4154b6ce917d883191521fd0a77ce63
af/merge-core
James Jackson-South 11 years ago
parent
commit
85df0962a2
  1. 248
      .gitignore
  2. 6
      NuGet.config
  3. 2
      src/ImageProcessor/project.lock.json.REMOVED.git-id
  4. 2
      tests/ImageProcessor.Tests/project.json
  5. 2
      tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id

248
.gitignore

@ -1,52 +1,50 @@
#################
## Eclipse
#################
*.pydevproject
.project
.metadata
bin/**
tmp/**
tmp/**/*
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch
# CDT-specific
.cproject
# PDT-specific
.buildpath
#################
## Visual Studio
#################
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Build results
**/[Dd]ebug/
**/[Rr]elease/
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/
# Visual Studo 2015 cache/options directory
.vs/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUNIT
*.VisualState.xml
TestResult.xml
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
# ASP.NET 5
project.lock.json
artifacts/
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
@ -60,15 +58,17 @@ local.properties
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
**/*.dotCover
# Xamarin
*.userprefs
*.pidb
*.svclog
*.scc
## TODO: If you have NuGet Package Restore enabled, uncomment this
packages/
# Chutzpah Test files
_Chutzpah*
# Visual C++ cache files
ipch/
@ -76,16 +76,46 @@ ipch/
*.ncb
*.opensdf
*.sdf
*.cachefile
# Visual Studio profiler
*.psess
*.vsp
*.vspx
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# JustCode is a .NET coding addin-in
.JustCode
# TeamCity is a build add-in
_TeamCity*
# Installshield output folder
[Ee]xpress
# DotCover is a Code Coverage Tool
*.dotCover
# NCrunch
_NCrunch_*
.*crunch*.local.xml
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
@ -98,83 +128,81 @@ DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish
publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# Windows Azure Build Output
csx/
*.build.csdef
# Windows Store app package directory
AppPackages/
# Others
[Bb]in
[Oo]bj
sql
TestResults
*.Cache
ClientBin
stylecop.*
!stylecop.json
*.[Cc]ache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
Generated_Code #added for RIA/Silverlight projects
# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
# SQL Server files
*.mdf
*.ldf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
############
## Windows
############
# Windows image file caches
Thumbs.db
# Folder config file
Desktop.ini
# Microsoft Fakes
FakesAssemblies/
#############
## Python
#############
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
*.py[co]
# Visual Studio 6 build log
*.plg
# Packages
*.egg
*.egg-info
dist
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
# Installer logs
pip-log.txt
# Unit test / coverage reports
.coverage
.tox
#Translations
*.mo
#Mr Developer
.mr.developer.cfg
# Mac crap
.DS_Store
build/_BuildOutput/
build/*.nupkg
build/TestResult.xml
*.db
_site/
.vs/config/applicationhost.config
# Visual Studio 6 workspace options file
*.opt
**/node_modules
**/node_modules/*
**/TestOutput
project.lock.json
# ASP.NET 5
project.lock.json
artifacts/

6
NuGet.config

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

2
src/ImageProcessor/project.lock.json.REMOVED.git-id

@ -1 +1 @@
869b4da8e5d4467a9e8fe7af0413a80080cd8f15
0b32043447c786c20468c00c3c0924348b389517

2
tests/ImageProcessor.Tests/project.json

@ -21,7 +21,7 @@
"Microsoft.NETCore": "5.0.1-beta-23409",
"Microsoft.NETCore.Platforms": "1.0.1-beta-23409",
"xunit": "2.1.0-*",
"xunit.runner.dnx": "2.1.0-*"
"xunit.runner.dnx": "2.1.0-rc1-build204"
},
"commands": {
"test": "xunit.runner.dnx"

2
tests/ImageProcessor.Tests/project.lock.json.REMOVED.git-id

@ -1 +1 @@
e6a19da5fae2d14f8371b848e58732e830f6e7d7
f1aaccbe80975734912104302393522b88b9b235
Loading…
Cancel
Save