Skip to content

Commit faa0f67

Browse files
MpdreamzMpdreamz
committed
scripts is now an SDK style project as well that is part of the solution build (#3394)
(cherry picked from commit 45227e8)
1 parent 2303388 commit faa0f67

File tree

2 files changed

+28
-68
lines changed

2 files changed

+28
-68
lines changed

‎build/scripts/scripts.fsproj

Lines changed: 4 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{D6997ADC-E933-418E-831C-DE1A78897493}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<RootNamespace>scripts</RootNamespace>
11-
<AssemblyName>scripts</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<Name>new_scripts</Name>
3+
<TargetFramework>netstandard2.0</TargetFramework>
164
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<Tailcalls>false</Tailcalls>
22-
<OutputPath>bin\$(Configuration)\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<WarningLevel>3</WarningLevel>
25-
<DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<Tailcalls>true</Tailcalls>
31-
<OutputPath>bin\$(Configuration)\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<WarningLevel>3</WarningLevel>
34-
<DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="mscorlib" />
38-
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
39-
<Private>True</Private>
40-
</Reference>
41-
<Reference Include="System" />
42-
<Reference Include="System.Core" />
43-
<Reference Include="System.Numerics" />
44-
<Reference Include="System.Data" />
45-
<Reference Include="System.Data.Linq" />
46-
</ItemGroup>
475
<ItemGroup>
486
<None Include="Differ.fsx" />
497
<None Include="Projects.fsx" />
@@ -67,27 +25,5 @@
6725
<Content Include="..\..\build.sh"><Link>paket.bat</Link></Content>
6826
<Content Include="..\..\build.bat"><Link>paket.bat</Link></Content>
6927
</ItemGroup>
70-
<PropertyGroup>
71-
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
72-
</PropertyGroup>
73-
<Choose>
74-
<When Condition="'$(VisualStudioVersion)' == '11.0'">
75-
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
76-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
77-
</PropertyGroup>
78-
</When>
79-
<Otherwise>
80-
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
81-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
82-
</PropertyGroup>
83-
</Otherwise>
84-
</Choose>
85-
<Import Project="$(FSharpTargetsPath)" />
86-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
87-
Other similar extension points exist, see Microsoft.Common.targets.
88-
<Target Name="BeforeBuild">
89-
</Target>
90-
<Target Name="AfterBuild">
91-
</Target>
92-
-->
93-
</Project>
28+
29+
</Project>

‎src/Elasticsearch.sln

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,5 +139,29 @@ Global
139139
{CE7AC1D4-15AF-47FB-83FA-F7137DFD9076}.Debug|Any CPU.Build.0 = Debug|Any CPU
140140
{CE7AC1D4-15AF-47FB-83FA-F7137DFD9076}.Release|Any CPU.ActiveCfg = Release|Any CPU
141141
{CE7AC1D4-15AF-47FB-83FA-F7137DFD9076}.Release|Any CPU.Build.0 = Release|Any CPU
142+
{56A87048-9065-459B-826D-3DF68B409845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143+
{56A87048-9065-459B-826D-3DF68B409845}.Debug|Any CPU.Build.0 = Debug|Any CPU
144+
{56A87048-9065-459B-826D-3DF68B409845}.Release|Any CPU.ActiveCfg = Release|Any CPU
145+
{56A87048-9065-459B-826D-3DF68B409845}.Release|Any CPU.Build.0 = Release|Any CPU
146+
{98400F59-4BA8-4534-9A78-9C7FA0B42901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
147+
{98400F59-4BA8-4534-9A78-9C7FA0B42901}.Debug|Any CPU.Build.0 = Debug|Any CPU
148+
{98400F59-4BA8-4534-9A78-9C7FA0B42901}.Release|Any CPU.ActiveCfg = Release|Any CPU
149+
{98400F59-4BA8-4534-9A78-9C7FA0B42901}.Release|Any CPU.Build.0 = Release|Any CPU
150+
{E97CCF40-0BA6-43FE-9F2D-58D454134088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
151+
{E97CCF40-0BA6-43FE-9F2D-58D454134088}.Debug|Any CPU.Build.0 = Debug|Any CPU
152+
{E97CCF40-0BA6-43FE-9F2D-58D454134088}.Release|Any CPU.ActiveCfg = Release|Any CPU
153+
{E97CCF40-0BA6-43FE-9F2D-58D454134088}.Release|Any CPU.Build.0 = Release|Any CPU
154+
{072BA7DA-7B60-407D-8B6E-95E3186BE70C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
155+
{072BA7DA-7B60-407D-8B6E-95E3186BE70C}.Debug|Any CPU.Build.0 = Debug|Any CPU
156+
{072BA7DA-7B60-407D-8B6E-95E3186BE70C}.Release|Any CPU.ActiveCfg = Release|Any CPU
157+
{072BA7DA-7B60-407D-8B6E-95E3186BE70C}.Release|Any CPU.Build.0 = Release|Any CPU
158+
{CDC8DEC8-3872-4337-9C40-9CDE5724BBDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
159+
{CDC8DEC8-3872-4337-9C40-9CDE5724BBDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
160+
{CDC8DEC8-3872-4337-9C40-9CDE5724BBDD}.Release|Any CPU.Build.0 = Release|Any CPU
161+
{CDC8DEC8-3872-4337-9C40-9CDE5724BBDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
162+
{D6997ADC-E933-418E-831C-DE1A78897493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
163+
{D6997ADC-E933-418E-831C-DE1A78897493}.Release|Any CPU.ActiveCfg = Release|Any CPU
164+
{D6997ADC-E933-418E-831C-DE1A78897493}.Debug|Any CPU.Build.0 = Debug|Any CPU
165+
{D6997ADC-E933-418E-831C-DE1A78897493}.Release|Any CPU.Build.0 = Release|Any CPU
142166
EndGlobalSection
143167
EndGlobal

0 commit comments

Comments
 (0)