diff --git a/build.proj b/build.proj
index b1679966918c..7d5ff416efcb 100644
--- a/build.proj
+++ b/build.proj
@@ -53,6 +53,7 @@
     <CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
                             Condition=" '$(Scope)' == 'ServiceManagement' or '$(Scope)' == 'AzureStorage' "/>
     <SetupSln Include=".\setup\azurepowershell.sln" />
+    <StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
   </ItemGroup>
   
   <!--
@@ -161,6 +162,14 @@
       Properties="Configuration=$(Configuration);Platform=Any CPU"
       ContinueOnError="false" 
       Condition=" '$(Scope)' == 'all' "/>
+
+    <MSBuild
+      Projects="@(StaticAnalysis)"
+      Targets="Build"
+      Properties="Configuration=Debug;Platform=Any CPU"
+      ContinueOnError="false" />
+
+    <CallTarget Targets="DependencyAnalysis" />
     
     <CallTarget Targets="CodeSignInstaller" 
                 Condition=" '$(CodeSign)' == 'true' and '$(Scope)' == 'all'" />    
@@ -280,6 +289,12 @@
     <Copy SourceFiles="@(InstallersToSign)" DestinationFolder="signed" Condition="$(DelaySign)" />
   </Target>
   
+  <!-- Run Dependecy Analyzer -->
+  <Target Name="DependencyAnalysis">
+    <Message Importance="high" Text="Running Dependency Analysis..." />
+    <Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package"/>
+  </Target>
+
   <!-- Publish all packages -->
   <Target Name="Publish">
     <Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />
diff --git a/tools/StaticAnalysis/Static Analysis.csproj b/tools/StaticAnalysis/StaticAnalysis.csproj
similarity index 97%
rename from tools/StaticAnalysis/Static Analysis.csproj
rename to tools/StaticAnalysis/StaticAnalysis.csproj
index 63c60ce4ec69..cb94c8f63485 100644
--- a/tools/StaticAnalysis/Static Analysis.csproj	
+++ b/tools/StaticAnalysis/StaticAnalysis.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\src\Package</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\src\Package</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/tools/StaticAnalysis/Static Analysis.sln b/tools/StaticAnalysis/StaticAnalysis.sln
similarity index 92%
rename from tools/StaticAnalysis/Static Analysis.sln
rename to tools/StaticAnalysis/StaticAnalysis.sln
index 8b59a0384e02..ff18b9d7cfe9 100644
--- a/tools/StaticAnalysis/Static Analysis.sln	
+++ b/tools/StaticAnalysis/StaticAnalysis.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Static Analysis", "Static Analysis.csproj", "{68384B59-BA0C-4B7B-B3F6-9C7988296C16}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Static Analysis", "StaticAnalysis.csproj", "{68384B59-BA0C-4B7B-B3F6-9C7988296C16}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution