Skip to content

Commit

Permalink
Fix NuGet package to add C# file to C# projects, VB file to VB projects
Browse files Browse the repository at this point in the history
  • Loading branch information
CharliePoole committed Apr 17, 2015
1 parent 9b8f37e commit 9ceb77e
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 17 deletions.
37 changes: 37 additions & 0 deletions nuget/Program.vb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
' ***********************************************************************
' Copyright (c) 2015 Charlie Poole
'
' Permission is hereby granted, free of charge, to any person obtaining
' a copy of this software and associated documentation files (the
' "Software"), to deal in the Software without restriction, including
' without limitation the rights to use, copy, modify, merge, publish,
' distribute, sublicense, and/or sell copies of the Software, and to
' permit persons to whom the Software is furnished to do so, subject to
' the following conditions:
'
' The above copyright notice and this permission notice shall be
' included in all copies or substantial portions of the Software.
'
' THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
' EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
' MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
' NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
' LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
' OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
' WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
' ***********************************************************************

Imports NUnitLite.Runner

Public Class Program

''' <summary>
''' The main program executes the tests. Output may be routed to
''' various locations, depending on the arguments passed.
''' </summary>
''' <remarks>Run with --help for a full list of arguments supported</remarks>
Public Shared Sub Main(ByVal args() As String)
Call New AutoRun().Execute(args)
End Sub

End Class
9 changes: 9 additions & 0 deletions nuget/install.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
param($installPath, $toolsPath, $package, $project)
If ($project.Type -ne "VB.NET")
{
$project.ProjectItems.Item("Program.vb").Delete()
}
If ($project.Type -ne "C#")
{
$project.ProjectItems.Item("Program.cs").Delete()
}
2 changes: 2 additions & 0 deletions nuget/nunitlite.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,7 @@
<file src="$builddir$\net-4.5\nunitlite.dll" target="lib\net45" />
<file src="$builddir$\sl-5.0\nunitlite.dll" target="lib\sl5" />
<file src="nuget\Program.cs" target="content" />
<file src="nuget\Program.vb" target="content" />
<file src="nuget\install.ps1" target="tools" />
</files>
</package>
34 changes: 17 additions & 17 deletions nunit.sln
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitFramework", "NUnitFramework", "{5D8A9D62-C11C-45B2-8965-43DE8160B558}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NET-2.0", "NET-2.0", "{64FE69B2-CE0B-4A47-83A3-9DE803851447}"
Expand Down Expand Up @@ -58,10 +56,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{A972031D-2F61-4183-AF75-99EE1A9F6B32}"
ProjectSection(SolutionItems) = preProject
nuget\install.ps1 = nuget\install.ps1
nuget\nunit.console.nuspec = nuget\nunit.console.nuspec
nuget\nunit.nuspec = nuget\nunit.nuspec
nuget\nunitlite.nuspec = nuget\nunitlite.nuspec
nuget\Program.cs = nuget\Program.cs
nuget\Program.vb = nuget\Program.vb
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitEngine", "NUnitEngine", "{31B45C4C-206F-4F31-9CC6-33BF11DFEE39}"
Expand Down Expand Up @@ -294,46 +294,46 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{64FE69B2-CE0B-4A47-83A3-9DE803851447} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
{83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
{7B573D52-181D-482F-A61C-82E543B3E958} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
{A21BFC37-44FC-41A0-B6E7-6F949F45A635} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
{A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
{12B66B03-90F1-4992-BD33-BDF3C69AE49E} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
{2E368281-3BA8-4050-B05E-0E0E43F8F446} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
{15B64946-4989-4873-915C-3E181772FA03} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
{B0791F6D-5D14-40DD-A2CB-5D2A97892693} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
{EA9871E3-9972-4476-821E-3961C28125E8} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
{83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
{28C7B9D6-BE1F-45E5-952C-0D5C9CA3EFDF} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
{6A281C98-B74D-403B-8536-966871B992E3} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
{DDCE1AE3-AA0D-4E2D-AD1B-8CA322AFA7DD} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
{1D38AEC8-F5C0-4B1C-A0AE-18F4015A2E78} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
{A35E6AD6-6D46-41E1-8DB1-A41086793893} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
{08D0F53A-CD37-4060-B5A2-BCC202F0DE46} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
{7B573D52-181D-482F-A61C-82E543B3E958} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
{DBD0C8B0-BE4E-4CBF-AAD4-44BEA2EA830B} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
{D209C368-1277-4EA6-A887-AA6EBA51AB99} = {7B573D52-181D-482F-A61C-82E543B3E958}
{C3264FF3-E2D7-48D7-93A7-CDC9A827AD9D} = {7B573D52-181D-482F-A61C-82E543B3E958}
{705FBD41-77A9-4FE7-A6C1-85026F2DDA09} = {7B573D52-181D-482F-A61C-82E543B3E958}
{E7541163-D7BB-4E9A-A722-D7737B7A2995} = {7B573D52-181D-482F-A61C-82E543B3E958}
{5B8B0EAB-3E74-48BB-8231-26E73B2019DC} = {7B573D52-181D-482F-A61C-82E543B3E958}
{A21BFC37-44FC-41A0-B6E7-6F949F45A635} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
{46EC0BC1-8F51-4B4D-B967-2EE452EA68FC} = {7B573D52-181D-482F-A61C-82E543B3E958}
{3DEB15F9-E7DA-403F-B6D3-A8499310397F} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
{A76794DA-29A4-4D63-9850-E0E363A2FAFD} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
{0A5F920A-1BF5-4DAC-B799-0C618B203797} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
{A4F0C741-6ED4-46C8-AE75-57E1C7197E22} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
{A972031D-2F61-4183-AF75-99EE1A9F6B32} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
{775FAD50-3623-4922-97C4-DFB29A8BE4C7} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{372A3447-D657-40FF-A089-77C19FEC30C8} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{D694CB69-6CFB-4762-86C2-EB27B808B282} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{C2A8FC7A-FA64-46EA-AF6D-73D6B371DBF8} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{28B605B2-E2E9-417E-8369-49E263F1F31B} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{91DD5A2D-9FE3-4C3C-9253-876141874DAD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{B923C1E7-54DD-4E79-A1A9-B21123863B04} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{0DE218CA-AFB8-423A-9CD2-E22DEAC55C46} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
{B310A760-8AE1-41CA-81F8-03B12E2FCE30} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
{28B605B2-E2E9-417E-8369-49E263F1F31B} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
{D6FBBB3A-F6B8-45BB-B657-A7226AB96624} = {A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7}
{3DEB15F9-E7DA-403F-B6D3-A8499310397F} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
{9ED200E4-2026-4955-87E0-D8CEA7BD9E7F} = {A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7}
{A76794DA-29A4-4D63-9850-E0E363A2FAFD} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
{AAABA65D-7BB9-45FB-B953-C7820E67810E} = {A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7}
{28C7B9D6-BE1F-45E5-952C-0D5C9CA3EFDF} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
{DBD0C8B0-BE4E-4CBF-AAD4-44BEA2EA830B} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
{46EC0BC1-8F51-4B4D-B967-2EE452EA68FC} = {7B573D52-181D-482F-A61C-82E543B3E958}
{0A5F920A-1BF5-4DAC-B799-0C618B203797} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
{9EFAD088-713E-4269-ADFC-1F21CA872A94} = {A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7}
{A4F0C741-6ED4-46C8-AE75-57E1C7197E22} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
{91DD5A2D-9FE3-4C3C-9253-876141874DAD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{B923C1E7-54DD-4E79-A1A9-B21123863B04} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{96181317-7B6F-49F0-B283-6E804D41C8AF} = {B923C1E7-54DD-4E79-A1A9-B21123863B04}
{E71A76CA-0089-4E1A-A7FB-210429DBED6E} = {B923C1E7-54DD-4E79-A1A9-B21123863B04}
{793CEC1B-D44D-4162-BE03-913BF1FDB458} = {B923C1E7-54DD-4E79-A1A9-B21123863B04}
Expand Down

0 comments on commit 9ceb77e

Please sign in to comment.