Browse Source

Attempt fix build

Former-commit-id: 17627fa47f9a739f35f26268ea0cd2168d57d5a7
Former-commit-id: 8560745f0a4eaef18a29f1990d5f1eb29efb75e4
Former-commit-id: 4e4b30dd51b4c4b549b33ca01daf12e391bd5460
af/merge-core
James Jackson-South 11 years ago
parent
commit
d83852bbb2
  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 ## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons. ## files generated by popular Visual Studio add-ons.
# User-specific files # User-specific files
*.suo *.suo
*.user *.user
*.userosscache
*.sln.docstates *.sln.docstates
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Build results # Build results
**/[Dd]ebug/ [Dd]ebug/
**/[Rr]elease/ [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 *_i.c
*_p.c *_p.c
*_i.h
*.ilk *.ilk
*.meta *.meta
*.obj *.obj
@ -60,15 +58,17 @@ local.properties
*.tli *.tli
*.tlh *.tlh
*.tmp *.tmp
*.tmp_proj
*.log
*.vspscc *.vspscc
*.vssscc
.builds .builds
**/*.dotCover *.pidb
*.svclog
# Xamarin *.scc
*.userprefs
## TODO: If you have NuGet Package Restore enabled, uncomment this # Chutzpah Test files
packages/ _Chutzpah*
# Visual C++ cache files # Visual C++ cache files
ipch/ ipch/
@ -76,16 +76,46 @@ ipch/
*.ncb *.ncb
*.opensdf *.opensdf
*.sdf *.sdf
*.cachefile
# Visual Studio profiler # Visual Studio profiler
*.psess *.psess
*.vsp *.vsp
*.vspx
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in # 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 # DotCover is a Code Coverage Tool
[Ee]xpress *.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 is a documentation generator add-in
DocProject/buildhelp/ DocProject/buildhelp/
@ -98,83 +128,81 @@ DocProject/Help/Html2
DocProject/Help/html DocProject/Help/html
# Click-Once directory # 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 # Others
[Bb]in *.[Cc]ache
[Oo]bj ClientBin/
sql [Ss]tyle[Cc]op.*
TestResults
*.Cache
ClientBin
stylecop.*
!stylecop.json
~$* ~$*
*~
*.dbmdl *.dbmdl
Generated_Code #added for RIA/Silverlight projects *.dbproj.schemaview
*.pfx
# Backup & report files from converting an old project file to a newer *.publishsettings
# Visual Studio version. Backup files are not needed, because we have git ;-) 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/ _UpgradeReport_Files/
Backup*/ Backup*/
UpgradeLog*.XML UpgradeLog*.XML
UpgradeLog*.htm
# SQL Server files
*.mdf
*.ldf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
############ # Microsoft Fakes
## Windows FakesAssemblies/
############
# Windows image file caches
Thumbs.db
# Folder config file
Desktop.ini
############# # Node.js Tools for Visual Studio
## Python .ntvs_analysis.dat
#############
*.py[co] # Visual Studio 6 build log
*.plg
# Packages # Visual Studio 6 workspace options file
*.egg *.opt
*.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
**/node_modules **/node_modules
**/node_modules/* **/node_modules/*
**/TestOutput **/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": "5.0.1-beta-23409",
"Microsoft.NETCore.Platforms": "1.0.1-beta-23409", "Microsoft.NETCore.Platforms": "1.0.1-beta-23409",
"xunit": "2.1.0-*", "xunit": "2.1.0-*",
"xunit.runner.dnx": "2.1.0-*" "xunit.runner.dnx": "2.1.0-rc1-build204"
}, },
"commands": { "commands": {
"test": "xunit.runner.dnx" "test": "xunit.runner.dnx"

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

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