Add CodeContractsDeferAnalysis to do all of static checking except ac…

…tually running cccheck.exe
microsoft · Sep 26, 2016 · 30ab1fe · 30ab1fe
1 parent 7aef039
commit 30ab1fe
Show file tree

Hide file tree

Showing 11 changed files with 984 additions and 1,108 deletions.
diff --git a/...osoft.Research/ManagedContract.Setup/MSBuild/v12.0/Microsoft.CodeContractAnalysis.targets b/...osoft.Research/ManagedContract.Setup/MSBuild/v12.0/Microsoft.CodeContractAnalysis.targets
@@ -23,11 +23,11 @@
   <!--=====================================================================
         Running Static Code Analysis
     ======================================================================-->
-
+    
   <Target
     Name="CodeContractsPerformCodeAnalysis"
-    Condition="'$(CodeContractsRunCodeAnalysis)' == 'true'"
-    DependsOnTargets="CodeContractsComputeCodeAnalysisDependencies;CodeContractsRunCodeAnalysis">
+    Condition="'$(CodeContractsRunCodeAnalysis)' == 'true' or '$(CodeContractsDeferCodeAnalysis)' == 'true'"
+    DependsOnTargets="CodeContractsComputeCodeAnalysisDependencies;CodeContractsCodeAnalysisWriteRSPFile;CodeContractsRunCodeAnalysis">
   </Target>
 
   <Target
@@ -61,7 +61,7 @@
 
   <Target
     Name="CodeContractsRunCodeAnalysis"
-    Condition="'$(CodeContractsRunCodeAnalysis)' == 'true' and '$([System.Environment]::GetEnvironmentVariable(`CodeContractsTargetProjectGuid`))' == '' and '$(BuildingProject)'=='true'"
+    Condition="'$(CodeContractsRunCodeAnalysis)' == 'true' and '$(CodeContractsDeferCodeAnalysis)' != 'true' and '$([System.Environment]::GetEnvironmentVariable(`CodeContractsTargetProjectGuid`))' == '' and '$(BuildingProject)'=='true'"
     Inputs="@(CodeContractsCodeAnalysisInput)"
     Outputs="$(CodeContractsCodeAnalysisOutput)"
     >
@@ -101,14 +101,14 @@
         <CodeContractsAnalysisWarning>medium</CodeContractsAnalysisWarning>
       </PropertyGroup>
     </When>
-	 <When Condition="'$(CodeContractsAnalysisWarningLevel)'=='3'">
+     <When Condition="'$(CodeContractsAnalysisWarningLevel)'=='3'">
       <PropertyGroup>
         <CodeContractsAnalysisWarning>full</CodeContractsAnalysisWarning>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-	<CodeContractsAnalysisWarning>low</CodeContractsAnalysisWarning>
+    <CodeContractsAnalysisWarning>low</CodeContractsAnalysisWarning>
       </PropertyGroup>
     </Otherwise>
   </Choose>
@@ -129,11 +129,9 @@
   </Choose>
 
   <Target
-    Name="CodeContractsRunCodeAnalysisInternal"
+    Name="CodeContractsCodeAnalysisWriteRSPFile"
     DependsOnTargets="CodeContractsComputeAllLibPaths;EnsureContractReferenceAssemblyOfDependeeProjects;CodeContractsLoadEnvVars"
     >
-    <Message Text="Run Contract Code Analysis on project guid $(ProjectGuid)" Importance="Low"/>
-
     <PropertyGroup>
       <DeclarativeAssemblyDir>@(ContractDeclarativeAssembly->'%(RootDir)')@(ContractDeclarativeAssembly->'%(Directory)')</DeclarativeAssemblyDir>
       <DeclarativeAssemblyPath>@(ContractDeclarativeAssembly->'%(FullPath)')</DeclarativeAssemblyPath>
@@ -160,23 +158,23 @@
         Condition="'$(CodeContractsRedundantAssumptions)' == 'true'">$(CodeContractCodeAnalysisOptions) -check assumptions</CodeContractCodeAnalysisOptions>        
      <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsAssertsToContractsCheckBox)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest asserttocontracts</CodeContractCodeAnalysisOptions>        
-		<CodeContractCodeAnalysisOptions
+        <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsRedundantTests)' == 'true'">$(CodeContractCodeAnalysisOptions) -check conditionsvalidity</CodeContractCodeAnalysisOptions>        		
-	  <CodeContractCodeAnalysisOptions
-	    Condition="'$(CodeContractsMissingPublicRequiresAsWarnings)' == 'true'">$(CodeContractCodeAnalysisOptions) -missingPublicRequiresAreErrors</CodeContractCodeAnalysisOptions>
-	  <CodeContractCodeAnalysisOptions
-	    Condition="'$(CodeContractsMissingPublicEnsuresAsWarnings)' == 'true'">$(CodeContractCodeAnalysisOptions) -missingPublicEnsuresAreErrors</CodeContractCodeAnalysisOptions>
-	<CodeContractCodeAnalysisOptions
+      <CodeContractCodeAnalysisOptions
+        Condition="'$(CodeContractsMissingPublicRequiresAsWarnings)' == 'true'">$(CodeContractCodeAnalysisOptions) -missingPublicRequiresAreErrors</CodeContractCodeAnalysisOptions>
+      <CodeContractCodeAnalysisOptions
+        Condition="'$(CodeContractsMissingPublicEnsuresAsWarnings)' == 'true'">$(CodeContractCodeAnalysisOptions) -missingPublicEnsuresAreErrors</CodeContractCodeAnalysisOptions>
+    <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestAssumptionsForCallees)' == 'true'">$(CodeContractCodeAnalysisOptions)  -suggest calleeassumes</CodeContractCodeAnalysisOptions>
-	<CodeContractCodeAnalysisOptions
+    <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestAssumptions)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest assumes</CodeContractCodeAnalysisOptions>
     <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestRequires)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest requires</CodeContractCodeAnalysisOptions>
     <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestEnsures)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest methodensures -suggest propertyensures</CodeContractCodeAnalysisOptions>
       <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsNecessaryEnsures)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest necessaryensures</CodeContractCodeAnalysisOptions>
-		<CodeContractCodeAnalysisOptions
+        <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestObjectInvariants)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest objectinvariants</CodeContractCodeAnalysisOptions>
       <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestReadonly)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest readonlyfields</CodeContractCodeAnalysisOptions>
@@ -190,7 +188,7 @@
         Condition="'$(CodeContractsInferObjectInvariants)' == 'true'">$(CodeContractCodeAnalysisOptions) -infer objectinvariants</CodeContractCodeAnalysisOptions>     
       <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsCacheAnalysisResults)' == 'true'">$(CodeContractCodeAnalysisOptions) -cache</CodeContractCodeAnalysisOptions>
- 	<CodeContractCodeAnalysisOptions
+    <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSkipAnalysisIfCannotConnectToCache)' == 'true'">$(CodeContractCodeAnalysisOptions) -forcecacheserver=true</CodeContractCodeAnalysisOptions>
      <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsFailBuildOnWarnings)' == 'true'">$(CodeContractCodeAnalysisOptions) -failOnWarnings</CodeContractCodeAnalysisOptions>
@@ -230,10 +228,18 @@
     </ItemGroup>
 
     <WriteLinesToFile
-      File="$(DeclarativeAssemblyDir)$(ProjectName)cccheck.rsp"
+      File="$(DeclarativeAssemblyDir)$(AssemblyName).cccheck.rsp"
       Lines="@(_CodeContractsCCCheckArgumentLines, ';')"
       Overwrite="true"
       />
+
+  </Target>
+
+  <Target
+      Name="CodeContractsRunCodeAnalysisInternal"
+      DependsOnTargets="CodeContractsCodeAnalysisWriteRSPFile">
+
+    <Message Text="Run Contract Code Analysis on project guid $(ProjectGuid)" Importance="Low"/>
 
     <CodeContractsAnalysis
       Verbose="false"
@@ -246,7 +252,7 @@
       KeepErrors="$(CodeContractsFailBuildOnWarnings)"
       OutputPrefix="CodeContracts: "
       Command='$(CodeContractRunCodeAnalysisCommand)'
-      CommandOptions='"@$(ProjectName)cccheck.rsp"'
+      CommandOptions='"@$(AssemblyName).cccheck.rsp"'
       />
   </Target>
 

diff --git a/Microsoft.Research/ManagedContract.Setup/MSBuild/v12.0/Microsoft.CodeContracts.targets b/Microsoft.Research/ManagedContract.Setup/MSBuild/v12.0/Microsoft.CodeContracts.targets
@@ -257,14 +257,14 @@
     </ItemGroup>
 
     <WriteLinesToFile
-      File="$(IntermediateOutputPath)$(ProjectName)ccrewrite.rsp"
+      File="$(IntermediateOutputPath)$(AssemblyName).ccrewrite.rsp"
       Lines="@(_CodeContractsCCRewriteArgumentLines, ';')"
       Overwrite="true"
       />
 
     <Exec
        WorkingDirectory="$(IntermediateOutputPath)"
-       Command='"$(CodeContractRewriteCommand)" "@$(ProjectName)ccrewrite.rsp"'
+       Command='"$(CodeContractRewriteCommand)" "@$(AssemblyName).ccrewrite.rsp"'
        />
 
     <CallTarget Targets="CodeContractReSign"/>
@@ -291,7 +291,7 @@
     <PropertyGroup>
       <!-- SN is in the Framework SDK tools path, but TargetFrameworkSDKToolsDirectory isn't always available  -->
       <CodeContractsSnExe Condition=" '$(TargetFrameworkSDKToolsDirectory)' != '' ">$(TargetFrameworkSDKToolsDirectory)sn.exe</CodeContractsSnExe>
-      <CodeContractsSnExe Condition=" '$(TargetFrameworkSDKToolsDirectory)' == '' ">$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\sn.exe</CodeContractsSnExe>
+			<CodeContractsSnExe Condition=" '$(TargetFrameworkSDKToolsDirectory)' == '' ">$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\sn.exe</CodeContractsSnExe>
     </PropertyGroup>
     <Exec
        Condition="'$(KeyOriginatorFile)' != ''"   
@@ -348,19 +348,19 @@
     </ItemGroup>
 
     <WriteLinesToFile
-      File="$(IntermediateOutputPath)$(ProjectName)ccrefgen.rsp"
+      File="$(IntermediateOutputPath)$(AssemblyName).ccrefgen.rsp"
       Lines="@(_CodeContractsCCRefGenArgumentLines, ';')"
       Overwrite="true"
       />
 
     <Exec
        Condition="Exists('@(ContractDeclarativeAssembly)')"
-       Command='"$(CodeContractsCCRefgenCommand)" "@$(IntermediateOutputPath)$(ProjectName)ccrefgen.rsp"'
+       Command='"$(CodeContractsCCRefgenCommand)" "@$(IntermediateOutputPath)$(AssemblyName).ccrefgen.rsp"'
        />
     <ItemGroup
        Condition="Exists('@(ContractReferenceAssemblyAbsolute)')">
       <FileWrites
-         Include="@(ContractReferenceAssemblies);$(IntermediateOutputPath)$(ProjectName)ccrefgen.rsp"/>
+         Include="@(ContractReferenceAssemblies);$(IntermediateOutputPath)$(AssemblyName).ccrefgen.rsp"/>
     </ItemGroup>
 
   </Target>
@@ -586,7 +586,7 @@
   <Target
      Name="CodeContractsComputeAllLibPaths"
      DependsOnTargets="CodeContractsComputeReferencedLibPaths"
-	 >
+     >
     <Message Text="CodeContractsComputeAllLibPaths" Importance="low"/>
     <RemoveDuplicates
        Inputs="@(CodeContractsBuildLibPaths);$(CodeContractsReferenceAssemblyLibPath);$(CodeContractsLibPaths)">
@@ -634,13 +634,13 @@
     </ItemGroup>
 
     <WriteLinesToFile
-      File="$(IntermediateOutputPath)$(ProjectName)ccdocgen.rsp"
+      File="$(IntermediateOutputPath)$(AssemblyName).ccdocgen.rsp"
       Lines="@(_CodeContractsCCDocGenArgumentLines, ';')"
       Overwrite="true"
       />
 
     <Exec
-       Command='"$(CodeContractsCCdocgenCommand)" "@$(IntermediateOutputPath)$(ProjectName)ccdocgen.rsp"' 
+       Command='"$(CodeContractsCCdocgenCommand)" "@$(IntermediateOutputPath)$(AssemblyName).ccdocgen.rsp"' 
        />
   </Target>
 

diff --git a/...osoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContractAnalysis.targets b/...osoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContractAnalysis.targets
@@ -23,11 +23,11 @@
   <!--=====================================================================
         Running Static Code Analysis
     ======================================================================-->
-
+    
   <Target
     Name="CodeContractsPerformCodeAnalysis"
     Condition="'$(CodeContractsRunCodeAnalysis)' == 'true'"
-    DependsOnTargets="CodeContractsComputeCodeAnalysisDependencies;CodeContractsRunCodeAnalysis">
+    DependsOnTargets="CodeContractsComputeCodeAnalysisDependencies;CodeContractsCodeAnalysisWriteRSPFile;CodeContractsRunCodeAnalysis">
   </Target>
 
   <Target
@@ -61,7 +61,7 @@
 
   <Target
     Name="CodeContractsRunCodeAnalysis"
-    Condition="'$(CodeContractsRunCodeAnalysis)' == 'true' and '$([System.Environment]::GetEnvironmentVariable(`CodeContractsTargetProjectGuid`))' == '' and '$(BuildingProject)'=='true'"
+    Condition="'$(CodeContractsRunCodeAnalysis)' == 'true' and '$(CodeContractsDeferCodeAnalysis)' != 'true' and '$([System.Environment]::GetEnvironmentVariable(`CodeContractsTargetProjectGuid`))' == '' and '$(BuildingProject)'=='true'"
     Inputs="@(CodeContractsCodeAnalysisInput)"
     Outputs="$(CodeContractsCodeAnalysisOutput)"
     >
@@ -101,14 +101,14 @@
         <CodeContractsAnalysisWarning>medium</CodeContractsAnalysisWarning>
       </PropertyGroup>
     </When>
-	 <When Condition="'$(CodeContractsAnalysisWarningLevel)'=='3'">
+     <When Condition="'$(CodeContractsAnalysisWarningLevel)'=='3'">
       <PropertyGroup>
         <CodeContractsAnalysisWarning>full</CodeContractsAnalysisWarning>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-	<CodeContractsAnalysisWarning>low</CodeContractsAnalysisWarning>
+    <CodeContractsAnalysisWarning>low</CodeContractsAnalysisWarning>
       </PropertyGroup>
     </Otherwise>
   </Choose>
@@ -129,11 +129,9 @@
   </Choose>
 
   <Target
-    Name="CodeContractsRunCodeAnalysisInternal"
+    Name="CodeContractsCodeAnalysisWriteRSPFile"
     DependsOnTargets="CodeContractsComputeAllLibPaths;EnsureContractReferenceAssemblyOfDependeeProjects;CodeContractsLoadEnvVars"
     >
-    <Message Text="Run Contract Code Analysis on project guid $(ProjectGuid)" Importance="Low"/>
-
     <PropertyGroup>
       <DeclarativeAssemblyDir>@(ContractDeclarativeAssembly->'%(RootDir)')@(ContractDeclarativeAssembly->'%(Directory)')</DeclarativeAssemblyDir>
       <DeclarativeAssemblyPath>@(ContractDeclarativeAssembly->'%(FullPath)')</DeclarativeAssemblyPath>
@@ -160,23 +158,23 @@
         Condition="'$(CodeContractsRedundantAssumptions)' == 'true'">$(CodeContractCodeAnalysisOptions) -check assumptions</CodeContractCodeAnalysisOptions>        
      <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsAssertsToContractsCheckBox)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest asserttocontracts</CodeContractCodeAnalysisOptions>        
-		<CodeContractCodeAnalysisOptions
+        <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsRedundantTests)' == 'true'">$(CodeContractCodeAnalysisOptions) -check conditionsvalidity</CodeContractCodeAnalysisOptions>        		
-	  <CodeContractCodeAnalysisOptions
-	    Condition="'$(CodeContractsMissingPublicRequiresAsWarnings)' == 'true'">$(CodeContractCodeAnalysisOptions) -missingPublicRequiresAreErrors</CodeContractCodeAnalysisOptions>
-	  <CodeContractCodeAnalysisOptions
-	    Condition="'$(CodeContractsMissingPublicEnsuresAsWarnings)' == 'true'">$(CodeContractCodeAnalysisOptions) -missingPublicEnsuresAreErrors</CodeContractCodeAnalysisOptions>
-	<CodeContractCodeAnalysisOptions
+      <CodeContractCodeAnalysisOptions
+        Condition="'$(CodeContractsMissingPublicRequiresAsWarnings)' == 'true'">$(CodeContractCodeAnalysisOptions) -missingPublicRequiresAreErrors</CodeContractCodeAnalysisOptions>
+      <CodeContractCodeAnalysisOptions
+        Condition="'$(CodeContractsMissingPublicEnsuresAsWarnings)' == 'true'">$(CodeContractCodeAnalysisOptions) -missingPublicEnsuresAreErrors</CodeContractCodeAnalysisOptions>
+    <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestAssumptionsForCallees)' == 'true'">$(CodeContractCodeAnalysisOptions)  -suggest calleeassumes</CodeContractCodeAnalysisOptions>
-	<CodeContractCodeAnalysisOptions
+    <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestAssumptions)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest assumes</CodeContractCodeAnalysisOptions>
     <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestRequires)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest requires</CodeContractCodeAnalysisOptions>
     <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestEnsures)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest methodensures -suggest propertyensures</CodeContractCodeAnalysisOptions>
       <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsNecessaryEnsures)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest necessaryensures</CodeContractCodeAnalysisOptions>
-		<CodeContractCodeAnalysisOptions
+        <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestObjectInvariants)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest objectinvariants</CodeContractCodeAnalysisOptions>
       <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSuggestReadonly)' == 'true'">$(CodeContractCodeAnalysisOptions) -suggest readonlyfields</CodeContractCodeAnalysisOptions>
@@ -190,7 +188,7 @@
         Condition="'$(CodeContractsInferObjectInvariants)' == 'true'">$(CodeContractCodeAnalysisOptions) -infer objectinvariants</CodeContractCodeAnalysisOptions>     
       <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsCacheAnalysisResults)' == 'true'">$(CodeContractCodeAnalysisOptions) -cache</CodeContractCodeAnalysisOptions>
- 	<CodeContractCodeAnalysisOptions
+    <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsSkipAnalysisIfCannotConnectToCache)' == 'true'">$(CodeContractCodeAnalysisOptions) -forcecacheserver=true</CodeContractCodeAnalysisOptions>
      <CodeContractCodeAnalysisOptions
         Condition="'$(CodeContractsFailBuildOnWarnings)' == 'true'">$(CodeContractCodeAnalysisOptions) -failOnWarnings</CodeContractCodeAnalysisOptions>
@@ -230,10 +228,18 @@
     </ItemGroup>
 
     <WriteLinesToFile
-      File="$(DeclarativeAssemblyDir)$(ProjectName)cccheck.rsp"
+      File="$(DeclarativeAssemblyDir)$(AssemblyName).cccheck.rsp"
       Lines="@(_CodeContractsCCCheckArgumentLines, ';')"
       Overwrite="true"
       />
+
+  </Target>
+
+  <Target
+      Name="CodeContractsRunCodeAnalysisInternal"
+      DependsOnTargets="CodeContractsCodeAnalysisWriteRSPFile">
+
+    <Message Text="Run Contract Code Analysis on project guid $(ProjectGuid)" Importance="Low"/>
 
     <CodeContractsAnalysis
       Verbose="false"
@@ -246,7 +252,7 @@
       KeepErrors="$(CodeContractsFailBuildOnWarnings)"
       OutputPrefix="CodeContracts: "
       Command='$(CodeContractRunCodeAnalysisCommand)'
-      CommandOptions='"@$(ProjectName)cccheck.rsp"'
+      CommandOptions='"@$(AssemblyName).cccheck.rsp"'
       />
   </Target>
 

diff --git a/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContracts.targets b/Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContracts.targets
@@ -262,14 +262,14 @@
     </ItemGroup>
 
     <WriteLinesToFile
-      File="$(IntermediateOutputPath)$(ProjectName)ccrewrite.rsp"
+      File="$(IntermediateOutputPath)$(AssemblyName).ccrewrite.rsp"
       Lines="@(_CodeContractsCCRewriteArgumentLines, ';')"
       Overwrite="true"
       />
 
     <Exec
        WorkingDirectory="$(IntermediateOutputPath)"
-       Command='"$(CodeContractRewriteCommand)" "@$(ProjectName)ccrewrite.rsp"'
+       Command='"$(CodeContractRewriteCommand)" "@$(AssemblyName).ccrewrite.rsp"'
        />
 
     <CallTarget Targets="CodeContractReSign"/>
@@ -353,19 +353,19 @@
     </ItemGroup>
 
     <WriteLinesToFile
-      File="$(IntermediateOutputPath)$(ProjectName)ccrefgen.rsp"
+      File="$(IntermediateOutputPath)$(AssemblyName).ccrefgen.rsp"
       Lines="@(_CodeContractsCCRefGenArgumentLines, ';')"
       Overwrite="true"
       />
 
     <Exec
        Condition="Exists('@(ContractDeclarativeAssembly)')"
-       Command='"$(CodeContractsCCRefgenCommand)" "@$(IntermediateOutputPath)$(ProjectName)ccrefgen.rsp"'
+       Command='"$(CodeContractsCCRefgenCommand)" "@$(IntermediateOutputPath)$(AssemblyName).ccrefgen.rsp"'
        />
     <ItemGroup
        Condition="Exists('@(ContractReferenceAssemblyAbsolute)')">
       <FileWrites
-         Include="@(ContractReferenceAssemblies);$(IntermediateOutputPath)$(ProjectName)ccrefgen.rsp"/>
+         Include="@(ContractReferenceAssemblies);$(IntermediateOutputPath)$(AssemblyName).ccrefgen.rsp"/>
     </ItemGroup>
 
   </Target>
@@ -591,7 +591,7 @@
   <Target
      Name="CodeContractsComputeAllLibPaths"
      DependsOnTargets="CodeContractsComputeReferencedLibPaths"
-	 >
+     >
     <Message Text="CodeContractsComputeAllLibPaths" Importance="low"/>
     <RemoveDuplicates
        Inputs="@(CodeContractsBuildLibPaths);$(CodeContractsReferenceAssemblyLibPath);$(CodeContractsLibPaths)">
@@ -639,13 +639,13 @@
     </ItemGroup>
 
     <WriteLinesToFile
-      File="$(IntermediateOutputPath)$(ProjectName)ccdocgen.rsp"
+      File="$(IntermediateOutputPath)$(AssemblyName).ccdocgen.rsp"
       Lines="@(_CodeContractsCCDocGenArgumentLines, ';')"
       Overwrite="true"
       />
 
     <Exec
-       Command='"$(CodeContractsCCdocgenCommand)" "@$(IntermediateOutputPath)$(ProjectName)ccdocgen.rsp"' 
+       Command='"$(CodeContractsCCdocgenCommand)" "@$(IntermediateOutputPath)$(AssemblyName).ccdocgen.rsp"' 
        />
   </Target>