Skip to content

Commit 3fe9081

Browse files
ethanhannethanhann
committed
Update project types to VS 2017
1 parent 9f1d207 commit 3fe9081

File tree

11 files changed

+80
-434
lines changed

11 files changed

+80
-434
lines changed

‎src/InEngine.Commands/InEngine.Commands.csproj‎

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{74CA3917-E2F3-4C75-96AF-156BC52C4C5E}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<RootNamespace>InEngine.Commands</RootNamespace>
9-
<AssemblyName>InEngine.Commands</AssemblyName>
10-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
3+
<TargetFrameworks>net47;net462</TargetFrameworks>
4+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
115
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
13-
<DebugSymbols>true</DebugSymbols>
14-
<DebugType>full</DebugType>
15-
<Optimize>false</Optimize>
16-
<OutputPath>bin\Debug</OutputPath>
17-
<DefineConstants>DEBUG;</DefineConstants>
18-
<ErrorReport>prompt</ErrorReport>
19-
<WarningLevel>4</WarningLevel>
20-
<ConsolePause>false</ConsolePause>
21-
</PropertyGroup>
22-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
23-
<Optimize>true</Optimize>
24-
<OutputPath>bin\Release</OutputPath>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
<ConsolePause>false</ConsolePause>
28-
</PropertyGroup>
29-
<ItemGroup>
30-
<Reference Include="System" />
31-
<Reference Include="CommandLine">
32-
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
33-
</Reference>
34-
</ItemGroup>
356
<ItemGroup>
36-
<Compile Include="Properties\AssemblyInfo.cs" />
37-
<Compile Include="Sample\Minimal.cs" />
38-
<Compile Include="Sample\ShowProgress.cs" />
39-
<Compile Include="Sample\SayHello.cs" />
40-
<Compile Include="Options.cs" />
41-
<Compile Include="MoreOptions.cs" />
427
<Compile Include="..\SharedAssemblyInfo.cs">
438
<Link>Properties\SharedAssemblyInfo.cs</Link>
449
</Compile>
4510
</ItemGroup>
4611
<ItemGroup>
47-
<Folder Include="Sample\" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<ProjectReference Include="..\InEngine.Core\InEngine.Core.csproj">
51-
<Project>{1C604C4F-3F98-483C-89E3-C951BE03366A}</Project>
52-
<Name>InEngine.Core</Name>
53-
</ProjectReference>
54-
</ItemGroup>
55-
<ItemGroup>
56-
<None Include="packages.config" />
12+
<ProjectReference Include="..\InEngine.Core\InEngine.Core.csproj" />
5713
</ItemGroup>
58-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
59-
</Project>
14+
</Project>
15+

‎src/InEngine.Commands/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/InEngine.Core.Tests/InEngine.Core.Tests.csproj‎

Lines changed: 13 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,21 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{CC74DD78-76C9-4143-A567-527E82DA475B}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<RootNamespace>InEngine.Core.Tests</RootNamespace>
9-
<AssemblyName>InEngine.Core.Tests</AssemblyName>
10-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
3+
<TargetFrameworks>net47;net462</TargetFrameworks>
4+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
115
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
13-
<DebugSymbols>true</DebugSymbols>
14-
<DebugType>full</DebugType>
15-
<Optimize>false</Optimize>
16-
<OutputPath>bin\Debug</OutputPath>
17-
<DefineConstants>DEBUG;</DefineConstants>
18-
<ErrorReport>prompt</ErrorReport>
19-
<WarningLevel>4</WarningLevel>
20-
</PropertyGroup>
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
22-
<Optimize>true</Optimize>
23-
<OutputPath>bin\Release</OutputPath>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
</PropertyGroup>
27-
<ItemGroup>
28-
<Reference Include="System" />
29-
<Reference Include="BeekmanLabs.UnitTesting">
30-
<HintPath>..\packages\BeekmanLabs.UnitTesting.0.0.0\lib\net45\BeekmanLabs.UnitTesting.dll</HintPath>
31-
</Reference>
32-
<Reference Include="nunit.framework">
33-
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
34-
</Reference>
35-
<Reference Include="Quartz">
36-
<HintPath>..\packages\Quartz.2.6.1\lib\net40\Quartz.dll</HintPath>
37-
</Reference>
38-
<Reference Include="Castle.Core">
39-
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
40-
</Reference>
41-
<Reference Include="System.Configuration" />
42-
<Reference Include="Moq">
43-
<HintPath>..\packages\Moq.4.7.145\lib\net45\Moq.dll</HintPath>
44-
</Reference>
45-
<Reference Include="Microsoft.CSharp" />
46-
<Reference Include="Common.Logging.Core">
47-
<HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
48-
</Reference>
49-
<Reference Include="Common.Logging">
50-
<HintPath>..\packages\Common.Logging.3.4.1\lib\net40\Common.Logging.dll</HintPath>
51-
</Reference>
52-
</ItemGroup>
53-
<ItemGroup>
54-
<Compile Include="Queue\Commands\PublishTest.cs" />
55-
<Compile Include="Queue\Commands\ConsumeTest.cs" />
56-
</ItemGroup>
576
<ItemGroup>
58-
<None Include="packages.config" />
59-
<None Include="job_scheduling_data_2_0.xsd" />
60-
<None Include="appsettings.json">
61-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
62-
</None>
7+
<Compile Include="..\SharedAssemblyInfo.cs">
8+
<Link>Properties\SharedAssemblyInfo.cs</Link>
9+
</Compile>
6310
</ItemGroup>
6411
<ItemGroup>
65-
<Folder Include="Queue\" />
12+
<ProjectReference Include="..\InEngine.Core\InEngine.Core.csproj" />
6613
</ItemGroup>
6714
<ItemGroup>
68-
<ProjectReference Include="..\InEngine.Core\InEngine.Core.csproj">
69-
<Project>{1C604C4F-3F98-483C-89E3-C951BE03366A}</Project>
70-
<Name>InEngine.Core</Name>
71-
</ProjectReference>
15+
<PackageReference Include="BeekmanLabs.UnitTesting" Version="0.0.0" />
16+
<PackageReference Include="NUnit" Version="3.9.0" />
17+
<PackageReference Include="Quartz" Version="2.6.1" />
18+
<PackageReference Include="Moq" Version="4.7.145" />
7219
</ItemGroup>
73-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
74-
</Project>
20+
</Project>
21+

‎src/InEngine.Core.Tests/Queue/Commands/PublishTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void ShouldPublishManyCommands()
4242

4343
foreach (var i in Enumerable.Range(0, 200).ToList()) {
4444
Subject.Command = new Echo() {
45-
Text = $"test job: {i}"
45+
VerbatimText = $"test job: {i}"
4646
};
4747
Subject.Run();
4848
}

‎src/InEngine.Core.Tests/packages.config‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/InEngine.Core/InEngine.Core.csproj‎

Lines changed: 14 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -1,162 +1,23 @@
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-
<ProjectGuid>{1C604C4F-3F98-483C-89E3-C951BE03366A}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>InEngine.Core</RootNamespace>
11-
<AssemblyName>InEngine.Core</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
3+
<TargetFrameworks>net47;net462</TargetFrameworks>
4+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
315
</PropertyGroup>
326
<ItemGroup>
33-
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
34-
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
35-
<Private>True</Private>
36-
</Reference>
37-
<Reference Include="System" />
38-
<Reference Include="System.ComponentModel.DataAnnotations" />
39-
<Reference Include="System.Core" />
40-
<Reference Include="System.Xml.Linq" />
41-
<Reference Include="System.Data.DataSetExtensions" />
42-
<Reference Include="Microsoft.CSharp" />
43-
<Reference Include="System.Data" />
44-
<Reference Include="System.Net.Http" />
45-
<Reference Include="System.Xml" />
46-
<Reference Include="Konsole">
47-
<HintPath>..\packages\Goblinfactory.Konsole.ProgressBar.Core.1.0.2\lib\netstandard1.4\Konsole.dll</HintPath>
48-
</Reference>
49-
<Reference Include="Quartz">
50-
<HintPath>..\packages\Quartz.2.6.1\lib\net40\Quartz.dll</HintPath>
51-
</Reference>
52-
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource">
53-
<HintPath>..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
54-
</Reference>
55-
<Reference Include="Newtonsoft.Json">
56-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
57-
</Reference>
58-
<Reference Include="CommandLine">
59-
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
60-
</Reference>
61-
<Reference Include="System.Configuration" />
62-
<Reference Include="Common.Logging.Core">
63-
<HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
64-
</Reference>
65-
<Reference Include="Common.Logging">
66-
<HintPath>..\packages\Common.Logging.3.4.1\lib\net40\Common.Logging.dll</HintPath>
67-
</Reference>
68-
<Reference Include="System.Runtime.CompilerServices.Unsafe">
69-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
70-
</Reference>
71-
<Reference Include="Microsoft.Extensions.Primitives">
72-
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
73-
</Reference>
74-
<Reference Include="Microsoft.Extensions.Configuration.Abstractions">
75-
<HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
76-
</Reference>
77-
<Reference Include="Microsoft.Extensions.Configuration">
78-
<HintPath>..\packages\Microsoft.Extensions.Configuration.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
79-
</Reference>
80-
<Reference Include="Microsoft.Extensions.FileSystemGlobbing">
81-
<HintPath>..\packages\Microsoft.Extensions.FileSystemGlobbing.2.0.0\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll</HintPath>
82-
</Reference>
83-
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions">
84-
<HintPath>..\packages\Microsoft.Extensions.FileProviders.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Abstractions.dll</HintPath>
85-
</Reference>
86-
<Reference Include="Microsoft.Extensions.FileProviders.Physical">
87-
<HintPath>..\packages\Microsoft.Extensions.FileProviders.Physical.2.0.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll</HintPath>
88-
</Reference>
89-
<Reference Include="Microsoft.Extensions.Configuration.FileExtensions">
90-
<HintPath>..\packages\Microsoft.Extensions.Configuration.FileExtensions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll</HintPath>
91-
</Reference>
92-
<Reference Include="Microsoft.Extensions.Configuration.Json">
93-
<HintPath>..\packages\Microsoft.Extensions.Configuration.Json.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Json.dll</HintPath>
94-
</Reference>
95-
<Reference Include="Microsoft.Extensions.Configuration.Binder">
96-
<HintPath>..\packages\Microsoft.Extensions.Configuration.Binder.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
97-
</Reference>
98-
<Reference Include="System.IO.Compression">
99-
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
100-
</Reference>
101-
<Reference Include="mscorlib" />
102-
<Reference Include="StackExchange.Redis">
103-
<HintPath>..\packages\StackExchange.Redis.1.2.4\lib\net46\StackExchange.Redis.dll</HintPath>
104-
</Reference>
7+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
8+
<PackageReference Include="CommandLineParser" Version="1.9.71" />
9+
<PackageReference Include="NLog" Version="4.4.12" />
10+
<PackageReference Include="Quartz" Version="2.6.1" />
11+
<PackageReference Include="Goblinfactory.Konsole.ProgressBar.Core" Version="1.0.2" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
15+
<PackageReference Include="StackExchange.Redis" Version="1.2.4" />
10516
</ItemGroup>
10617
<ItemGroup>
107-
<Compile Include="Properties\AssemblyInfo.cs" />
108-
<Compile Include="Exceptions\CommandFailedException.cs" />
109-
<Compile Include="CommandResult.cs" />
110-
<Compile Include="ICommand.cs" />
111-
<Compile Include="Queue\Broker.cs" />
112-
<Compile Include="Queue\Message.cs" />
113-
<Compile Include="Queue\Commands\GetLength.cs" />
114-
<Compile Include="Queue\Commands\Consume.cs" />
115-
<Compile Include="Queue\Commands\Publish.cs" />
116-
<Compile Include="Queue\Commands\ClearAll.cs" />
117-
<Compile Include="AbstractCommand.cs" />
118-
<Compile Include="Queue\Jobs.cs" />
119-
<Compile Include="IOptions.cs" />
120-
<Compile Include="Queue\Options.cs" />
121-
<Compile Include="Plugin.cs" />
122-
<Compile Include="IJobs.cs" />
123-
<Compile Include="IPluginType.cs" />
12418
<Compile Include="..\SharedAssemblyInfo.cs">
12519
<Link>Properties\SharedAssemblyInfo.cs</Link>
12620
</Compile>
127-
<Compile Include="InEngineSettings.cs" />
128-
<Compile Include="Queue\QueueSettings.cs" />
129-
<Compile Include="Exceptions\RedisServerSettingsNotFoundException.cs" />
130-
<Compile Include="StreamCopy.cs" />
131-
<Compile Include="CommandExtensions.cs" />
132-
<Compile Include="Exceptions\PluginNotFoundException.cs" />
133-
<Compile Include="Commands\Echo.cs" />
134-
<Compile Include="Commands\AlwaysSucceed.cs" />
135-
<Compile Include="Commands\Options.cs" />
136-
<Compile Include="IO\Write.cs" />
137-
<Compile Include="IO\IWrite.cs" />
138-
<Compile Include="JsonExtensions.cs" />
139-
<Compile Include="IFailed.cs" />
140-
<Compile Include="Commands\AlwaysFail.cs" />
141-
</ItemGroup>
142-
<ItemGroup>
143-
<None Include="packages.config" />
144-
<None Include="job_scheduling_data_2_0.xsd" />
145-
<None Include="InEngine.Core.nuspec" />
146-
</ItemGroup>
147-
<ItemGroup>
148-
<Folder Include="Exceptions\" />
149-
<Folder Include="Queue\" />
150-
<Folder Include="Queue\Commands\" />
151-
<Folder Include="Commands\" />
152-
<Folder Include="IO\" />
15321
</ItemGroup>
154-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
155-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
156-
Other similar extension points exist, see Microsoft.Common.targets.
157-
<Target Name="BeforeBuild">
158-
</Target>
159-
<Target Name="AfterBuild">
160-
</Target>
161-
-->
162-
</Project>
22+
</Project>
23+

‎src/InEngine.Core/packages.config‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)