Permalink
Browse files

Fixed cmd line build for VS2013 only machines

- Ensure we pass through the VisualStudioVersion property to sub-builds
- Remove the hard-coded path to msbuild, means you need to run build.cmd from a VS dev cmd prompt
  • Loading branch information...
1 parent 7b93045 commit 772caa60cd45306fca8761f9395dcb5f2afd5229 @DamianEdwards DamianEdwards committed Oct 14, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 build.cmd
  2. +2 −2 build/Build.proj
View
@@ -7,4 +7,4 @@ set config=%2
if "%config%" == "" (
set config=Debug
)
-%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Build\Build.proj /t:"%target%" /p:Configuration="%config%" /m /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false
+msbuild Build\Build.proj /t:"%target%" /p:Configuration="%config%" /m /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false
View
@@ -66,7 +66,7 @@
<RunFxCop>true</RunFxCop>
<Sample>false</Sample>
<BuildTargets>Build</BuildTargets>
- <BuildProperties>Configuration=$(Configuration);ArtifactsDir=$(ProjectArtifactsDir);SolutionDir=$(ProjectRoot)\;$(ExtraProperties)</BuildProperties>
+ <BuildProperties>VisualStudioVersion=$(VisualStudioVersion);Configuration=$(Configuration);ArtifactsDir=$(ProjectArtifactsDir);SolutionDir=$(ProjectRoot)\;$(ExtraProperties)</BuildProperties>
<CopyArtifacts>true</CopyArtifacts>
<Platform>Net45</Platform>
</Projects>
@@ -371,7 +371,7 @@
<Copy SourceFiles="@(JavaScript)" DestinationFiles="$(PackageSrcDir)\Content\%(VersionedFileName)" />
</Target>
- <Target Name="RunCodeAnalysis" DependsOnTargets="CreateOutputDirs" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v11.0\CodeAnalysis\fxcoptask.dll')">
+ <Target Name="RunCodeAnalysis" DependsOnTargets="CreateOutputDirs" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeAnalysis\fxcoptask.dll')">
<ItemGroup>
<ProjectsToAnalyze Include="@(Projects)" Condition="%(Build) And %(RunFxCop) And !%(Sample)">
<BuildProperties>%(BuildProperties);RunCodeAnalysis=true</BuildProperties>

0 comments on commit 772caa6

Please sign in to comment.