Skip to content

Commit dd4e504

Browse files
committed
Fix build of "classic" ASP.NET sample projects (React.Sample.Cassette, React.Sample.Mvc4, React.Sample.Webpack)
1 parent 8dfcf21 commit dd4e504

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Diff for: src/React.Sample.Cassette/React.Sample.Cassette.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -198,10 +198,10 @@
198198
</ItemGroup>
199199
<PropertyGroup>
200200
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
201-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
201+
<OldVSToolsPath Condition="'$(OldVSToolsPath)' == ''">C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v14.0\</OldVSToolsPath>
202202
</PropertyGroup>
203203
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
204-
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
204+
<Import Project="$(OldVSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(OldVSToolsPath)' != ''" />
205205
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
206206
<Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
207207
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
@@ -233,4 +233,4 @@
233233
</Target>
234234
<Target Name="AfterBuild">
235235
</Target> -->
236-
</Project>
236+
</Project>

Diff for: src/React.Sample.Mvc4/React.Sample.Mvc4.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -192,10 +192,10 @@
192192
</ItemGroup>
193193
<PropertyGroup>
194194
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
195-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
195+
<OldVSToolsPath Condition="'$(OldVSToolsPath)' == ''">C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v14.0\</OldVSToolsPath>
196196
</PropertyGroup>
197197
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
198-
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
198+
<Import Project="$(OldVSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(OldVSToolsPath)' != ''" />
199199
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
200200
<Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
201201
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
@@ -229,4 +229,4 @@
229229
</Target>
230230
<Target Name="AfterBuild">
231231
</Target> -->
232-
</Project>
232+
</Project>

Diff for: src/React.Sample.Webpack/React.Sample.Webpack.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -175,10 +175,10 @@
175175
</ItemGroup>
176176
<PropertyGroup>
177177
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
178-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
178+
<OldVSToolsPath Condition="'$(OldVSToolsPath)' == ''">C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v14.0\</OldVSToolsPath>
179179
</PropertyGroup>
180180
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
181-
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
181+
<Import Project="$(OldVSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(OldVSToolsPath)' != ''" />
182182
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
183183
<Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
184184
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
@@ -207,4 +207,4 @@
207207
</Target>
208208
<Target Name="AfterBuild">
209209
</Target> -->
210-
</Project>
210+
</Project>

0 commit comments

Comments
 (0)