Permalink
Browse files

* Fix Platform issue in Kudu.Console and Kudu.Performance.csproj

* Updated OutputPath for web apps
* Fixed FxCop violation in SSHKeyManager.cs
* Updating ruleset to exclude SQL query vulnerability check
  • Loading branch information...
1 parent 0f21eb8 commit cd612460728433da9cbd9140b1649be446b6c0fd @pranavkm pranavkm committed Mar 20, 2013
View
@@ -72,7 +72,7 @@
This effectively acts as a lock that makes sure that the download operation will only happen once and all
parallel builds will have to wait for it to complete.
-->
- <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;Platform=NOT_IMPORTANT" />
+ <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;Platform=AnyCPU" />
</Target>
<Target Name="_DownloadNuGet">
View
@@ -59,9 +59,11 @@
<Output TaskParameter="Include" ItemName="NodeModulesFiles" />
</CreateItem>
- <Copy SourceFiles="@(NodeModulesFiles)" DestinationFiles="@(NodeModulesFiles->'$(ServiceSiteTargetPath)\bin\node_modules\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy SourceFiles="@(NodeModulesFiles)" DestinationFiles="@(NodeModulesFiles->'$(ServiceSiteTargetPath)\bin\node_modules\%(RecursiveDir)%(Filename)%(Extension)')"
+ SkipUnchangedFiles="true" />
- <Copy SourceFiles="$(ProjectRoot)\Kudu.Services.Web\bin\kudu.exe" DestinationFolder="$(ServiceSiteTargetPath)\bin" />
+ <Copy SourceFiles="$(ProjectRoot)\Kudu.Services.Web\bin\kudu.exe" DestinationFolder="$(ServiceSiteTargetPath)\bin"
+ SkipUnchangedFiles="true" />
<MSBuild Projects="$(ClientSiteProject)"
Targets="pipelinePreDeployCopyAllFilesToOneFolder"
@@ -82,14 +84,15 @@
<Target Name="Build" DependsOnTargets="CreateOutputPath">
<MSBuild Projects="$(ProjectRoot)\kudu.sln"
- Targets="Build"
+ Targets="Build"
Properties="Configuration=$(Configuration);RunCodeAnalysis=true;CodeAnalysisAdditionalOptions=/assemblyCompareMode:StrongNameIgnoringVersion" />
</Target>
<Target Name="ReportFxCopResults" Condition=" '$(TEAMCITY_VERSION)' != '' ">
<ItemGroup>
<FxCopOutputItems Include="$(ProjectRoot)\**\*.CodeAnalysisLog.xml" />
</ItemGroup>
- <Message Text="##teamcity[importData type='FxCop' path='%(FxCopOutputItems.Identity)']" />
+ <Message Text="##teamcity[importData type='FxCop' path='%(FxCopOutputItems.Identity)']"
+ Condition="@(FxCopOutputItems) != '' "/>
</Target>
</Project>
View
@@ -37,6 +37,7 @@
<Rule Id="CA1815" Action="None" />
<Rule Id="CA1824" Action="None" />
<Rule Id="CA2000" Action="None" />
+ <Rule Id="CA2100" Action="None" />
<Rule Id="CA2104" Action="None" />
<Rule Id="CA2105" Action="None" />
<Rule Id="CA2122" Action="None" />
@@ -7,9 +7,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Kudu.Console</RootNamespace>
<AssemblyName>kudu</AssemblyName>
+ <Platform>x86</Platform>
<PlatformTarget>x86</PlatformTarget>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' OR '$(Configuration)|$(Platform)' == 'Release|x86' " />
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.configuration" />
@@ -102,6 +102,7 @@ private string CreateKey()
if (rsa != null)
{
rsa.PersistKeyInCsp = false;
+ rsa.Dispose();
}
}
}
@@ -2,6 +2,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Kudu.sln))\Build\Kudu.tests.targets" />
<PropertyGroup>
+ <Platform>x86</Platform>
<ProjectGuid>{E08D0497-2553-4DF0-9FE4-4D6F75CB80C4}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -10,6 +11,7 @@
<PlatformTarget>x86</PlatformTarget>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' OR '$(Configuration)|$(Platform)' == 'Release|x86' " />
@amitapl

amitapl Mar 20, 2013

Contributor

what does this line do?

<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -3,20 +3,14 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Kudu.sln))\Build\Kudu.targets" />
<PropertyGroup>
- <ProductVersion>
- </ProductVersion>
<ProjectGuid>{6295D938-63FD-4C26-AE00-B32776CC689E}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Kudu.Services.Web</RootNamespace>
<AssemblyName>Kudu.Services.Web</AssemblyName>
+ <OutputPath>bin</OutputPath>
<UseIISExpress>true</UseIISExpress>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>4.0</OldToolsVersion>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
View
@@ -6,15 +6,11 @@
<ProjectGuid>{B0265397-6FCD-4C67-8785-3272D8C1AD79}</ProjectGuid>
<ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
+ <OutputPath>bin\</OutputPath>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Kudu.Web</RootNamespace>
<AssemblyName>Kudu.Web</AssemblyName>
<UseIISExpress>true</UseIISExpress>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>4.0</OldToolsVersion>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />

0 comments on commit cd61246

Please sign in to comment.