Skip to content

Commit 55f776e

Browse files
Liudmila MolkovaJinhuafei
authored andcommitted
Fix Build script (#18)
* Fix nuspec and Build script * minor review comments
1 parent 050d938 commit 55f776e

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

Build.cmd

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ set EnableNuGetPackageRestore=true
66

77
set logOptions=/flp:Summary;Verbosity=detailed;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err
88

9-
REM Find the most recent 32bit MSBuild.exe on the system. Require v12.0 (installed with VS2013) or later since .NET 4.0
10-
REM is not supported. Always quote the %MSBuild% value when setting the variable and never quote %MSBuild% references.
11-
set MSBuild="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
12-
if not exist %MSBuild% @set MSBuild="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
9+
REM Find the most recent 32bit MSBuild.exe on the system. Require v14.0 (installed with VS2015) or later. Always quote the %MSBuild% value when setting the variable and never quote %MSBuild% references.
10+
set MSBuild="%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
1311
if not exist %MSBuild% (
1412
echo Could not find msbuild.exe. Please run this from a Visual Studio developer prompt
1513
goto BuildFail
1614
)
1715

18-
%MSBuild% "%~dp0\Microsoft.AspNet.TelemetryCorrelation.msbuild" %logOptions% /v:minimal /maxcpucount /nodeReuse:false %*
16+
%MSBuild% "%~dp0\Microsoft.AspNet.TelemetryCorrelation.msbuild" %logOptions% /v:minimal /maxcpucount /nodeReuse:false /p:Configuration=Release /p:Platform=AnyCPU %*
1917
if %ERRORLEVEL% neq 0 goto BuildFail
2018
goto BuildSuccess
2119

src/Microsoft.AspNet.TelemetryCorrelation/AspNetTelemetryCorrelationEventSource.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Diagnostics.Tracing;
5+
#pragma warning disable SA1600 // Elements must be documented
56

67
namespace Microsoft.AspNet.TelemetryCorrelation
78
{
@@ -47,3 +48,4 @@ public void ActvityExtractionError(string reason)
4748
}
4849
}
4950
}
51+
#pragma warning restore SA1600 // Elements must be documented

src/Microsoft.AspNet.TelemetryCorrelation/Microsoft.AspNet.TelemetryCorrelation.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
</NuGetPackageImportStamp>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
30-
<DebugSymbols>true</DebugSymbols>
3130
<DebugType>full</DebugType>
3231
<Optimize>false</Optimize>
3332
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -45,6 +44,9 @@
4544
<CodeAnalysisRuleSet>Microsoft.AspNet.TelemetryCorrelation.ruleset</CodeAnalysisRuleSet>
4645
<RunCodeAnalysis>true</RunCodeAnalysis>
4746
</PropertyGroup>
47+
<PropertyGroup>
48+
<DebugSymbols>true</DebugSymbols>
49+
</PropertyGroup>
4850
<ItemGroup>
4951
<Reference Include="System" />
5052
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

0 commit comments

Comments
 (0)