Skip to content

Commit 043cb33

Browse files
kkozmickkozmic
committed
Merge pull request #11 from JakeGinnivan/ProjectUpdates
Project updates
2 parents d58400d + d66d249 commit 043cb33

File tree

73 files changed

+825
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+825
-1
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ bin
33
obj
44

55
# mstest test results
6-
TestResults
6+
TestResult*
77

88
# Misc
99
_ReSharper.*
@@ -13,3 +13,4 @@ _ReSharper.*
1313
*.crunchsolution.local.xml
1414
*.ncrunchsolution
1515
*.ncrunchproject
16+
ConventionTests*.nupkg

‎.nuget/packages.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NuGet.CommandLine" version="2.6.1" />
4+
<package id="NUnit.Runners" version="2.6.2" />
5+
</packages>

‎Build.cmd‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@ECHO OFF
2+
3+
SET msbuild="%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
4+
5+
%msbuild% ConventionTests.proj
6+
7+
IF NOT ERRORLEVEL 0 EXIT /B %ERRORLEVEL%
8+
9+
pause

‎ConventionTests.proj‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Test;Publish" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Root>$(MSBuildProjectDirectory)\</Root>
5+
<BuildPlatform Condition="$(BuildPlatform) == ''">Any CPU</BuildPlatform>
6+
<Configuration Condition="$(Configuration) == ''">Release</Configuration>
7+
<MSBuildCommunityTasksPath>$(Root)tools\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
8+
<NUnitHome>$(MSBuildProjectDirectory)\packages\NUnit.Runners.2.6.2\tools\</NUnitHome>
9+
<NUnitConsole>$(NUnitHome)nunit-console.exe</NUnitConsole>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<NuGet Include="$(Root)packages\NuGet.CommandLine.*\tools\NuGet.exe" />
13+
</ItemGroup>
14+
15+
<Target Name="Cleanup">
16+
<Error Condition="$(Root) == ''" Text="Root variable must be defined" />
17+
<Error Condition="$(NUnitConsole) == ''" Text="Cannot find nUnit runner (have you upgraded NUnit.Runners?)" />
18+
<Error Condition="@(NuGet) == ''" Text="Cannot find NuGet command line tool" />
19+
20+
<!-- Diagnostics -->
21+
<Message Text="Diagnostics:"/>
22+
<Message Text="Project root: $(Root)" />
23+
<Message Text="Drop path: build\Artifacts" />
24+
25+
<!-- Clean up -->
26+
<ItemGroup>
27+
<FilesToDelete Include="$(Root)**\bin\**\*.*" />
28+
<FilesToDelete Include="$(Root)**\obj\**\*.*" />
29+
<FilesToDelete Include="$(Root)build\Artifacts\**\*.*" />
30+
</ItemGroup>
31+
<Delete Files="@(FilesToDelete)" ContinueOnError="true" />
32+
<Delete Files="$(Root)build\Artifacts" />
33+
</Target>
34+
35+
<Target Name="Build" DependsOnTargets="Cleanup">
36+
<MSBuild Projects="$(Root)ConventionTests.sln" Properties="Configuration=$(Configuration);Platform=$(BuildPlatform)" />
37+
</Target>
38+
39+
<Target Name="Test" DependsOnTargets="Build">
40+
<ItemGroup>
41+
<NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.6.2.*" />
42+
</ItemGroup>
43+
<!--Copy nUnit teamcity into addins directory if we find addins-->
44+
<MakeDir Directories="$(NUnitHome)addins" />
45+
<Copy SourceFiles="@(NUnitAddinFiles)" DestinationFolder="$(NUnitHome)addins" />
46+
47+
<Exec Command="$(NUnitConsole) $(Root)TestStack.ConventionTests.Tests\bin\$(Configuration)\TestStack.ConventionTests.Tests.dll /nologo /noshadow" />
48+
</Target>
49+
50+
<Target Name="Publish">
51+
<PropertyGroup>
52+
<Version Condition="'$(Version)' == ''">0.0.0.0</Version>
53+
</PropertyGroup>
54+
<MakeDir Directories="$(Root)build\Artifacts" />
55+
<Exec Command="@(NuGet) pack $(Root)TestStack.ConventionTests\TestStack.ConventionTests.nuspec -Version $(Version) -OutputDir $(Root)build\Artifacts -BasePath $(Root)TestStack.ConventionTests\bin\$(Configuration)" />
56+
</Target>
57+
</Project>

‎ConventionTests.sln‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
44
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConventionTests", "ConventionTests\ConventionTests.csproj", "{1E12EA0C-9182-4029-991A-B0B9D38F5783}"
55
EndProject
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AF9054EE-FE89-47A4-9156-BE54A837F2F7}"
7+
ProjectSection(SolutionItems) = preProject
8+
Build.cmd = Build.cmd
9+
ConventionTests.proj = ConventionTests.proj
10+
README.md = README.md
11+
EndProjectSection
12+
EndProject
13+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.ConventionTests", "TestStack.ConventionTests\TestStack.ConventionTests.csproj", "{955B0236-089F-434D-BA02-63A1E24C2B7C}"
14+
EndProject
15+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.ConventionTests.Tests", "TestStack.ConventionTests.Tests\TestStack.ConventionTests.Tests.csproj", "{FEFF8305-A192-4CEA-A373-6CF2F365A9E5}"
16+
EndProject
17+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{35B8E1F6-8E97-40A6-91E3-CB765328424F}"
18+
ProjectSection(SolutionItems) = preProject
19+
.nuget\packages.config = .nuget\packages.config
20+
EndProjectSection
21+
EndProject
622
Global
723
GlobalSection(SolutionConfigurationPlatforms) = preSolution
824
Debug|Any CPU = Debug|Any CPU
@@ -13,6 +29,14 @@ Global
1329
{1E12EA0C-9182-4029-991A-B0B9D38F5783}.Debug|Any CPU.Build.0 = Debug|Any CPU
1430
{1E12EA0C-9182-4029-991A-B0B9D38F5783}.Release|Any CPU.ActiveCfg = Release|Any CPU
1531
{1E12EA0C-9182-4029-991A-B0B9D38F5783}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{955B0236-089F-434D-BA02-63A1E24C2B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{955B0236-089F-434D-BA02-63A1E24C2B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{955B0236-089F-434D-BA02-63A1E24C2B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{955B0236-089F-434D-BA02-63A1E24C2B7C}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{FEFF8305-A192-4CEA-A373-6CF2F365A9E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{FEFF8305-A192-4CEA-A373-6CF2F365A9E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{FEFF8305-A192-4CEA-A373-6CF2F365A9E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{FEFF8305-A192-4CEA-A373-6CF2F365A9E5}.Release|Any CPU.Build.0 = Release|Any CPU
1640
EndGlobalSection
1741
GlobalSection(SolutionProperties) = preSolution
1842
HideSolutionNode = FALSE

‎TestStack.ConventionTests.Tests/ATest.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
namespace TestStack.ConventionTests.Tests
2+
{
3+
using NUnit.Framework;
4+
5+
[TestFixture]
6+
public class ATest
7+
{
8+
[Test]
9+
public void Test()
10+
{
11+
12+
}
13+
}
14+
}

‎TestStack.ConventionTests.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using System.Reflection;
2+
using System.Runtime.InteropServices;
3+
4+
// General Information about an assembly is controlled through the following
5+
// set of attributes. Change these attribute values to modify the information
6+
// associated with an assembly.
7+
[assembly: AssemblyTitle("TestStack.ConventionTests.Tests")]
8+
[assembly: AssemblyDescription("")]
9+
[assembly: AssemblyConfiguration("")]
10+
[assembly: AssemblyCompany("")]
11+
[assembly: AssemblyProduct("TestStack.ConventionTests.Tests")]
12+
[assembly: AssemblyCopyright("Copyright © TestStack 2013")]
13+
[assembly: AssemblyTrademark("")]
14+
[assembly: AssemblyCulture("")]
15+
16+
// Setting ComVisible to false makes the types in this assembly not visible
17+
// to COM components. If you need to access a type in this assembly from
18+
// COM, set the ComVisible attribute to true on that type.
19+
[assembly: ComVisible(false)]
20+
21+
// The following GUID is for the ID of the typelib if this project is exposed to COM
22+
[assembly: Guid("1a65a30e-e057-4058-a155-7ad12ba91cd2")]
23+
24+
// Version information for an assembly consists of the following four values:
25+
//
26+
// Major Version
27+
// Minor Version
28+
// Build Number
29+
// Revision
30+
//
31+
// You can specify all the values or you can default the Build and Revision Numbers
32+
// by using the '*' as shown below:
33+
// [assembly: AssemblyVersion("1.0.*")]
34+
[assembly: AssemblyVersion("1.0.0.0")]
35+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎TestStack.ConventionTests.Tests/TestStack.ConventionTests.Tests.csproj‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
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')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{FEFF8305-A192-4CEA-A373-6CF2F365A9E5}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>TestStack.ConventionTests.Tests</RootNamespace>
11+
<AssemblyName>TestStack.ConventionTests.Tests</AssemblyName>
12+
<TargetFrameworkVersion>v4.0</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>
31+
</PropertyGroup>
32+
<ItemGroup>
33+
<Reference Include="nunit.framework">
34+
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
35+
</Reference>
36+
<Reference Include="System" />
37+
<Reference Include="System.Core" />
38+
<Reference Include="System.Xml.Linq" />
39+
<Reference Include="System.Data.DataSetExtensions" />
40+
<Reference Include="Microsoft.CSharp" />
41+
<Reference Include="System.Data" />
42+
<Reference Include="System.Xml" />
43+
</ItemGroup>
44+
<ItemGroup>
45+
<Compile Include="ATest.cs" />
46+
<Compile Include="Properties\AssemblyInfo.cs" />
47+
</ItemGroup>
48+
<ItemGroup>
49+
<None Include="packages.config" />
50+
</ItemGroup>
51+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
52+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
53+
Other similar extension points exist, see Microsoft.Common.targets.
54+
<Target Name="BeforeBuild">
55+
</Target>
56+
<Target Name="AfterBuild">
57+
</Target>
58+
-->
59+
</Project>

‎TestStack.ConventionTests.Tests/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NUnit" version="2.6.2" targetFramework="net40" />
4+
</packages>

‎TestStack.ConventionTests/Properties/AssemblyInfo.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("TestStack.ConventionTests")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("TestStack.ConventionTests")]
13+
[assembly: AssemblyCopyright("Copyright © 2013")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
[assembly: Guid("ae7bce97-3d40-4d7c-932f-37f1c7b041a2")]
24+
25+
// Version information for an assembly consists of the following four values:
26+
//
27+
// Major Version
28+
// Minor Version
29+
// Build Number
30+
// Revision
31+
//
32+
// You can specify all the values or you can default the Build and Revision Numbers
33+
// by using the '*' as shown below:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)