Fixes after merging with Ipv6 contrib. Updated projects and solutions to support VS 2012.

This commit is contained in:
Feodor 2012-08-20 13:29:51 -07:00
parent df5da7b015
commit d8e68fd051
19 changed files with 65 additions and 59 deletions

View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -13,12 +14,16 @@
<AssemblyName>WebsitePanel.WebPortal</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<OldToolsVersion>4.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -202,9 +207,6 @@
<Content Include="Global.asax" />
</ItemGroup>
<ItemGroup>
<None Include="App_Data\SiteSettings.config">
<SubType>Designer</SubType>
</None>
<Content Include="App_Containers\Default\Browse.ascx" />
<Content Include="App_Containers\Default\Edit.ascx" />
<Content Include="Default.aspx" />
@ -219,6 +221,7 @@
<ItemGroup>
<Content Include="App_Browsers\CSSFriendlyAdapters.browser" />
<Content Include="App_Data\ModulesData.config" />
<Content Include="App_Data\SiteSettings.config" />
<None Include="App_Data\SupportedThemes.config" />
<None Include="App_Data\Countries.config" />
<None Include="App_Data\CountryStates.config" />
@ -694,6 +697,10 @@
<EmbeddedResource Include="Code\Adapters\empty.gif" />
</ItemGroup>
<ItemGroup />
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\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.
@ -720,7 +727,8 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<PropertyGroup>
<IncludeSetAclProviderOnDestination>False</IncludeSetAclProviderOnDestination>
<ExcludeFilesFromPackage>True</ExcludeFilesFromPackage>
@ -730,9 +738,6 @@
</CopyAllFilesToSingleFolderForPackageDependsOn>
</PropertyGroup>
<ItemGroup>
<ExcludeFromPackageFiles Include="**\SiteSettings.config">
<FromTarget>Project</FromTarget>
</ExcludeFromPackageFiles>
<ExcludeFromPackageFiles Include="**\Web.config">
<FromTarget>Project</FromTarget>
</ExcludeFromPackageFiles>