Skip to content

Alternative to ..\{project}_Net45 folder side-side hack #1933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 21, 2016
Merged

Alternative to ..\{project}_Net45 folder side-side hack #1933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions src/Benchmarking_Net45/Benchmarking.csproj → src/Benchmarking/Benchmarking.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\Benchmarking\bin\Debug\</OutputPath>
<OutputPath>..\Benchmarking\bin\Net45\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -27,7 +27,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Benchmarking\bin\Release\</OutputPath>
<OutputPath>..\Benchmarking\bin\Net45\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -43,29 +43,27 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Benchmarking\**\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
<None Include="..\Benchmarking\App.config" />
<Compile Include="**\*.cs" />
<None Include="App.config" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Elasticsearch.Net_Net45\Elasticsearch.Net.csproj">
<ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj">
<Project>{e97ccf40-0ba6-43fe-9f2d-58d454134088}</Project>
<Name>Elasticsearch.Net</Name>
</ProjectReference>
<ProjectReference Include="..\Nest_Net45\Nest.csproj">
<ProjectReference Include="..\Nest\Nest.csproj">
<Project>{072ba7da-7b60-407d-8b6e-95e3186be70c}</Project>
<Name>Nest</Name>
</ProjectReference>
<ProjectReference Include="..\Tests_Net45\Tests.csproj">
<ProjectReference Include="..\Tests\Tests.csproj">
<Project>{37164c11-88ef-4428-803a-9aa24fb8b44d}</Project>
<Name>Tests</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\.paket\paket.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
Expand Down Expand Up @@ -458,4 +456,4 @@
</ItemGroup>
</When>
</Choose>
</Project>
</Project>
8 changes: 8 additions & 0 deletions src/Benchmarking/Benchmarking.project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"frameworks": {
"net45": {}
},
"runtimes": {
"win": {}
}
}
13 changes: 13 additions & 0 deletions src/Benchmarking/Benchmarking.project.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"locked": false,
"version": 1,
"targets": {
".NETFramework,Version=v4.5": {},
".NETFramework,Version=v4.5/win": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"": [],
".NETFramework,Version=v4.5": []
}
}
0 src/Benchmarking_Net45/paket.references → src/Benchmarking/paket.references
View file
Open in desktop
File renamed without changes.
21 changes: 7 additions & 14 deletions ...et45/CodeGeneration.LowLevelClient.csproj → ...ient/CodeGeneration.LowLevelClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\CodeGeneration.LowLevelClient\bin\Debug\</OutputPath>
<OutputPath>..\CodeGeneration.LowLevelClient\bin\Net45\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -28,7 +28,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\CodeGeneration.LowLevelClient\bin\Release\</OutputPath>
<OutputPath>..\CodeGeneration.LowLevelClient\bin\Net45\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -47,20 +47,13 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\CodeGeneration.LowLevelClient\**\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
<Content Include="..\CodeGeneration.LowLevelClient\**\*.json" Exclude="..\CodeGeneration.LowLevelClient\project.json;..\CodeGeneration.LowLevelClient\project.lock.json;">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Content>
<None Include="..\CodeGeneration.LowLevelClient\App.config" />
<Compile Include="**\*.cs" />
<None Include="App.config" />
<None Include="paket.references" />
<None Include="..\CodeGeneration.LowLevelClient\**\*.cshtml">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</None>
<None Include="**\*.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
Expand Down Expand Up @@ -162,4 +155,4 @@
</ItemGroup>
</When>
</Choose>
</Project>
</Project>
8 changes: 8 additions & 0 deletions src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"frameworks": {
"net45": {}
},
"runtimes": {
"win": {}
}
}
13 changes: 13 additions & 0 deletions ...eGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"locked": false,
"version": 1,
"targets": {
".NETFramework,Version=v4.5": {},
".NETFramework,Version=v4.5/win": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"": [],
".NETFramework,Version=v4.5": []
}
}
0 ...ion.LowLevelClient_Net45/paket.references → ...eneration.LowLevelClient/paket.references
View file
Open in desktop
File renamed without changes.
0 ...LevelClient_Net45/razormachine.readme.txt → ...on.LowLevelClient/razormachine.readme.txt
View file
Open in desktop
File renamed without changes.
14 changes: 6 additions & 8 deletions ...Litterateur_Net45/Nest.Litterateur.csproj → .../Nest.Litterateur/Nest.Litterateur.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\Nest.Litterateur\bin\Debug\</OutputPath>
<OutputPath>..\Nest.Litterateur\bin\Net45\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -29,7 +29,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Nest.Litterateur\bin\Release\</OutputPath>
<OutputPath>..\Nest.Litterateur\bin\Net45\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -39,14 +39,12 @@
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Nest.Litterateur\**\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
<None Include="..\Nest.Litterateur\App.config" />
<Compile Include="**\*.cs" />
<None Include="App.config" />
<None Include="paket.references" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
Expand Down Expand Up @@ -124,4 +122,4 @@
</ItemGroup>
</When>
</Choose>
</Project>
</Project>
8 changes: 8 additions & 0 deletions src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"frameworks": {
"net45": {}
},
"runtimes": {
"win": {}
}
}
13 changes: 13 additions & 0 deletions src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.project.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"locked": false,
"version": 1,
"targets": {
".NETFramework,Version=v4.5": {},
".NETFramework,Version=v4.5/win": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"": [],
".NETFramework,Version=v4.5": []
}
}
0 ...n/Nest.Litterateur_Net45/paket.references → ...eration/Nest.Litterateur/paket.references
View file
Open in desktop
File renamed without changes.
14 changes: 6 additions & 8 deletions ...search.Net_Net45/Elasticsearch.Net.csproj → ...lasticsearch.Net/Elasticsearch.Net.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\Elasticsearch.Net\bin\Debug\</OutputPath>
<OutputPath>..\Elasticsearch.Net\bin\Net45\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -29,11 +29,11 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Elasticsearch.Net\bin\Release\</OutputPath>
<OutputPath>..\Elasticsearch.Net\bin\Net45\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\Elasticsearch.Net\bin\Release\Elasticsearch.Net.XML</DocumentationFile>
<DocumentationFile>..\Elasticsearch.Net\bin\Net45\Release\Elasticsearch.Net.XML</DocumentationFile>
<NoWarn>1591,1572,1571,1573,1587,1570</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
Expand All @@ -54,9 +54,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Elasticsearch.Net\**\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="**\*.cs" />
</ItemGroup>
<ItemGroup>
<None Include="paket.references" />
Expand All @@ -65,12 +63,12 @@
<Folder Include="Domain\Response\" />
</ItemGroup> -->
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Import Project="..\..\.paket\paket.targets" />
</Project>
</Project>
8 changes: 8 additions & 0 deletions src/Elasticsearch.Net/Elasticsearch.Net.project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"frameworks": {
"net45": {}
},
"runtimes": {
"win": {}
}
}
13 changes: 13 additions & 0 deletions src/Elasticsearch.Net/Elasticsearch.Net.project.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"locked": false,
"version": 1,
"targets": {
".NETFramework,Version=v4.5": {},
".NETFramework,Version=v4.5/win": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"": [],
".NETFramework,Version=v4.5": []
}
}
0 src/Elasticsearch.Net_Net45/paket.references → src/Elasticsearch.Net/paket.references
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions src/Elasticsearch.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest", "Nest_Net45\Nest.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest", "Nest\Nest.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D5575-2347-4D3C-BF8C-3E38410C46CA}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -23,21 +23,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build", "_Build", "{432D55
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Code Generation", "Code Generation", "{93331BEE-0AA0-47B7-B1D2-BD5BD31634D1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeGeneration.LowLevelClient", "CodeGeneration\CodeGeneration.LowLevelClient_Net45\CodeGeneration.LowLevelClient.csproj", "{56A87048-9065-459B-826D-3DF68B409845}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeGeneration.LowLevelClient", "CodeGeneration\CodeGeneration.LowLevelClient\CodeGeneration.LowLevelClient.csproj", "{56A87048-9065-459B-826D-3DF68B409845}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticsearch.Net", "Elasticsearch.Net_Net45\Elasticsearch.Net.csproj", "{E97CCF40-0BA6-43FE-9F2D-58D454134088}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticsearch.Net", "Elasticsearch.Net\Elasticsearch.Net.csproj", "{E97CCF40-0BA6-43FE-9F2D-58D454134088}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "scripts", "..\build\scripts\scripts.fsproj", "{28328694-2598-44D3-BB25-8B6C3FBDD3EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests_Net45\Tests.csproj", "{37164C11-88EF-4428-803A-9AA24FB8B44D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{37164C11-88EF-4428-803A-9AA24FB8B44D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.Litterateur", "CodeGeneration\Nest.Litterateur_Net45\Nest.Litterateur.csproj", "{98400F59-4BA8-4534-9A78-9C7FA0B42901}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.Litterateur", "CodeGeneration\Nest.Litterateur\Nest.Litterateur.csproj", "{98400F59-4BA8-4534-9A78-9C7FA0B42901}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance", "Performance", "{71B3D359-87E2-4F62-82A2-A624DD3BF402}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarking", "Benchmarking_Net45\Benchmarking.csproj", "{9BB0AB7E-F08E-4D3E-A9E7-7C71318E8666}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarking", "Benchmarking\Benchmarking.csproj", "{9BB0AB7E-F08E-4D3E-A9E7-7C71318E8666}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiling", "Profiling_Net45\Profiling.csproj", "{523B5383-B67D-462F-825D-FAE057E6B17D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiling", "Profiling\Profiling.csproj", "{523B5383-B67D-462F-825D-FAE057E6B17D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Loading