Skip to content

Commit

Permalink
Starting to convert project formats.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobbe Gyllebring committed Nov 10, 2017
1 parent d41baa4 commit 5950bbb
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 93 deletions.
33 changes: 20 additions & 13 deletions Cone.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.16
VisualStudioVersion = 15.0.27004.2008
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9F49969B-C9E7-4176-9538-40ADF6A36D82}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -48,18 +48,22 @@ Global
{E557FD03-E249-4211-80CF-FB0923FD4C7D}.Release|x64.ActiveCfg = Release|Any CPU
{E557FD03-E249-4211-80CF-FB0923FD4C7D}.Release|x64.Build.0 = Release|Any CPU
{E557FD03-E249-4211-80CF-FB0923FD4C7D}.Release|x86.ActiveCfg = Release|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|Any CPU.ActiveCfg = Debug|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|Mixed Platforms.Build.0 = Debug|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|x64.ActiveCfg = Debug|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|x86.ActiveCfg = Debug|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|x86.Build.0 = Debug|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|Any CPU.ActiveCfg = Release|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|Mixed Platforms.ActiveCfg = Release|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|Mixed Platforms.Build.0 = Release|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|x64.ActiveCfg = Release|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|x86.ActiveCfg = Release|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|x86.Build.0 = Release|x86
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|x64.ActiveCfg = Debug|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|x64.Build.0 = Debug|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|x86.ActiveCfg = Debug|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Debug|x86.Build.0 = Debug|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|Any CPU.Build.0 = Release|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|x64.ActiveCfg = Release|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|x64.Build.0 = Release|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|x86.ActiveCfg = Release|Any CPU
{6096118B-3F90-453F-A5E9-9A9E117891F0}.Release|x86.Build.0 = Release|Any CPU
{BF157BB9-A8AE-4CE1-BDD8-8EFA7358EC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF157BB9-A8AE-4CE1-BDD8-8EFA7358EC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF157BB9-A8AE-4CE1-BDD8-8EFA7358EC0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -124,4 +128,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BBD9402C-18A8-4AA5-B335-33CE3001D5A4}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Source/Cone/Core/TestExecutor.cs
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;

Expand Down
4 changes: 2 additions & 2 deletions Source/Cone/Expectations/ExpectFactory.cs
Expand Up @@ -21,8 +21,8 @@ public class ExpectFactory
.Where(IsMethodExpectProvider)
.Select(x => x.New() as IMethodExpectProvider);
foreach(var provider in providers)
foreach(var method in provider.GetSupportedMethods())
methodExpects.Insert(method, provider);
foreach(var method in provider.GetSupportedMethods())
methodExpects.Insert(method, provider);
}

public static bool IsMethodExpectProvider(Type type) =>
Expand Down
5 changes: 2 additions & 3 deletions Source/Cone/Runners/ConeResolver.cs
@@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Linq;
using System.Reflection;
Expand Down Expand Up @@ -26,9 +26,8 @@ struct ResolveCandidate
}

Assembly AssemblyResolve(object sender, ResolveEventArgs e) {
if(typeof(ConeResolver).Assembly.FullName == e.Name) {
if(typeof(ConeResolver).Assembly.FullName == e.Name)
return typeof(ConeResolver).Assembly;
}

if(candidates == null) {
candidates = CandidateResolvePaths((string[])AppDomain.CurrentDomain.GetData(ResolvePathsKey));
Expand Down
88 changes: 14 additions & 74 deletions Source/Conesole/Conesole.csproj
@@ -1,94 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)\Cone.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6096118B-3F90-453F-A5E9-9A9E117891F0}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Conesole</RootNamespace>
<AssemblyName>Conesole</AssemblyName>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<TargetFramework>net45</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputPath>$(SolutionDir)Bin\$(MSBuildProjectName)\$(TargetFramework)</OutputPath>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<ApplicationIcon />
<OutputType>Exe</OutputType>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.XML" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Version.cs">
<Link>Version.cs</Link>
</Compile>
<Compile Include="ConesoleConfiguration.cs" />
<Compile Include="Program.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Cone\Cone.csproj">
<Project>{E557FD03-E249-4211-80CF-FB0923FD4C7D}</Project>
<Name>Cone</Name>
</ProjectReference>
<EmbeddedResource Include="Usage.txt" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Usage.txt" />
<PackageReference Include="System.Net.Http" Version="4.3.3" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
<ProjectReference Include="..\Cone\Cone.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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>
-->
<Target Name="AfterBuild">
<RemoveDir Directories="obj" />
</Target>
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
</Target>
</Project>

0 comments on commit 5950bbb

Please sign in to comment.