Feature/new new csproj 5x #2717
Merged
Conversation
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
* moved solely to new new csproj file, removing old project.json/xproj stuff and cleaning up existing csproj files * fixed dependencies of all projects now compiles in 2017 using the new new csproj files * fixate global.json to SDK tooling 1.0.1 and fix annoying warnings * Moved to new new csproj file * remove azure deployment file * post rebase touchups, added new dependencies to DocGenerator * DocGenerator now uses latest roslyn and is able to load new new csproj files. It also returns an exit code of 1 in case something bad happens which should fail the build * post rebase fixes, mainly making sure we bumped the same versions as in 5.x master and 2.x * versioning of assembly, file and product now exactly the same as before the move to new new csproj * travis still called build quick this is now called 'build inc' * removed quick target from build.sh * add dotnet 1.0.1 as dep for travis * move travis to trusty * added dotnetcore only sln for non windows platforms pending #dotnet/sdk/826 * dotnet core on non windows does not support signing or embedded pdbs * updated Bogus to version that depends on 10.0.1 * added explicit appveyor.yml * update appveyor.yml * update appveyor.yml * make test disposable more resilliant on linux Conflicts: src/CodeGeneration/ApiGenerator/ApiGenerator.csproj src/CodeGeneration/ApiGenerator/Properties/AssemblyInfo.cs src/CodeGeneration/DocGenerator/Properties/AssemblyInfo.cs src/Elasticsearch.Net/Properties/AssemblyInfo.cs src/Elasticsearch.Net/project.json src/Nest/Nest.csproj src/Nest/Properties/AssemblyInfo.cs src/Nest/project.json src/Tests/Framework/ManagedElasticsearch/Tasks/InstallationTasks/InstallPlugins.cs src/Tests/Properties/AssemblyInfo.cs src/Tests/Tests.csproj src/Tests/project.json
…new csproj file changes in
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport of #2711 to
5.x