Skip to content

Commit 834f670

Browse files
committed
Update package projects to the new csproj format
1 parent 0a71d19 commit 834f670

File tree

3 files changed

+12
-179
lines changed

3 files changed

+12
-179
lines changed
Lines changed: 12 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{A341A5A1-45A6-4B35-9AB1-FE42C622F738}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>Bonsai.Scripting</RootNamespace>
12-
<AssemblyName>Bonsai.Scripting</AssemblyName>
13-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16-
<RestorePackages>true</RestorePackages>
17-
<TargetFrameworkProfile />
4+
<Title>Bonsai - Scripting Library</Title>
5+
<Description>Bonsai Scripting Library containing scripting infrastructure for Bonsai.</Description>
6+
<PackageTags>Bonsai Rx Scripting</PackageTags>
7+
<UseWindowsForms>true</UseWindowsForms>
8+
<TargetFramework>net472</TargetFramework>
9+
<Version>2.5.0</Version>
1810
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
<Prefer32Bit>false</Prefer32Bit>
28-
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
<BuildPackage>true</BuildPackage>
37-
<Prefer32Bit>false</Prefer32Bit>
38-
</PropertyGroup>
39-
<ItemGroup>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
<Reference Include="System.Drawing" />
43-
<Reference Include="System.Windows.Forms" />
44-
<Reference Include="System.Xml.Linq" />
45-
<Reference Include="System.Data.DataSetExtensions" />
46-
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Xml" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<Compile Include="ExpressionScriptEditor.cs" />
52-
<Compile Include="ExpressionScriptEditorDialog.cs">
53-
<SubType>Form</SubType>
54-
</Compile>
55-
<Compile Include="ExpressionScriptEditorDialog.Designer.cs">
56-
<DependentUpon>ExpressionScriptEditorDialog.cs</DependentUpon>
57-
</Compile>
58-
<Compile Include="ExpressionSink.cs" />
59-
<Compile Include="ExpressionCondition.cs" />
60-
<Compile Include="IScriptingElement.cs" />
61-
<Compile Include="PythonEngine.cs" />
62-
<Compile Include="PythonHelper.cs" />
63-
<Compile Include="PythonProcessor.cs" />
64-
<Compile Include="PythonSelectMany.cs" />
65-
<Compile Include="ExpressionTransform.cs" />
66-
<Compile Include="Properties\AssemblyInfo.Generated.cs" />
67-
<Compile Include="PythonSource.cs" />
68-
<Compile Include="PythonTextWriter.cs" />
69-
<Compile Include="PythonSink.cs" />
70-
<Compile Include="PythonCondition.cs" />
71-
<Compile Include="PythonTransform.cs" />
72-
<Compile Include="PythonScriptEditor.cs" />
73-
<Compile Include="PythonScriptEditorDialog.cs">
74-
<SubType>Form</SubType>
75-
</Compile>
76-
<Compile Include="PythonScriptEditorDialog.Designer.cs">
77-
<DependentUpon>PythonScriptEditorDialog.cs</DependentUpon>
78-
</Compile>
79-
<Compile Include="Properties\AssemblyInfo.cs" />
80-
<Compile Include="ScriptingElementTypeDescriptor.cs" />
81-
<Compile Include="TabSpaceRichTextBox.cs">
82-
<SubType>Component</SubType>
83-
</Compile>
84-
</ItemGroup>
85-
<ItemGroup>
86-
<ProjectReference Include="..\Bonsai.Core\Bonsai.Core.csproj">
87-
<Project>{E4D03BA3-54A2-4FF8-9DC6-52BA4CC14FED}</Project>
88-
<Name>Bonsai.Core</Name>
89-
</ProjectReference>
90-
<ProjectReference Include="..\Bonsai.System\Bonsai.System.csproj">
91-
<Project>{b783d74f-cb2d-4419-b438-266cd15774fb}</Project>
92-
<Name>Bonsai.System</Name>
93-
</ProjectReference>
94-
</ItemGroup>
95-
<ItemGroup>
96-
<EmbeddedResource Include="ExpressionScriptEditorDialog.resx">
97-
<DependentUpon>ExpressionScriptEditorDialog.cs</DependentUpon>
98-
<SubType>Designer</SubType>
99-
</EmbeddedResource>
100-
<EmbeddedResource Include="PythonScriptEditorDialog.resx">
101-
<DependentUpon>PythonScriptEditorDialog.cs</DependentUpon>
102-
<SubType>Designer</SubType>
103-
</EmbeddedResource>
104-
</ItemGroup>
10511
<ItemGroup>
106-
<None Include="Bonsai.Scripting.nuspec">
107-
<SubType>Designer</SubType>
108-
</None>
12+
<PackageReference Include="IronPython" Version="2.7.5" />
13+
<PackageReference Include="IronPython.StdLib" Version="2.7.5" />
14+
<PackageReference Include="jacobslusser.ScintillaNET" Version="3.6.3" />
15+
<PackageReference Include="System.Linq.Dynamic" Version="1.0.7" />
10916
</ItemGroup>
11017
<ItemGroup>
111-
<PackageReference Include="IronPython">
112-
<Version>2.7.5</Version>
113-
</PackageReference>
114-
<PackageReference Include="jacobslusser.ScintillaNET">
115-
<Version>3.6.3</Version>
116-
</PackageReference>
117-
<PackageReference Include="Rx-Linq">
118-
<Version>2.2.5</Version>
119-
</PackageReference>
120-
<PackageReference Include="System.Linq.Dynamic">
121-
<Version>1.0.7</Version>
122-
</PackageReference>
18+
<ProjectReference Include="..\Bonsai.System\Bonsai.System.csproj" />
12319
</ItemGroup>
124-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
125-
<Import Project="$(MSBuildProjectDirectory)\..\MSBuild\AssemblyInfo.targets" />
126-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
127-
Other similar extension points exist, see Microsoft.Common.targets.
128-
<Target Name="BeforeBuild">
129-
</Target>
130-
<Target Name="AfterBuild">
131-
</Target>
132-
-->
13320
</Project>

Bonsai.Scripting/Bonsai.Scripting.nuspec

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,7 @@
11
using Bonsai;
2-
using System.Reflection;
3-
using System.Runtime.CompilerServices;
4-
using System.Runtime.InteropServices;
52

63
// General Information about an assembly is controlled through the following
74
// set of attributes. Change these attribute values to modify the information
85
// associated with an assembly.
9-
[assembly: AssemblyTitle("Bonsai - Scripting Library")]
10-
[assembly: AssemblyDescription("Bonsai Scripting Library containing scripting infrastructure for Bonsai.")]
11-
[assembly: AssemblyConfiguration("")]
12-
[assembly: AssemblyCompany("Gonçalo Lopes")]
13-
[assembly: AssemblyProduct("Bonsai.Scripting")]
14-
[assembly: AssemblyCopyright("Copyright © Gonçalo Lopes 2011-2019")]
15-
[assembly: AssemblyTrademark("")]
16-
[assembly: AssemblyCulture("")]
17-
18-
// Setting ComVisible to false makes the types in this assembly not visible
19-
// to COM components. If you need to access a type in this assembly from
20-
// COM, set the ComVisible attribute to true on that type.
21-
[assembly: ComVisible(false)]
22-
23-
// The following GUID is for the ID of the typelib if this project is exposed to COM
24-
[assembly: Guid("913cb81d-f27e-43cb-8c8d-082aa49529e1")]
25-
26-
// Version information for an assembly consists of the following four values:
27-
//
28-
// Major Version
29-
// Minor Version
30-
// Build Number
31-
// Revision
32-
//
33-
// You can specify all the values or you can default the Build and Revision Numbers
34-
// by using the '*' as shown below:
35-
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("2.5.0.0")]
37-
[assembly: AssemblyInformationalVersion("2.5.0")]
386
[assembly: XmlNamespacePrefix("clr-namespace:Bonsai.Scripting", "scr")]
397
[assembly: WorkflowNamespaceIcon("Bonsai:ElementIcon.Scripting")]

0 commit comments

Comments
 (0)