Skip to content

Commit 30b460c

Browse files
committed
Merge pull request #147 from huangpf/dev
Dev
2 parents 48f5767 + 415f4d3 commit 30b460c

File tree

3 files changed

+11
-24
lines changed

3 files changed

+11
-24
lines changed
Binary file not shown.
Binary file not shown.

src/ResourceManager/LogicApp/Commands.LogicApp/Commands.LogicApp.csproj

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
43
<PropertyGroup>
54
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
65
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -23,16 +22,13 @@
2322
<DefineConstants>DEBUG;TRACE</DefineConstants>
2423
<ErrorReport>prompt</ErrorReport>
2524
<WarningLevel>4</WarningLevel>
25+
<RunCodeAnalysis>true</RunCodeAnalysis>
2626
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2727
<Prefer32Bit>false</Prefer32Bit>
28-
<RunCodeAnalysis>false</RunCodeAnalysis>
2928
</PropertyGroup>
3029
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31-
<SignAssembly>true</SignAssembly>
32-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
33-
<DelaySign>true</DelaySign>
3430
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.LogicApp</OutputPath>
35-
<DefineConstants>TRACE</DefineConstants>
31+
<DefineConstants>TRACE;SIGN</DefineConstants>
3632
<Optimize>true</Optimize>
3733
<DebugType>pdbonly</DebugType>
3834
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -41,18 +37,20 @@
4137
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
4238
<ErrorReport>prompt</ErrorReport>
4339
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
44-
<CodeAnalysisRuleSetDirectories>;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\Rule Sets</CodeAnalysisRuleSetDirectories>
45-
<CodeAnalysisRuleDirectories>;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\FxCop\Rules</CodeAnalysisRuleDirectories>
46-
<RunCodeAnalysis>true</RunCodeAnalysis>
40+
<CodeAnalysisRuleSetDirectories>;$(ProgramFiles)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\Rule Sets</CodeAnalysisRuleSetDirectories>
41+
<CodeAnalysisRuleDirectories>;$(ProgramFiles)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\Rules</CodeAnalysisRuleDirectories>
42+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
43+
<SignAssembly>true</SignAssembly>
44+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
45+
<DelaySign>true</DelaySign>
4746
<Prefer32Bit>false</Prefer32Bit>
4847
</PropertyGroup>
4948
<PropertyGroup>
5049
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5150
</PropertyGroup>
5251
<ItemGroup>
53-
<Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54-
<SpecificVersion>False</SpecificVersion>
55-
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll</HintPath>
52+
<Reference Include="Hyak.Common">
53+
<HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
5654
</Reference>
5755
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5856
<SpecificVersion>False</SpecificVersion>
@@ -184,9 +182,6 @@
184182
<Name>Commands.Resources</Name>
185183
</ProjectReference>
186184
</ItemGroup>
187-
<ItemGroup>
188-
<Folder Include="Models\" />
189-
</ItemGroup>
190185
<ItemGroup>
191186
<EmbeddedResource Include="Properties\Resource.resx">
192187
<Generator>ResXFileCodeGenerator</Generator>
@@ -206,12 +201,4 @@
206201
</Content>
207202
</ItemGroup>
208203
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
209-
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
210-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
211-
Other similar extension points exist, see Microsoft.Common.targets.
212-
<Target Name="BeforeBuild">
213-
</Target>
214-
<Target Name="AfterBuild">
215-
</Target>
216-
-->
217204
</Project>

0 commit comments

Comments
 (0)