-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Feature/new new csproj (#2711) * 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 * update global version number to reflect this branch post merging new new csproj file changes in
- Loading branch information
Showing
60 changed files
with
676 additions
and
12,162 deletions.
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 |
|---|---|---|
|
|
@@ -52,6 +52,7 @@ build/tools/* | |
| !build/*.ps1 | ||
| !build/*.nuspec | ||
| !build/*.png | ||
| !build/*.targets | ||
| !build/scripts | ||
|
|
||
|
|
||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <!-- Mark that this target file has been loaded. --> | ||
| <IsPaketRestoreTargetsFileLoaded>true</IsPaketRestoreTargetsFileLoaded> | ||
| <PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath> | ||
| <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath> | ||
| <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath> | ||
| <!-- Paket command --> | ||
| <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath> | ||
| <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath> | ||
| <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand> | ||
| <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="PaketRestore" BeforeTargets="_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" > | ||
|
|
||
| <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" ' /> | ||
|
|
||
| <PropertyGroup> | ||
| <PaketReferencesFilePath>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references</PaketReferencesFilePath> | ||
| </PropertyGroup> | ||
|
|
||
| <ReadLinesFromFile File="$(PaketReferencesFilePath)" > | ||
| <Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/> | ||
| </ReadLinesFromFile> | ||
|
|
||
| <ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " > | ||
| <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" > | ||
| <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName> | ||
| <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion> | ||
| </PaketReferencesFileLinesInfo> | ||
| <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)"> | ||
| <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile> | ||
| </PropertyGroup> | ||
|
|
||
| </Target> | ||
|
|
||
| <Target Name="PaketDisableDirectPack" AfterTargets="_IntermediatePack" BeforeTargets="GenerateNuspec" > | ||
| <PropertyGroup> | ||
| <ContinuePackingAfterGeneratingNuspec>false</ContinuePackingAfterGeneratingNuspec> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" > | ||
| <PropertyGroup> | ||
| <PaketReferencesFilePath>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references</PaketReferencesFilePath> | ||
| <ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <_NuspecFiles Include="$(BaseIntermediateOutputPath)*.nuspec"/> | ||
| </ItemGroup> | ||
|
|
||
| <Exec Command='$(PaketCommand) fix-nuspec file "@(_NuspecFiles)" references-file "$(PaketReferencesFilePath)" ' /> | ||
|
|
||
| <ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)"> | ||
| <Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" /> | ||
| </ConvertToAbsolutePath> | ||
|
|
||
| <!-- Call Pack --> | ||
| <PackTask PackItem="$(PackProjectInputFile)" | ||
| PackageFiles="@(_PackageFiles)" | ||
| PackageFilesToExclude="@(_PackageFilesToExclude)" | ||
| PackageVersion="$(PackageVersion)" | ||
| PackageId="$(PackageId)" | ||
| Title="$(Title)" | ||
| Authors="$(Authors)" | ||
| Description="$(Description)" | ||
| Copyright="$(Copyright)" | ||
| RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)" | ||
| LicenseUrl="$(PackageLicenseUrl)" | ||
| ProjectUrl="$(PackageProjectUrl)" | ||
| IconUrl="$(PackageIconUrl)" | ||
| ReleaseNotes="$(PackageReleaseNotes)" | ||
| Tags="$(PackageTags)" | ||
| TargetPathsToAssemblies="@(_TargetPathsToAssemblies->'%(FinalOutputPath)')" | ||
| TargetPathsToSymbols="@(_TargetPathsToSymbols)" | ||
| TargetFrameworks="@(_TargetFrameworks)" | ||
| AssemblyName="$(AssemblyName)" | ||
| PackageOutputPath="$(PackageOutputAbsolutePath)" | ||
| IncludeSymbols="$(IncludeSymbols)" | ||
| IncludeSource="$(IncludeSource)" | ||
| PackageTypes="$(PackageType)" | ||
| IsTool="$(IsTool)" | ||
| RepositoryUrl="$(RepositoryUrl)" | ||
| RepositoryType="$(RepositoryType)" | ||
| SourceFiles="@(_SourceFiles->Distinct())" | ||
| NoPackageAnalysis="$(NoPackageAnalysis)" | ||
| MinClientVersion="$(MinClientVersion)" | ||
| Serviceable="$(Serviceable)" | ||
| AssemblyReferences="@(_References)" | ||
| ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)" | ||
| NuspecOutputPath="$(BaseIntermediateOutputPath)" | ||
| IncludeBuildOutput="$(IncludeBuildOutput)" | ||
| BuildOutputFolder="$(BuildOutputTargetFolder)" | ||
| ContentTargetFolders="$(ContentTargetFolders)" | ||
| RestoreOutputPath="$(RestoreOutputAbsolutePath)" | ||
| NuspecFile="$(NuspecFileAbsolutePath)" | ||
| NuspecBasePath="$(NuspecBasePath)" | ||
| NuspecProperties="$(NuspecProperties)"/> | ||
| </Target> | ||
|
|
||
| </Project> |
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,4 +1,10 @@ | ||
| language: csharp | ||
| solution: src/Elasticsearch.sln | ||
| script: ./build.sh quick | ||
| script: ./build.sh inc | ||
| dist: trusty | ||
| mono: 4.6.2 | ||
| dotnet: 1.0.1 | ||
| env: | ||
| global: | ||
| - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 | ||
| - DOTNET_CLI_TELEMETRY_OPTOUT: 1 |
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 |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| version: 1.0.{build} | ||
| image: Visual Studio 2017 | ||
| build_script: | ||
| - cmd: build.bat | ||
| test: off | ||
| environment: | ||
| DOTNET_CLI_TELEMETRY_OPTOUT: true | ||
| DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true |
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
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
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 |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <!-- Default Version numbers --> | ||
| <CurrentVersion>0.0.0-bad</CurrentVersion> | ||
| <CurrentAssemblyVersion>0.0.0</CurrentAssemblyVersion> | ||
| <CurrentAssemblyFileVersion>0.0.0.0</CurrentAssemblyFileVersion> | ||
|
|
||
| <!-- Version and Informational reflect actual version --> | ||
| <Version>$(CurrentVersion)</Version> | ||
| <InformationalVersion>$(CurrentVersion)</InformationalVersion> | ||
| <!-- Assembly version is sticky to MAJOR.0.0.0 to avoid binding redirects because we strong name our assemblies --> | ||
| <AssemblyVersion>$(CurrentAssemblyVersion)</AssemblyVersion> | ||
| <!-- File version reflects actual version number without prelease since that not allowed in its struct --> | ||
| <FileVersion>$(CurrentAssemblyFileVersion)</FileVersion> | ||
|
|
||
| <Authors></Authors> | ||
| <Company></Company> | ||
| <NeutralLanguage></NeutralLanguage> | ||
| <AssemblyTitle></AssemblyTitle> | ||
| <Description></Description> | ||
| <Copyright></Copyright> | ||
| <SignAssembly>true</SignAssembly> | ||
| <AssemblyOriginatorKeyFile Condition="'$(DotNetCoreOnly)'==''">..\..\build\keys\keypair.snk</AssemblyOriginatorKeyFile> | ||
| <GenerateDocumentationFile Condition="'$(DotNetCoreOnly)'==''">true</GenerateDocumentationFile> | ||
| <NoWarn>1591,1572,1571,1573,1587,1570</NoWarn> | ||
| <Prefer32Bit>false</Prefer32Bit> | ||
| <DefineConstants Condition="'$(TargetFramework)'=='netstandard1.3' OR '$(DotNetCoreOnly)'=='1'">$(DefineConstants);DOTNETCORE</DefineConstants> | ||
| <DebugType Condition="'$(DotNetCoreOnly)'==''">embedded</DebugType> | ||
| <SourceLink Condition="'$(DoSourceLink)'!=''">$(BaseIntermediateOutputPath)\sl-$(MsBuildProjectName)-$(TargetFramework).json</SourceLink> | ||
| <RepoUri>https://raw.githubusercontent.com/elastic/elasticsearch-net</RepoUri> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="GenerateSourceLink" BeforeTargets="CoreCompile" Condition="'$(DoSourceLink)'!=''"> | ||
| <Delete Files="$(SourceLink)" Condition="Exists('$(SourceLink)')" /> | ||
| <Exec Command="git rev-parse HEAD" ConsoleToMSBuild="true"> | ||
| <Output TaskParameter="ConsoleOutput" PropertyName="LatestCommit" /> | ||
| </Exec> | ||
| <Exec Command="git rev-parse --show-toplevel" ConsoleToMSBuild="true"> | ||
| <Output TaskParameter="ConsoleOutput" PropertyName="GitRootFolder" /> | ||
| </Exec> | ||
| <WriteLinesToFile File="$(SourceLink)" Lines="{"documents": { "$([System.IO.Path]::GetFullPath('$(GitRootFolder)/').Replace('\','\\'))*" : "$(RepoUri)/$(LatestCommit)/*" }}" /> | ||
| </Target> | ||
| </Project> |
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
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
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
Oops, something went wrong.