diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2010-07-25 07:42:38 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-07-25 07:42:38 +0400 |
| commit | a1299357511f38852414b73bc06e9c6260eed03b (patch) | |
| tree | 8a67b43bbf918b5976694feea704233b17cf1706 /setup | |
| parent | 65129e63c863c452c569c0d26c295f2b2cf18e9d (diff) | |
Normalize line endings in project files that were committed from Windows
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/WixSetup/WixSetup.wixproj | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/setup/WixSetup/WixSetup.wixproj b/setup/WixSetup/WixSetup.wixproj index eb0fdbdc62..371dde9825 100644 --- a/setup/WixSetup/WixSetup.wixproj +++ b/setup/WixSetup/WixSetup.wixproj @@ -1,54 +1,54 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
- <ProductVersion>3.0</ProductVersion>
- <ProjectGuid>{33f58ffc-956e-4079-b27a-160a57ffea7a}</ProjectGuid>
- <SchemaVersion>2.0</SchemaVersion>
- <OutputName>Setup</OutputName>
- <OutputType>Package</OutputType>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <OutputPath>bin\$(Configuration)\</OutputPath>
- <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>Debug</DefineConstants>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\$(Configuration)\</OutputPath>
- <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="Product.wxs" />
- </ItemGroup>
- <ItemGroup>
- <WixExtension Include="WixNetFxExtension">
- <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
- </WixExtension>
- <WixExtension Include="WixUIExtension">
- <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
- </WixExtension>
- </ItemGroup>
- <ItemGroup>
- <Folder Include="Bitmaps\" />
- <Folder Include="Libraries\" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Bitmaps\bannrbmp.bmp" />
- <Content Include="Bitmaps\dlgbmp.bmp" />
- <Content Include="Bitmaps\MonoDevelop.ico" />
- <Content Include="Libraries\ICSharpCode.SharpZipLib.dll" />
- <Content Include="Libraries\Mono.GetOptions.dll" />
- <Content Include="Libraries\monodoc.dll" />
- <Content Include="license.rtf" />
- </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>
- -->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">x86</Platform> + <ProductVersion>3.0</ProductVersion> + <ProjectGuid>{33f58ffc-956e-4079-b27a-160a57ffea7a}</ProjectGuid> + <SchemaVersion>2.0</SchemaVersion> + <OutputName>Setup</OutputName> + <OutputType>Package</OutputType> + <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <OutputPath>bin\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> + <DefineConstants>Debug</DefineConstants> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <ItemGroup> + <Compile Include="Product.wxs" /> + </ItemGroup> + <ItemGroup> + <WixExtension Include="WixNetFxExtension"> + <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath> + </WixExtension> + <WixExtension Include="WixUIExtension"> + <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath> + </WixExtension> + </ItemGroup> + <ItemGroup> + <Folder Include="Bitmaps\" /> + <Folder Include="Libraries\" /> + </ItemGroup> + <ItemGroup> + <Content Include="Bitmaps\bannrbmp.bmp" /> + <Content Include="Bitmaps\dlgbmp.bmp" /> + <Content Include="Bitmaps\MonoDevelop.ico" /> + <Content Include="Libraries\ICSharpCode.SharpZipLib.dll" /> + <Content Include="Libraries\Mono.GetOptions.dll" /> + <Content Include="Libraries\monodoc.dll" /> + <Content Include="license.rtf" /> + </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> + --> </Project>
\ No newline at end of file |