Skip to content

Commit 61d7c86

Browse files
author
Stephen Jennings
committed
convert csproj files to new project format
1 parent d5eb5d0 commit 61d7c86

File tree

3 files changed

+60
-219
lines changed

3 files changed

+60
-219
lines changed

‎src/Turbocharged.Beanstalk.Tests/Turbocharged.Beanstalk.Tests.csproj

+9-92
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\xunit.runner.visualstudio.2.0.0-rc4-build1049\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.0-rc4-build1049\build\net20\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\packages\xunit.core.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
5-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
63
<PropertyGroup>
7-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9-
<ProjectGuid>{BE5E1CD1-D669-4C2E-8D69-FA0BC4B7B1E6}</ProjectGuid>
10-
<OutputType>Library</OutputType>
11-
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>Turbocharged.Beanstalk.Tests</RootNamespace>
13-
<AssemblyName>Turbocharged.Beanstalk.Tests</AssemblyName>
14-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
15-
<FileAlignment>512</FileAlignment>
16-
<NuGetPackageImportStamp>18b19064</NuGetPackageImportStamp>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
175
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37-
<SpecificVersion>False</SpecificVersion>
38-
<HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
39-
</Reference>
40-
<Reference Include="System" />
41-
<Reference Include="System.Configuration" />
42-
<Reference Include="System.Core" />
43-
<Reference Include="System.Xml.Linq" />
44-
<Reference Include="System.Data.DataSetExtensions" />
45-
<Reference Include="Microsoft.CSharp" />
46-
<Reference Include="System.Data" />
47-
<Reference Include="System.Xml" />
48-
<Reference Include="xunit.abstractions">
49-
<HintPath>..\packages\xunit.abstractions.2.0.0-rc4-build2924\lib\net35\xunit.abstractions.dll</HintPath>
50-
</Reference>
51-
<Reference Include="xunit.assert">
52-
<HintPath>..\packages\xunit.assert.2.0.0-rc4-build2924\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
53-
</Reference>
54-
<Reference Include="xunit.core">
55-
<HintPath>..\packages\xunit.extensibility.core.2.0.0-rc4-build2924\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
56-
</Reference>
57-
</ItemGroup>
58-
<ItemGroup>
59-
<Compile Include="AssemblyExtensions.cs" />
60-
<Compile Include="FakesAndMocks\ThrowingSerializer.cs" />
61-
<Compile Include="FakesAndMocks\CountingSerializer.cs" />
62-
<Compile Include="FakesAndMocks\FakeConsumer.cs" />
63-
<Compile Include="SerializationFacts.cs" />
64-
<Compile Include="MiscellaneousFacts.cs" />
65-
<Compile Include="ConnectionFacts.cs" />
66-
<Compile Include="Properties\AssemblyInfo.cs" />
67-
</ItemGroup>
68-
<ItemGroup>
69-
<None Include="App.config" />
70-
<None Include="packages.config" />
71-
</ItemGroup>
72-
<ItemGroup>
73-
<ProjectReference Include="..\Turbocharged.Beanstalk\Turbocharged.Beanstalk.csproj">
74-
<Project>{44fcde9f-74f8-42f7-8984-01345124367a}</Project>
75-
<Name>Turbocharged.Beanstalk</Name>
76-
</ProjectReference>
77-
</ItemGroup>
6+
787
<ItemGroup>
79-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
9+
<PackageReference Include="xunit" Version="2.2.0" />
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
8011
</ItemGroup>
81-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
82-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
83-
<PropertyGroup>
84-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
85-
</PropertyGroup>
86-
<Error Condition="!Exists('..\packages\xunit.core.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
87-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.0-rc4-build1049\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.0-rc4-build1049\build\net20\xunit.runner.visualstudio.props'))" />
88-
</Target>
89-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
90-
Other similar extension points exist, see Microsoft.Common.targets.
91-
<Target Name="BeforeBuild">
92-
</Target>
93-
<Target Name="AfterBuild">
94-
</Target>
95-
-->
96-
</Project>
12+
13+
</Project>

‎src/Turbocharged.Beanstalk.sln

+46-30
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,62 @@
1-
1+
22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Turbocharged.Beanstalk", "Turbocharged.Beanstalk\Turbocharged.Beanstalk.csproj", "{44FCDE9F-74F8-42F7-8984-01345124367A}"
7-
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{51310B37-17B5-47B3-A414-CBC09B46FC06}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Turbocharged.Beanstalk.Tests", "Turbocharged.Beanstalk.Tests\Turbocharged.Beanstalk.Tests.csproj", "{BE5E1CD1-D669-4C2E-8D69-FA0BC4B7B1E6}"
11-
EndProject
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26124.0
5+
MinimumVisualStudioVersion = 15.0.26124.0
126
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp", "SampleApp\SampleApp.csproj", "{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}"
137
EndProject
14-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{65FC1ED3-E716-44A8-87E4-9CFB0601D888}"
15-
ProjectSection(SolutionItems) = preProject
16-
..\README.md = ..\README.md
17-
..\Turbocharged.Beanstalk.nuspec = ..\Turbocharged.Beanstalk.nuspec
18-
EndProjectSection
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Turbocharged.Beanstalk.Tests", "Turbocharged.Beanstalk.Tests\Turbocharged.Beanstalk.Tests.csproj", "{84667450-5F08-4694-B254-C4FC7DAF740C}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Turbocharged.Beanstalk", "Turbocharged.Beanstalk\Turbocharged.Beanstalk.csproj", "{6644F4C6-2351-4DDA-9D45-A50B791707FF}"
1911
EndProject
2012
Global
2113
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2214
Debug|Any CPU = Debug|Any CPU
15+
Debug|x64 = Debug|x64
16+
Debug|x86 = Debug|x86
2317
Release|Any CPU = Release|Any CPU
18+
Release|x64 = Release|x64
19+
Release|x86 = Release|x86
20+
EndGlobalSection
21+
GlobalSection(SolutionProperties) = preSolution
22+
HideSolutionNode = FALSE
2423
EndGlobalSection
2524
GlobalSection(ProjectConfigurationPlatforms) = postSolution
26-
{44FCDE9F-74F8-42F7-8984-01345124367A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{44FCDE9F-74F8-42F7-8984-01345124367A}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{44FCDE9F-74F8-42F7-8984-01345124367A}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{44FCDE9F-74F8-42F7-8984-01345124367A}.Release|Any CPU.Build.0 = Release|Any CPU
30-
{BE5E1CD1-D669-4C2E-8D69-FA0BC4B7B1E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{BE5E1CD1-D669-4C2E-8D69-FA0BC4B7B1E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{BE5E1CD1-D669-4C2E-8D69-FA0BC4B7B1E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{BE5E1CD1-D669-4C2E-8D69-FA0BC4B7B1E6}.Release|Any CPU.Build.0 = Release|Any CPU
3425
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3526
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Debug|x64.ActiveCfg = Debug|x64
28+
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Debug|x64.Build.0 = Debug|x64
29+
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Debug|x86.ActiveCfg = Debug|x86
30+
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Debug|x86.Build.0 = Debug|x86
3631
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
3732
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Release|Any CPU.Build.0 = Release|Any CPU
38-
EndGlobalSection
39-
GlobalSection(SolutionProperties) = preSolution
40-
HideSolutionNode = FALSE
41-
EndGlobalSection
42-
GlobalSection(NestedProjects) = preSolution
43-
{BE5E1CD1-D669-4C2E-8D69-FA0BC4B7B1E6} = {51310B37-17B5-47B3-A414-CBC09B46FC06}
44-
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D} = {51310B37-17B5-47B3-A414-CBC09B46FC06}
33+
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Release|x64.ActiveCfg = Release|x64
34+
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Release|x64.Build.0 = Release|x64
35+
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Release|x86.ActiveCfg = Release|x86
36+
{C0FF45ED-3EF9-4FC2-92D0-C5302AA2EB9D}.Release|x86.Build.0 = Release|x86
37+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Debug|Any CPU.Build.0 = Debug|Any CPU
39+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Debug|x64.ActiveCfg = Debug|x64
40+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Debug|x64.Build.0 = Debug|x64
41+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Debug|x86.ActiveCfg = Debug|x86
42+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Debug|x86.Build.0 = Debug|x86
43+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Release|x64.ActiveCfg = Release|x64
46+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Release|x64.Build.0 = Release|x64
47+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Release|x86.ActiveCfg = Release|x86
48+
{84667450-5F08-4694-B254-C4FC7DAF740C}.Release|x86.Build.0 = Release|x86
49+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Debug|x64.ActiveCfg = Debug|x64
52+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Debug|x64.Build.0 = Debug|x64
53+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Debug|x86.ActiveCfg = Debug|x86
54+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Debug|x86.Build.0 = Debug|x86
55+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Release|x64.ActiveCfg = Release|x64
58+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Release|x64.Build.0 = Release|x64
59+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Release|x86.ActiveCfg = Release|x86
60+
{6644F4C6-2351-4DDA-9D45-A50B791707FF}.Release|x86.Build.0 = Release|x86
4561
EndGlobalSection
4662
EndGlobal

‎src/Turbocharged.Beanstalk/Turbocharged.Beanstalk.csproj

+5-97
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.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">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{44FCDE9F-74F8-42F7-8984-01345124367A}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Turbocharged.Beanstalk</RootNamespace>
11-
<AssemblyName>Turbocharged.Beanstalk</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
4+
<TargetFramework>netstandard1.4</TargetFramework>
145
</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>
31-
<DocumentationFile>bin\Release\Turbocharged.Beanstalk.xml</DocumentationFile>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="Newtonsoft.Json">
35-
<HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
36-
</Reference>
37-
<Reference Include="System" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="System.Xml.Linq" />
40-
<Reference Include="System.Data.DataSetExtensions" />
41-
<Reference Include="Microsoft.CSharp" />
42-
<Reference Include="System.Data" />
43-
<Reference Include="System.Xml" />
44-
</ItemGroup>
45-
<ItemGroup>
46-
<Compile Include="Reply.cs" />
47-
<Compile Include="IJobSerializer.cs" />
48-
<Compile Include="ConnectionConfiguration.cs" />
49-
<Compile Include="IServer.cs" />
50-
<Compile Include="IWorker.cs" />
51-
<Compile Include="NewtonsoftJsonJobSerializer.cs" />
52-
<Compile Include="PauseTube.cs" />
53-
<Compile Include="KickJob.cs" />
54-
<Compile Include="ListTubes.cs" />
55-
<Compile Include="Kick.cs" />
56-
<Compile Include="SerializationExtensions.cs" />
57-
<Compile Include="Touch.cs" />
58-
<Compile Include="Bury.cs" />
59-
<Compile Include="Release.cs" />
60-
<Compile Include="Delete.cs" />
61-
<Compile Include="Trace.cs" />
62-
<Compile Include="Tube.cs" />
63-
<Compile Include="Statistics.cs" />
64-
<Compile Include="TubeStatistics.cs" />
65-
<Compile Include="JobStatistics.cs" />
66-
<Compile Include="System\EncodingExtensions.cs" />
67-
<Compile Include="IConsumer.cs" />
68-
<Compile Include="IProducer.cs" />
69-
<Compile Include="JobState.cs" />
70-
<Compile Include="PhysicalConnection.cs" />
71-
<Compile Include="Peek.cs" />
72-
<Compile Include="Reserve.cs" />
73-
<Compile Include="Ignore.cs" />
74-
<Compile Include="ListTubesWatched.cs" />
75-
<Compile Include="ListTubeUsed.cs" />
76-
<Compile Include="Watch.cs" />
77-
<Compile Include="Use.cs" />
78-
<Compile Include="Request.cs" />
79-
<Compile Include="System\Disposable.cs" />
80-
<Compile Include="Job.cs" />
81-
<Compile Include="BeanstalkConnection.cs" />
82-
<Compile Include="Put.cs" />
83-
<Compile Include="Properties\AssemblyInfo.cs" />
84-
<Compile Include="System\StringExtensions.cs" />
85-
<Compile Include="WorkerOptions.cs" />
86-
<Compile Include="YamlHelper.cs" />
87-
</ItemGroup>
88-
<ItemGroup>
89-
<None Include="packages.config" />
90-
</ItemGroup>
91-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
92-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
93-
Other similar extension points exist, see Microsoft.Common.targets.
94-
<Target Name="BeforeBuild">
95-
</Target>
96-
<Target Name="AfterBuild">
97-
</Target>
98-
-->
99-
</Project>
6+
7+
</Project>

0 commit comments

Comments
 (0)