зеркало из
1
0
Форкнуть 0

Checkpointing the merge modules

This commit is contained in:
Rob Prouse 2015-02-22 10:13:38 -05:00
Родитель b5e9bd4fd8
Коммит 4670ae8a9d
13 изменённых файлов: 585 добавлений и 214 удалений

Просмотреть файл

@ -25,10 +25,6 @@
<RegistrySearch Id="MonoDirectory" Type="directory" Root="HKLM" Key="Software\Novell\Mono\[MONODEFAULTCLR]" Name="SDKInstallRoot" />
</Property>
<Property Id="CMD_EXE" Value="[!SystemFolder]cmd.exe" />
<?define BuildDir = "$(var.OutDir)\" ?>
<!-- ***************************************************************** -->
<!-- ********* Properties for the Add Remove Programs list ********* -->
<!-- ***************************************************************** -->

Просмотреть файл

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Include>
<Property Id="CMD_EXE" Value="[!SystemFolder]cmd.exe" />
<?define BuildDir = "$(var.OutDir)\" ?>
</Include>

Просмотреть файл

@ -1,64 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*"
Name="NUnit Framework !(bind.FileVersion.nunit.framework.45.dll)"
Language="1033"
Version="!(bind.FileVersion.nunit.framework.45.dll)"
Manufacturer="nunit.org"
UpgradeCode="880B355E-1916-446B-A3E1-D2B72CF2A0EC">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<Module Id="NUnit.Framework"
Language="0"
Version="!(bind.FileVersion.nunit.framework.45.dll)">
<Package Id="5A9E88FC-89AA-48E9-9776-9C7A2DB619C7"
Manufacturer="NUnit.org"
InstallerVersion="200"
Languages="1033"
InstallScope="perMachine" />
<!-- Include the information that is common to all installs -->
<?include ..\common\common.wxi ?>
<!-- ***************************************************************** -->
<!-- ********** Define the NUnit feature tree ********** -->
<!-- ***************************************************************** -->
<Feature Id="NUNIT.FRAMEWORK"
ConfigurableDirectory="INSTALLDIR"
Level="1"
Title="NUnit Framework v!(bind.FileVersion.nunit.framework.45.dll)"
Display="expand"
Description="Installs the NUnit framework assemblies for the various .NET Frameworks">
<ComponentGroupRef Id="NUNIT.COMMON"/>
<Feature Id="NET20" Level="1" Title=".NET 2.0"
Description="Installs the NUnit framework for .NET 2.0" >
<ComponentGroupRef Id="NET20"/>
</Feature>
<Feature Id="NET35" Level="1" Title=".NET 3.5"
Description="Installs the NUnit framework for .NET 3.5" >
<ComponentGroupRef Id="NET35"/>
</Feature>
<Feature Id="NET40" Level="1" Title=".NET 4.0"
Description="Installs the NUnit framework for .NET 4.0" >
<ComponentGroupRef Id="NET40"/>
</Feature>
<Feature Id="NET45" Level="1" Title=".NET 4.5"
Description="Installs the NUnit framework for .NET 4.5" >
<ComponentGroupRef Id="NET45"/>
</Feature>
<Feature Id="PORTABLE" Level="1" Title=".NET Portable"
Description="Installs the NUnit framework for Portable .NET" >
<ComponentGroupRef Id="PORTABLE"/>
</Feature>
<Feature Id="SL50" Level="1" Title="Silverlight 5.0"
Description="Installs the NUnit framework for Silverlight 5.0" >
<ComponentGroupRef Id="SL50"/>
</Feature>
</Feature>
</Product>
<?include ..\common\variables.wxi ?>
</Module>
<!-- ***************************************************************** -->
<!-- ********** Define Directory Structure ********** -->
<!-- ***************************************************************** -->
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLDIR" Name="NUnit.org">
<Directory Id="FRAMEWORK" Name="framework">
<Directory Id="VERSION" Name="!(bind.FileVersion.nunit.framework.45.dll)">
@ -71,11 +33,11 @@
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Fragment>
</Directory>
</Directory>
</Fragment>
<Fragment>
<Fragment>
<ComponentGroup Id="NUNIT.COMMON" Directory="VERSION">
<Component Id="CHANGES.txt">
<File Id="CHANGES.txt" Source="..\..\CHANGES.txt" />
@ -93,17 +55,17 @@
<ComponentGroup Id="NET20" Directory="NET20">
<Component Id="NET20" Guid="D5DB98E2-AF98-4308-83FE-BA4D973F973D">
<File Id="nunit.framework.20.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
<File Id="nunit.framework.20.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)net-2.0\nunit.framework.dll" />
<File Id="nunit.framework.20.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)net-2.0\nunit.framework.xml"
<File Id="nunit.framework.20.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)net-2.0\nunit.framework.xml"
CompanionFile="nunit.framework.20.dll" />
<File Id="nunitlite.20.dll"
Name="nunitlite.dll"
ProcessorArchitecture="msil"
<File Id="nunitlite.20.dll"
Name="nunitlite.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)net-2.0\nunitlite.dll" />
</Component>
<Component Id="AssemblyReferenceFolder20">
@ -115,17 +77,17 @@
<ComponentGroup Id="NET35" Directory="NET35">
<Component Id="NET35" Guid="70141F7C-FE62-407A-B2ED-00BF86FEF595">
<File Id="nunit.framework.35.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
<File Id="nunit.framework.35.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)net-3.5\nunit.framework.dll" />
<File Id="nunit.framework.35.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)net-3.5\nunit.framework.xml"
<File Id="nunit.framework.35.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)net-3.5\nunit.framework.xml"
CompanionFile="nunit.framework.35.dll" />
<File Id="nunitlite.35.dll"
Name="nunitlite.dll"
ProcessorArchitecture="msil"
<File Id="nunitlite.35.dll"
Name="nunitlite.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)net-3.5\nunitlite.dll" />
</Component>
<Component Id="AssemblyReferenceFolder35">
@ -137,17 +99,17 @@
<ComponentGroup Id="NET40" Directory="NET40">
<Component Id="NET40" Guid="20075750-2D60-4798-A348-5FB0930E9034">
<File Id="nunit.framework.40.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
<File Id="nunit.framework.40.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)net-4.0\nunit.framework.dll" />
<File Id="nunit.framework.40.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)net-4.0\nunit.framework.xml"
<File Id="nunit.framework.40.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)net-4.0\nunit.framework.xml"
CompanionFile="nunit.framework.40.dll" />
<File Id="nunitlite.40.dll"
Name="nunitlite.dll"
ProcessorArchitecture="msil"
<File Id="nunitlite.40.dll"
Name="nunitlite.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)net-4.0\nunitlite.dll" />
</Component>
<Component Id="AssemblyReferenceFolder40">
@ -159,17 +121,17 @@
<ComponentGroup Id="NET45" Directory="NET45">
<Component Id="NET45" Guid="6CBE4F8B-8583-48F2-A2FD-2A3875DB8665">
<File Id="nunit.framework.45.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
<File Id="nunit.framework.45.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)net-4.5\nunit.framework.dll" />
<File Id="nunit.framework.45.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)net-4.5\nunit.framework.xml"
<File Id="nunit.framework.45.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)net-4.5\nunit.framework.xml"
CompanionFile="nunit.framework.45.dll" />
<File Id="nunitlite.45.dll"
Name="nunitlite.dll"
ProcessorArchitecture="msil"
<File Id="nunitlite.45.dll"
Name="nunitlite.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)net-4.5\nunitlite.dll" />
</Component>
<Component Id="AssemblyReferenceFolder45">
@ -181,13 +143,13 @@
<ComponentGroup Id="PORTABLE" Directory="PORTABLE">
<Component Id="PORTABLE" Guid="D469144C-53E9-4DEA-8659-84FC9A673EDB">
<File Id="nunit.framework.portable.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
<File Id="nunit.framework.portable.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)portable\nunit.framework.dll" />
<File Id="nunit.framework.portable.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)portable\nunit.framework.xml"
<File Id="nunit.framework.portable.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)portable\nunit.framework.xml"
CompanionFile="nunit.framework.portable.dll" />
</Component>
<!-- What is the AssemblyFoldersEx for Portable? For now, I am putting this under .NET 4.5 since the portable is valid for that -->
@ -200,17 +162,17 @@
<ComponentGroup Id="SL50" Directory="SL50">
<Component Id="SL50" Guid="FE2ADBC4-DFEC-41A6-8D5A-6DCACC167059">
<File Id="nunit.framework.sl50.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
<File Id="nunit.framework.sl50.dll"
Name="nunit.framework.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)sl-5.0\nunit.framework.dll" />
<File Id="nunit.framework.sl50.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)sl-5.0\nunit.framework.xml"
<File Id="nunit.framework.sl50.xml"
Name="nunit.framework.xml"
Source="$(var.BuildDir)sl-5.0\nunit.framework.xml"
CompanionFile="nunit.framework.sl50.dll" />
<File Id="nunitlite.sl50.dll"
Name="nunitlite.dll"
ProcessorArchitecture="msil"
<File Id="nunitlite.sl50.dll"
Name="nunitlite.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)sl-5.0\nunitlite.dll" />
</Component>
<Component Id="AssemblyReferenceFolderSL50">
@ -219,7 +181,6 @@
</RegistryKey>
</Component>
</ComponentGroup>
</Fragment>
</Fragment>
</Wix>

Просмотреть файл

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*"
Name="NUnit Framework !(bind.FileVersion.nunit.framework.45.dll)"
Language="1033"
Version="!(bind.FileVersion.nunit.framework.45.dll)"
Manufacturer="nunit.org"
UpgradeCode="880B355E-1916-446B-A3E1-D2B72CF2A0EC">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<!-- Include the information that is common to all installs -->
<?include ..\common\variables.wxi ?>
<?include ..\common\common.wxi ?>
<!-- ***************************************************************** -->
<!-- ********** Define the NUnit feature tree ********** -->
<!-- ***************************************************************** -->
<Feature Id="NUNIT.FRAMEWORK"
ConfigurableDirectory="INSTALLDIR"
Level="1"
Title="NUnit Framework v!(bind.FileVersion.nunit.framework.45.dll)"
Display="expand"
Description="Installs the NUnit framework assemblies for the various .NET Frameworks">
<ComponentGroupRef Id="NUNIT.COMMON"/>
<Feature Id="NET20" Level="1" Title=".NET 2.0"
Description="Installs the NUnit framework for .NET 2.0" >
<ComponentGroupRef Id="NET20"/>
</Feature>
<Feature Id="NET35" Level="1" Title=".NET 3.5"
Description="Installs the NUnit framework for .NET 3.5" >
<ComponentGroupRef Id="NET35"/>
</Feature>
<Feature Id="NET40" Level="1" Title=".NET 4.0"
Description="Installs the NUnit framework for .NET 4.0" >
<ComponentGroupRef Id="NET40"/>
</Feature>
<Feature Id="NET45" Level="1" Title=".NET 4.5"
Description="Installs the NUnit framework for .NET 4.5" >
<ComponentGroupRef Id="NET45"/>
</Feature>
<Feature Id="PORTABLE" Level="1" Title=".NET Portable"
Description="Installs the NUnit framework for Portable .NET" >
<ComponentGroupRef Id="PORTABLE"/>
</Feature>
<Feature Id="SL50" Level="1" Title="Silverlight 5.0"
Description="Installs the NUnit framework for Silverlight 5.0" >
<ComponentGroupRef Id="SL50"/>
</Feature>
</Feature>
</Product>
<!-- ***************************************************************** -->
<!-- ********** Define Directory Structure ********** -->
<!-- ***************************************************************** -->
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLDIR" Name="NUnit.org">
<Merge Id="NUnit.Framework" Language="1033" SourceFile="" DiskId="1" />
</Directory>
</Directory>
</Directory>
</Fragment>
</Wix>

Просмотреть файл

@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>3.9</ProductVersion>
<ProjectGuid>352151E9-CA8F-4461-AF95-50D1540039C2</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>NUnit.Framework</OutputName>
<OutputType>Module</OutputType>
<DefineSolutionProperties>false</DefineSolutionProperties>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
<WixVariables>Build=$(Configuration)</WixVariables>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DefineConstants>Debug;</DefineConstants>
<WixVariables>
</WixVariables>
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
<WixVariables />
<DefineConstants>
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="framework-merge.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<Content Include="..\common\common.wxi">
<Link>common.wxi</Link>
</Content>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Target Name="BeforeBuild">
<GetAssemblyIdentity AssemblyFiles="..\..\bin\$(Configuration)\net-4.5\nunit.framework.dll">
<Output TaskParameter="Assemblies" ItemName="AssemblyVersions" />
</GetAssemblyIdentity>
<CreateProperty Value="$(OutputName).%(AssemblyVersions.Version)">
<Output TaskParameter="Value" PropertyName="TargetName" />
</CreateProperty>
<CreateProperty Value="$(TargetName)$(TargetExt)">
<Output TaskParameter="Value" PropertyName="TargetFileName" />
</CreateProperty>
<CreateProperty Value="$(TargetDir)$(TargetFileName)">
<Output TaskParameter="Value" PropertyName="TargetPath" />
</CreateProperty>
</Target>
</Project>

Просмотреть файл

@ -37,7 +37,7 @@
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="nunit-framework.wxs" />
<Compile Include="framework.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUIExtension">
@ -49,6 +49,9 @@
<Content Include="..\common\common.wxi">
<Link>common.wxi</Link>
</Content>
<Content Include="..\common\variables.wxi">
<Link>variables.wxi</Link>
</Content>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--

Просмотреть файл

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>3.9</ProductVersion>
<ProjectGuid>809C00DC-3FD3-45BF-BC0E-E284F314D306</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>NUnit.Runners</OutputName>
<OutputType>Package</OutputType>
<DefineSolutionProperties>false</DefineSolutionProperties>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<Name>nunit-runners</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
<WixVariables>Build=$(Configuration)</WixVariables>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DefineConstants>Debug;</DefineConstants>
<WixVariables>
</WixVariables>
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
<WixVariables />
<DefineConstants>
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="nunit.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<Content Include="..\common\common.wxi">
<Link>common.wxi</Link>
</Content>
<Content Include="..\common\variables.wxi">
<Link>variables.wxi</Link>
</Content>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Target Name="BeforeBuild">
<GetAssemblyIdentity AssemblyFiles="..\..\bin\$(Configuration)\nunit.engine.dll">
<Output TaskParameter="Assemblies" ItemName="AssemblyVersions" />
</GetAssemblyIdentity>
<CreateProperty Value="$(OutputName).%(AssemblyVersions.Version)">
<Output TaskParameter="Value" PropertyName="TargetName" />
</CreateProperty>
<CreateProperty Value="$(TargetName)$(TargetExt)">
<Output TaskParameter="Value" PropertyName="TargetFileName" />
</CreateProperty>
<CreateProperty Value="$(TargetDir)$(TargetFileName)">
<Output TaskParameter="Value" PropertyName="TargetPath" />
</CreateProperty>
</Target>
</Project>

15
install/master/nunit.wxs Normal file
Просмотреть файл

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*"
Name="NUnit"
Language="1033"
Version="!(bind.FileVersion.nunit.engine.dll)"
Manufacturer="nunit.org"
UpgradeCode="ED9BC7BB-45EE-481A-9479-2753770EF704">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<!-- Include the information that is common to all installs -->
<?include ..\common\common.wxi ?>
</Wix>

Просмотреть файл

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>3.9</ProductVersion>
<ProjectGuid>40FEA8CD-5C48-4BF4-AC67-DF5E5B149425</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>NUnit.Runners</OutputName>
<OutputType>Module</OutputType>
<DefineSolutionProperties>false</DefineSolutionProperties>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<Name>nunit-runners</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
<WixVariables>Build=$(Configuration)</WixVariables>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DefineConstants>Debug;</DefineConstants>
<WixVariables>
</WixVariables>
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
<WixVariables />
<DefineConstants>
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="runners-merge.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<Content Include="..\common\variables.wxi">
<Link>variables.wxi</Link>
</Content>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Target Name="BeforeBuild">
<GetAssemblyIdentity AssemblyFiles="..\..\bin\$(Configuration)\nunit.engine.dll">
<Output TaskParameter="Assemblies" ItemName="AssemblyVersions" />
</GetAssemblyIdentity>
<CreateProperty Value="$(OutputName).%(AssemblyVersions.Version)">
<Output TaskParameter="Value" PropertyName="TargetName" />
</CreateProperty>
<CreateProperty Value="$(TargetName)$(TargetExt)">
<Output TaskParameter="Value" PropertyName="TargetFileName" />
</CreateProperty>
<CreateProperty Value="$(TargetDir)$(TargetFileName)">
<Output TaskParameter="Value" PropertyName="TargetPath" />
</CreateProperty>
</Target>
</Project>

Просмотреть файл

@ -38,7 +38,7 @@
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="nunit-tools.wxs" />
<Compile Include="runners.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUIExtension">
@ -50,6 +50,9 @@
<Content Include="..\common\common.wxi">
<Link>common.wxi</Link>
</Content>
<Content Include="..\common\variables.wxi">
<Link>variables.wxi</Link>
</Content>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--

Просмотреть файл

@ -1,88 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*"
Name="NUnit Runners"
Language="1033"
Version="!(bind.FileVersion.nunit.engine.dll)"
Manufacturer="nunit.org"
UpgradeCode="94E18606-9590-4BA1-B002-258860D7B151">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<Module Id="NUnit.Runners"
Language="0"
Version="!(bind.FileVersion.nunit.engine.dll)">
<Package Id="69852C66-B20F-4BAD-9B19-C9F3E97CB390"
Manufacturer="NUnit.org"
InstallerVersion="200"
Languages="1033"
InstallScope="perMachine" />
<!-- Include the information that is common to all installs -->
<?include ..\common\common.wxi ?>
<!-- ***************************************************************** -->
<!-- ********** Define the NUnit feature tree ********** -->
<!-- ***************************************************************** -->
<Feature Id="NUNIT.RUNNERS"
ConfigurableDirectory="INSTALLDIR"
Level="1"
Title="NUnit Runners"
Display="expand"
Description="Installs the NUnit engine and the console runner that allows you to run tests.">
<ComponentGroupRef Id="NUNIT.COMMON"/>
<Feature Id="NUNIT.ENGINE"
Level="1"
Absent="disallow"
Title="NUnit Engine"
Description="Installs the NUnit engine">
<ComponentGroupRef Id="NUNIT.ENGINE" />
<Feature Id="ADDINS.NUNIT.PROJECT.LOADER"
Level="1"
Title="NUnit Project Loader"
Description="Allows you to load NUnit Project files">
<ComponentGroupRef Id="ADDINS.NUNIT.PROJECT.LOADER" />
</Feature>
<Feature Id="ADDINS.VS.PROJECT.LOADER"
Level="1"
Title="Visual Studio Project Loader"
Description="Allows you to load Visual Studio Solution and Project files">
<ComponentGroupRef Id="ADDINS.VS.PROJECT.LOADER" />
</Feature>
<Feature Id="NUNIT.V2.DRIVER"
Level="1"
Title="NUnit 2.x Driver"
Description="Allows you to run NUnit 2.x test suites">
<ComponentGroupRef Id="NUNIT.V2.DRIVER" />
</Feature>
<Feature Id="ADDINS.NUNIT.V2.WRITER"
Level="1"
Title="NUnit 2.x Result Writer"
Description="Allows you to write test results out in the NUnit 2.x format">
<ComponentGroupRef Id="ADDINS.NUNIT.V2.WRITER" />
</Feature>
</Feature>
<Feature Id="NUNIT.CONSOLE"
Level="1"
Title="NUnit Console"
Description="Installs the NUnit console runner">
<ComponentGroupRef Id="NUNIT.CONSOLE" />
</Feature>
</Feature>
</Product>
<?include ..\common\variables.wxi ?>
</Module>
<!-- ***************************************************************** -->
<!-- ********** Define Directory Structure ********** -->
<!-- ***************************************************************** -->
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLDIR" Name="NUnit.org">
<Directory Id="BIN" Name="bin">
<Directory Id="ADDINS" Name="addins" />
</Directory>
</Directory>
</Directory>
</Directory>
</Fragment>
</Directory>
</Directory>
</Fragment>
<Fragment>
<Fragment>
<ComponentGroup Id="NUNIT.COMMON" Directory="BIN">
<Component Id="CHANGES.txt">
<File Id="CHANGES.txt" Source="..\..\CHANGES.txt" />
@ -97,58 +45,58 @@
<File Id="nunit.ico" Source="..\..\nunit.ico" />
</Component>
</ComponentGroup>
<ComponentGroup Id="NUNIT.ENGINE" Directory="BIN">
<Component Id="NUNIT.ENGINE">
<File Id="nunit.engine.dll"
ProcessorArchitecture="msil"
<ComponentGroup Id="NUNIT.ENGINE" Directory="BIN">
<Component Id="NUNIT.ENGINE">
<File Id="nunit.engine.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)nunit.engine.dll" />
</Component>
<Component Id="NUNIT.ENGINE.ADDINS">
<File Id="nunit.engine.addins"
</Component>
<Component Id="NUNIT.ENGINE.ADDINS">
<File Id="nunit.engine.addins"
Source="$(var.BuildDir)nunit.engine.addins" />
</Component>
<Component Id="NUNIT.ENGINE.ADDIN.XML">
<File Id="nunit.engine.addin.xml"
</Component>
<Component Id="NUNIT.ENGINE.ADDIN.XML">
<File Id="nunit.engine.addin.xml"
Source="$(var.BuildDir)nunit.engine.addin.xml" />
</Component>
<Component Id="NUNIT.ENGINE.API">
<File Id="nunit.engine.api.dll"
ProcessorArchitecture="msil"
</Component>
<Component Id="NUNIT.ENGINE.API">
<File Id="nunit.engine.api.dll"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)nunit.engine.api.dll" />
<File Id="nunit.engine.api.xml"
Source="$(var.BuildDir)nunit.engine.api.xml" />
</Component>
<Component Id="NUNIT_AGENT">
<File Id="nunit_agent.exe"
ProcessorArchitecture="msil"
<File Id="nunit_agent.exe"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)nunit-agent.exe" />
<File Id="nunit_agent.exe.config"
Source="$(var.BuildDir)nunit-agent.exe.config" />
</Component>
<Component Id="NUNIT_AGENT_X86">
<File Id="nunit_agent_x86.exe"
ProcessorArchitecture="x86"
<File Id="nunit_agent_x86.exe"
ProcessorArchitecture="x86"
Source="$(var.BuildDir)nunit-agent-x86.exe" />
<File Id="nunit_agent_x86.exe.config"
<File Id="nunit_agent_x86.exe.config"
Source="$(var.BuildDir)nunit-agent-x86.exe.config" />
</Component>
<Component Id="MONO.ADDINS">
<File Id="Mono.Addins.dll"
Source="$(var.BuildDir)Mono.Addins.dll" />
</Component>
</ComponentGroup>
</ComponentGroup>
<ComponentGroup Id="NUNIT.CONSOLE" Directory="BIN">
<Component Id="NUNIT_CONSOLE">
<File Id="nunit_console.exe"
ProcessorArchitecture="msil"
<File Id="nunit_console.exe"
ProcessorArchitecture="msil"
Source="$(var.BuildDir)nunit-console.exe" />
<File Id="nunit_console.exe.config"
Source="$(var.BuildDir)nunit-console.exe.config" />
</Component>
</ComponentGroup>
<ComponentGroup Id="ADDINS.NUNIT.PROJECT.LOADER" Directory="ADDINS">
<Component Id="ADDINS.NUNIT.PROJECT.LOADER">
<File Id="nunit_project_loader.dll"
@ -184,5 +132,5 @@
Source="$(var.BuildDir)addins\nunit.core.interfaces.dll" />
</Component>
</ComponentGroup>
</Fragment>
</Fragment>
</Wix>

Просмотреть файл

@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*"
Name="NUnit Runners"
Language="1033"
Version="!(bind.FileVersion.nunit.engine.dll)"
Manufacturer="nunit.org"
UpgradeCode="94E18606-9590-4BA1-B002-258860D7B151">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<!-- Include the information that is common to all installs -->
<?include ..\common\variables.wxi ?>
<?include ..\common\common.wxi ?>
<!-- ***************************************************************** -->
<!-- ********** Define the NUnit feature tree ********** -->
<!-- ***************************************************************** -->
<Feature Id="NUNIT.RUNNERS"
ConfigurableDirectory="INSTALLDIR"
Level="1"
Title="NUnit Runners"
Display="expand"
Description="Installs the NUnit engine and the console runner that allows you to run tests.">
<ComponentGroupRef Id="NUNIT.COMMON"/>
<Feature Id="NUNIT.ENGINE"
Level="1"
Absent="disallow"
Title="NUnit Engine"
Description="Installs the NUnit engine">
<ComponentGroupRef Id="NUNIT.ENGINE" />
<Feature Id="ADDINS.NUNIT.PROJECT.LOADER"
Level="1"
Title="NUnit Project Loader"
Description="Allows you to load NUnit Project files">
<ComponentGroupRef Id="ADDINS.NUNIT.PROJECT.LOADER" />
</Feature>
<Feature Id="ADDINS.VS.PROJECT.LOADER"
Level="1"
Title="Visual Studio Project Loader"
Description="Allows you to load Visual Studio Solution and Project files">
<ComponentGroupRef Id="ADDINS.VS.PROJECT.LOADER" />
</Feature>
<Feature Id="NUNIT.V2.DRIVER"
Level="1"
Title="NUnit 2.x Driver"
Description="Allows you to run NUnit 2.x test suites">
<ComponentGroupRef Id="NUNIT.V2.DRIVER" />
</Feature>
<Feature Id="ADDINS.NUNIT.V2.WRITER"
Level="1"
Title="NUnit 2.x Result Writer"
Description="Allows you to write test results out in the NUnit 2.x format">
<ComponentGroupRef Id="ADDINS.NUNIT.V2.WRITER" />
</Feature>
</Feature>
<Feature Id="NUNIT.CONSOLE"
Level="1"
Title="NUnit Console"
Description="Installs the NUnit console runner">
<ComponentGroupRef Id="NUNIT.CONSOLE" />
</Feature>
</Feature>
</Product>
<!-- ***************************************************************** -->
<!-- ********** Define Directory Structure ********** -->
<!-- ***************************************************************** -->
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLDIR" Name="NUnit.org">
<Directory Id="BIN" Name="bin">
<Directory Id="ADDINS" Name="addins" />
</Directory>
</Directory>
</Directory>
</Directory>
</Fragment>
</Wix>

Просмотреть файл

@ -16,22 +16,75 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "framework", "framework", "{56F560C7-BBFE-4EE9-AF2E-590E352777BE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runners", "runners", "{FDE065C3-6105-4660-AC37-E3EB445EF105}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "master", "master", "{9A20FD72-0EB2-466F-B2C4-6A46D38D8D9B}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "nunit-framework-merge", "install\framework\nunit-framework-merge.wixproj", "{352151E9-CA8F-4461-AF95-50D1540039C2}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "nunit-runners-merge", "install\runners\nunit-runners-merge.wixproj", "{40FEA8CD-5C48-4BF4-AC67-DF5E5B149425}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "nunit", "install\master\nunit.wixproj", "{809C00DC-3FD3-45BF-BC0E-E284F314D306}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Debug|x64.ActiveCfg = Debug|x64
{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Debug|x64.Build.0 = Debug|x64
{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Debug|x86.ActiveCfg = Debug|x86
{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Debug|x86.Build.0 = Debug|x86
{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Release|x64.ActiveCfg = Release|x64
{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Release|x64.Build.0 = Release|x64
{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Release|x86.ActiveCfg = Release|x86
{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Release|x86.Build.0 = Release|x86
{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Debug|x64.ActiveCfg = Debug|x64
{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Debug|x64.Build.0 = Debug|x64
{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Debug|x86.ActiveCfg = Debug|x86
{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Debug|x86.Build.0 = Debug|x86
{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Release|x64.ActiveCfg = Release|x64
{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Release|x64.Build.0 = Release|x64
{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Release|x86.ActiveCfg = Release|x86
{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Release|x86.Build.0 = Release|x86
{352151E9-CA8F-4461-AF95-50D1540039C2}.Debug|x64.ActiveCfg = Debug|x64
{352151E9-CA8F-4461-AF95-50D1540039C2}.Debug|x64.Build.0 = Debug|x64
{352151E9-CA8F-4461-AF95-50D1540039C2}.Debug|x86.ActiveCfg = Debug|x86
{352151E9-CA8F-4461-AF95-50D1540039C2}.Debug|x86.Build.0 = Debug|x86
{352151E9-CA8F-4461-AF95-50D1540039C2}.Release|x64.ActiveCfg = Release|x64
{352151E9-CA8F-4461-AF95-50D1540039C2}.Release|x64.Build.0 = Release|x64
{352151E9-CA8F-4461-AF95-50D1540039C2}.Release|x86.ActiveCfg = Release|x86
{352151E9-CA8F-4461-AF95-50D1540039C2}.Release|x86.Build.0 = Release|x86
{40FEA8CD-5C48-4BF4-AC67-DF5E5B149425}.Debug|x64.ActiveCfg = Debug|x64
{40FEA8CD-5C48-4BF4-AC67-DF5E5B149425}.Debug|x64.Build.0 = Debug|x64
{40FEA8CD-5C48-4BF4-AC67-DF5E5B149425}.Debug|x86.ActiveCfg = Debug|x86
{40FEA8CD-5C48-4BF4-AC67-DF5E5B149425}.Debug|x86.Build.0 = Debug|x86
{40FEA8CD-5C48-4BF4-AC67-DF5E5B149425}.Release|x64.ActiveCfg = Release|x64
{40FEA8CD-5C48-4BF4-AC67-DF5E5B149425}.Release|x64.Build.0 = Release|x64
{40FEA8CD-5C48-4BF4-AC67-DF5E5B149425}.Release|x86.ActiveCfg = Release|x86
{40FEA8CD-5C48-4BF4-AC67-DF5E5B149425}.Release|x86.Build.0 = Release|x86
{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Debug|x64.ActiveCfg = Debug|x64
{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Debug|x64.Build.0 = Debug|x64
{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Debug|x86.ActiveCfg = Debug|x86
{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Debug|x86.Build.0 = Debug|x86
{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Release|x64.ActiveCfg = Release|x64
{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Release|x64.Build.0 = Release|x64
{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Release|x86.ActiveCfg = Release|x86
{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{20132190-582E-462E-B18B-4B2CEDDDB6C4} = {56F560C7-BBFE-4EE9-AF2E-590E352777BE}
{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75} = {FDE065C3-6105-4660-AC37-E3EB445EF105}
{352151E9-CA8F-4461-AF95-50D1540039C2} = {56F560C7-BBFE-4EE9-AF2E-590E352777BE}
{40FEA8CD-5C48-4BF4-AC67-DF5E5B149425} = {FDE065C3-6105-4660-AC37-E3EB445EF105}
{809C00DC-3FD3-45BF-BC0E-E284F314D306} = {9A20FD72-0EB2-466F-B2C4-6A46D38D8D9B}
EndGlobalSection
EndGlobal