Commit ec9cdcd2 authored by David Kline's avatar David Kline Committed by GitHub
Browse files

Merge pull request #107 from Microsoft/HymanMatt2 

Import StyleCop target files only if StyleCop is installed
parents c01c5fe6 37a0f593

WindowsDevicePortalWrapper/MockDataGenerator/MockDataGenerator.csproj

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
    <FileAlignment>512</FileAlignment>

    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

    <StyleCopTreatErrorsAsWarnings>True</StyleCopTreatErrorsAsWarnings>

    <StyleCopTargetsDir>$(registry:HKEY_LOCAL_MACHINE\Software\CodePlex\StyleCop@TargetsDir)</StyleCopTargetsDir>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -58,7 +59,7 @@ 
    </ProjectReference>

  </ItemGroup>

  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.7\StyleCop.targets" />

  <Import Project="$(StyleCopTargetsDir)StyleCop.targets" Condition="'$(StyleCopTargetsDir)' != ''"/>

  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

       Other similar extension points exist, see Microsoft.Common.targets.

  <Target Name="BeforeBuild">

WindowsDevicePortalWrapper/MockDataGenerator/Program.cs

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ namespace MockDataGenerator 
                Directory.CreateDirectory(directory);

            }





            if (parameters.HasParameter("endpoint"))

            {

                HttpMethods httpMethod = HttpMethods.Get;

WindowsDevicePortalWrapper/TestApp/TestApp.csproj

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
    <FileAlignment>512</FileAlignment>

    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

    <StyleCopTreatErrorsAsWarnings>True</StyleCopTreatErrorsAsWarnings>

    <StyleCopTargetsDir>$(registry:HKEY_LOCAL_MACHINE\Software\CodePlex\StyleCop@TargetsDir)</StyleCopTargetsDir>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -56,7 +57,7 @@ 
    </ProjectReference>

  </ItemGroup>

  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.7\StyleCop.targets" />

  <Import Project="$(StyleCopTargetsDir)StyleCop.targets" Condition="'$(StyleCopTargetsDir)' != ''"/>

  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

       Other similar extension points exist, see Microsoft.Common.targets.

  <Target Name="BeforeBuild">

WindowsDevicePortalWrapper/TestAppHL/TestAppHL.csproj

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
    <FileAlignment>512</FileAlignment>

    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

    <StyleCopTreatErrorsAsWarnings>True</StyleCopTreatErrorsAsWarnings>

    <StyleCopTargetsDir>$(registry:HKEY_LOCAL_MACHINE\Software\CodePlex\StyleCop@TargetsDir)</StyleCopTargetsDir>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -56,7 +57,7 @@ 
    </ProjectReference>

  </ItemGroup>

  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.7\StyleCop.targets" />

  <Import Project="$(StyleCopTargetsDir)StyleCop.targets" Condition="'$(StyleCopTargetsDir)' != ''"/>

  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

       Other similar extension points exist, see Microsoft.Common.targets.

  <Target Name="BeforeBuild">

WindowsDevicePortalWrapper/TestAppIoT/TestAppIoT.csproj

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
    <FileAlignment>512</FileAlignment>

    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

    <StyleCopTreatErrorsAsWarnings>True</StyleCopTreatErrorsAsWarnings>

    <StyleCopTargetsDir>$(registry:HKEY_LOCAL_MACHINE\Software\CodePlex\StyleCop@TargetsDir)</StyleCopTargetsDir>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -56,7 +57,7 @@ 
    </ProjectReference>

  </ItemGroup>

  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.7\StyleCop.targets" />

  <Import Project="$(StyleCopTargetsDir)StyleCop.targets" Condition="'$(StyleCopTargetsDir)' != ''"/>

  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

       Other similar extension points exist, see Microsoft.Common.targets.

  <Target Name="BeforeBuild">