Skip to content

Commit ae70fe9

Browse files
committed
Solution and samples project updated to allow round-tripping with VS 2012.
1 parent 2ed8da0 commit ae70fe9

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

FluentAssertionsMvc.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Web Developer Express 2010
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2012
44
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc3", "src\FluentAssertions.Mvc3\FluentAssertions.Mvc3.csproj", "{53589F79-0908-409A-8366-3E18DC637600}"
55
EndProject
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc3.Tests", "tests\FluentAssertions.Mvc3.Tests\FluentAssertions.Mvc3.Tests.csproj", "{3CB00FF9-3DC2-460F-82E8-EBFB6339247D}"

samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.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')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,6 +16,11 @@
1516
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1617
<MvcBuildViews>false</MvcBuildViews>
1718
<UseIISExpress>false</UseIISExpress>
19+
<FileUpgradeFlags>
20+
</FileUpgradeFlags>
21+
<UpgradeBackupLocation>
22+
</UpgradeBackupLocation>
23+
<OldToolsVersion>4.0</OldToolsVersion>
1824
</PropertyGroup>
1925
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2026
<DebugSymbols>true</DebugSymbols>
@@ -153,8 +159,13 @@
153159
<Name>FluentAssertions.Mvc3</Name>
154160
</ProjectReference>
155161
</ItemGroup>
162+
<PropertyGroup>
163+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
164+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
165+
</PropertyGroup>
156166
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
157-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
167+
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
168+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
158169
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
159170
Other similar extension points exist, see Microsoft.Common.targets.
160171
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)