Changes necessary to fix signed builds

2016-01-25 09:09:22 -08:00 · 2016-01-25 09:09:22 -08:00 · d8384f383e
--- a/ApiScanArgs_Template.xml
+++ b/ApiScanArgs_Template.xml
@ -0,0 +1,19 @@
+<arguments 
+mode="pre-release" 
+softwareName="ApplicationInsigtsSDK" 
+softwareVersion="0.0.0.0" 
+softwareBuild="00000000" 
+targetMode="binarysym" 
+softwareFolder="DLL_PATH"
+symbolsFolder="SRV*\\symbols\symbols" 
+mpdFolder = "" 
+exclusionList="" 
+email="" 
+outputFolder="APISCAN_PATH" 
+preBbtBinariesFolder="" 
+preBbtSymbolsFolder="" 
+noCopySymbols="false" 
+noCopyBinaries="false" 
+noDecompress="false" 
+analyzerTimeout="2:30:00" 
+/>  
--- a/Global.props
+++ b/Global.props
@ -63,12 +63,12 @@
        
        <EnlistmentRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'EnlistmentRoot.marker'))</EnlistmentRoot>
        
-        <BinRoot>$(EnlistmentRoot)\..\bin</BinRoot>
+        <BinRoot Condition="!Exists($(BinRoot))">$(EnlistmentRoot)\..\$(OutputDirectory)</BinRoot>
        <BinRoot>$([System.IO.Path]::GetFullPath( $(BinRoot) ))</BinRoot>
                
        <RelativeOutputPathBase>$(MSBuildProjectDirectory.Substring($(EnlistmentRoot.Length)))</RelativeOutputPathBase>
        
-        <BaseIntermediateOutputPath>$(EnlistmentRoot)\..\obj</BaseIntermediateOutputPath>
+        <BaseIntermediateOutputPath Condition="!Exists($(BaseIntermediateOutputPath))">$(EnlistmentRoot)\..\obj</BaseIntermediateOutputPath>
        <BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath( $(BaseIntermediateOutputPath) ))</BaseIntermediateOutputPath>

        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
--- a/Policheck_Template.xml
+++ b/Policheck_Template.xml
@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<Task>
+  <TaskName>AI SDK</TaskName>
+  
+  <Target>DLL_PATH</Target>
+  <ResultFile>POLICHECK_PATH\PolicheckResults.xml</ResultFile>
+  <LocalName>AI-SDK-BC_tfsmladm_DLL_PATH</LocalName>
+  <CustomRulesDBPath />
+  <TermTables>
+<TermTable Type="0" Name="Galician" LCID="1110" />
+    <TermTable Type="0" Name="Finnish" LCID="1035" />
+    <TermTable Type="0" Name="Lithuanian" LCID="1063" />
+    <TermTable Type="0" Name="Telugu" LCID="1098" />
+    <TermTable Type="0" Name="Norwegian (Nynorsk)" LCID="2068" />
+    <TermTable Type="0" Name="Bangla – India" LCID="1093" />
+    <TermTable Type="0" Name="Georgian" LCID="1079" />
+    <TermTable Type="0" Name="Serbian (Cyrillic)" LCID="3098" />
+    <TermTable Type="0" Name="Kinyarwanda" LCID="135" />
+    <TermTable Type="0" Name="Ukrainian" LCID="1058" />
+    <TermTable Type="0" Name="isiXhosa" LCID="1076" />
+    <TermTable Type="0" Name="Punjabi" LCID="1094" />
+    <TermTable Type="0" Name="Quechua (Peru)" LCID="3179" />
+    <TermTable Type="0" Name="Gujarati" LCID="1095" />
+    <TermTable Type="0" Name="Central Kurdish" LCID="146" />
+    <TermTable Type="0" Name="Tatar" LCID="1092" />
+    <TermTable Type="0" Name="Chinese (Traditional) - Hong Kong SAR" LCID="3076" />
+    <TermTable Type="0" Name="German" LCID="1031" />
+    <TermTable Type="0" Name="Urdu" LCID="1056" />
+    <TermTable Type="0" Name="Konkani" LCID="1111" />
+    <TermTable Type="0" Name="Chinese (Simplified)" LCID="2052" />
+    <TermTable Type="0" Name="Vietnamese" LCID="1066" />
+    <TermTable Type="0" Name="Uyghur" LCID="128" />
+    <TermTable Type="0" Name="Mongolian" LCID="1104" />
+    <TermTable Type="0" Name="Russian" LCID="1049" />
+    <TermTable Type="0" Name="Sesotho sa Leboa" LCID="1132" />
+    <TermTable Type="0" Name="Setswana" LCID="1074" />
+    <TermTable Type="0" Name="Tigrinya" LCID="115" />
+    <TermTable Type="0" Name="Chinese (Traditional) - Taiwan" LCID="1028" />
+    <TermTable Type="0" Name="Pashto" LCID="1123" />
+    <TermTable Type="0" Name="Lao" LCID="1108" />
+    <TermTable Type="0" Name="Dari" LCID="1164" />
+    <TermTable Type="0" Name="Indonesian" LCID="1057" />
+    <TermTable Type="0" Name="Cherokee" LCID="1169" />
+    <TermTable Type="0" Name="Yoruba" LCID="1130" />
+    <TermTable Type="0" Name="Turkmen" LCID="1090" />
+    <TermTable Type="0" Name="Hausa" LCID="1128" />
+    <TermTable Type="0" Name="Latvian" LCID="1062" />
+    <TermTable Type="0" Name="Portuguese - Brazil" LCID="1046" />
+    <TermTable Type="0" Name="Kazakh" LCID="1087" />
+    <TermTable Type="0" Name="Irish" LCID="2108" />
+    <TermTable Type="0" Name="Azerbaijani" LCID="1068" />
+    <TermTable Type="0" Name="Albanian" LCID="1052" />
+    <TermTable Type="0" Name="Japanese" LCID="1041" />
+    <TermTable Type="0" Name="Bosnian - Latin" LCID="5146" />
+    <TermTable Type="0" Name="Nepali" LCID="1121" />
+    <TermTable Type="0" Name="Amharic" LCID="1118" />
+    <TermTable Type="0" Name="Hindi" LCID="1081" />
+    <TermTable Type="0" Name="Dutch" LCID="1043" />
+    <TermTable Type="0" Name="Malayalam" LCID="1100" />
+    <TermTable Type="0" Name="Swedish" LCID="1053" />
+    <TermTable Type="0" Name="Kyrgyz" LCID="1088" />
+    <TermTable Type="0" Name="Malay" LCID="1086" />
+    <TermTable Type="0" Name="French" LCID="1036" />
+    <TermTable Type="0" Name="Maltese" LCID="1082" />
+    <TermTable Type="0" Name="Tamil" LCID="1097" />
+    <TermTable Type="0" Name="Kannada" LCID="1099" />
+    <TermTable Type="0" Name="Filipino" LCID="1124" />
+    <TermTable Type="0" Name="Afrikaans" LCID="1078" />
+    <TermTable Type="0" Name="Valencian" LCID="2051" />
+    <TermTable Type="0" Name="Odia" LCID="1096" />
+    <TermTable Type="0" Name="Igbo" LCID="1136" />
+    <TermTable Type="0" Name="Wolof" LCID="136" />
+    <TermTable Type="0" Name="Inuktitut" LCID="1117" />
+    <TermTable Type="0" Name="isiZulu" LCID="1077" />
+    <TermTable Type="0" Name="Thai" LCID="1054" />
+    <TermTable Type="0" Name="Spanish" LCID="1034" />
+    <TermTable Type="0" Name="Danish" LCID="1030" />
+    <TermTable Type="0" Name="Croatian" LCID="1050" />
+    <TermTable Type="0" Name="Turkish" LCID="1055" />
+    <TermTable Type="0" Name="K'iche'" LCID="134" />
+    <TermTable Type="0" Name="Belarusian" LCID="35" />
+    <TermTable Type="0" Name="Punjabi (Pakistan)" LCID="2118" />
+    <TermTable Type="0" Name="Tajik" LCID="40" />
+    <TermTable Type="0" Name="Scottish Gaelic" LCID="145" />
+    <TermTable Type="0" Name="Romanian" LCID="1048" />
+    <TermTable Type="0" Name="Basque" LCID="1069" />
+    <TermTable Type="0" Name="Hungarian" LCID="1038" />
+    <TermTable Type="0" Name="Sindhi" LCID="2137" />
+    <TermTable Type="0" Name="Welsh" LCID="1106" />
+    <TermTable Type="0" Name="Pulaar" LCID="1171" />
+    <TermTable Type="0" Name="Persian" LCID="1065" />
+    <TermTable Type="0" Name="Maori" LCID="1153" />
+    <TermTable Type="0" Name="Khmer" LCID="1107" />
+    <TermTable Type="0" Name="Slovenian" LCID="1060" />
+    <TermTable Type="0" Name="English" LCID="9" />
+    <TermTable Type="0" Name="Polish" LCID="1045" />
+    <TermTable Type="0" Name="Arabic" LCID="14337" />
+    <TermTable Type="0" Name="Serbian (Latin)" LCID="2074" />
+    <TermTable Type="0" Name="Luxembourgish" LCID="1134" />
+    <TermTable Type="0" Name="Assamese" LCID="1101" />
+    <TermTable Type="0" Name="Portuguese - Portugal" LCID="2070" />
+    <TermTable Type="0" Name="Czech" LCID="1029" />
+    <TermTable Type="0" Name="Greek" LCID="1032" />
+    <TermTable Type="0" Name="Sesotho" LCID="1072" />
+    <TermTable Type="0" Name="Armenian" LCID="1067" />
+    <TermTable Type="0" Name="Bosnian - Cyrillic" LCID="8218" />
+    <TermTable Type="0" Name="Estonian" LCID="1061" />
+    <TermTable Type="0" Name="Catalan" LCID="1027" />
+    <TermTable Type="0" Name="Uzbek" LCID="1091" />
+    <TermTable Type="0" Name="Hebrew" LCID="1037" />
+    <TermTable Type="0" Name="Icelandic" LCID="1039" />
+    <TermTable Type="0" Name="Sinhala" LCID="1115" />
+    <TermTable Type="0" Name="Norwegian (Bokmål)" LCID="1044" />
+    <TermTable Type="0" Name="Macedonian" LCID="1071" />
+    <TermTable Type="0" Name="Marathi" LCID="1102" />
+    <TermTable Type="0" Name="Slovak" LCID="1051" />
+    <TermTable Type="0" Name="Korean" LCID="1042" />
+    <TermTable Type="0" Name="Bulgarian" LCID="1026" />
+    <TermTable Type="0" Name="Breton" LCID="1150" />
+    <TermTable Type="0" Name="Italian" LCID="1040" />
+    <TermTable Type="0" Name="Bangla - Bangladesh" LCID="2117" />
+    <TermTable Type="0" Name="Serbian (Cyrillic, Bosnia and Herzegovina)" LCID="7194" />
+    <TermTable Type="0" Name="Global" LCID="127" />
+  </TermTables>
+  
+  <ScanType>File</ScanType>
+  <SOMConfigurationEnabled>True</SOMConfigurationEnabled>
+  <LogEnabled>False</LogEnabled>
+  <TargetType>0</TargetType>
+  <SeverityFilters><Severity Type="1" Enabled="1"></Severity><Severity Type="2" Enabled="1"></Severity><Severity Type="3" Enabled="1"></Severity><Severity Type="4" Enabled="1"></Severity></SeverityFilters>
+  <TermClassifications />
+  <HistoryManagement Enabled="0">
+    <PreviousVersion>0</PreviousVersion>
+    <Version>0</Version>
+    <RootDirectory />
+  </HistoryManagement>
+  <Exclusions><GlobalExclusions><GlobalExclusion Name="Enable Exclusions" Enabled="0"></GlobalExclusion><GlobalExclusion Name="Enable Context Exception"  Enabled="1"></GlobalExclusion></GlobalExclusions><PersonalExclusions><PersonalExclusion Name="Enable Exclusion" Enabled="0"></PersonalExclusion><PersonalExclusion Name="Enable File Exception" Enabled="0"></PersonalExclusion><PersonalExclusion Name="Enable Context Exception" Enabled="0"></PersonalExclusion><PersonalExclusion Name="Enable File  Context Exception" Enabled="0"></PersonalExclusion></PersonalExclusions></Exclusions>
+  <CustomFTSetsPath />
+  <CodeComments Enabled="0" />
+  <SkipUnchangedFiles Enabled="0" />
+  <IncludeSubDirectories Enabled="1" />
+</Task>
--- a/Src/Microsoft.ApplicationInsights.Web.sln
+++ b/Src/Microsoft.ApplicationInsights.Web.sln
@ -104,6 +104,10 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perf.Net45", "PerformanceCollector\Net45\Perf.Net45.csproj", "{FBFCB985-BBFE-4954-A2EF-8124A42F56C7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerformanceCollector.NuGet", "PerformanceCollector\NuGet\PerformanceCollector.NuGet.csproj", "{9392CF11-9063-4FC9-B8D1-922C754007D7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{61FC6E01-B40D-4DB2-9DAB-B27B82F02244} = {61FC6E01-B40D-4DB2-9DAB-B27B82F02244}
+		{FBFCB985-BBFE-4954-A2EF-8124A42F56C7} = {FBFCB985-BBFE-4954-A2EF-8124A42F56C7}
+	EndProjectSection
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared", "PerformanceCollector\Shared\Perf.Shared.shproj", "{092A02B5-9ACC-48B5-B317-428F71257196}"
 EndProject
--- a/Src/PerformanceCollector/NuGet/PerformanceCollector.NuGet.csproj
+++ b/Src/PerformanceCollector/NuGet/PerformanceCollector.NuGet.csproj
@ -2,6 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Global.props'))\Global.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Signing.props'))\Signing.props" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
--- a/Src/PerformanceCollector/Unit.Tests/Unit.Tests.csproj
+++ b/Src/PerformanceCollector/Unit.Tests/Unit.Tests.csproj
@ -27,7 +27,6 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
-    <OutputPath>..\..\..\..\bin\Debug\Src\PerformanceCollector\Tests\</OutputPath>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@ -36,7 +35,6 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <OutputPath>..\..\..\..\bin\Release\Src\PerformanceCollector\Tests\</OutputPath>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Microsoft.ApplicationInsights, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
--- a/Src/PerformanceCollector/Xdt.Tests/Xdt.Tests.csproj
+++ b/Src/PerformanceCollector/Xdt.Tests/Xdt.Tests.csproj
@ -24,7 +24,6 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\bin\Debug\Src\PerformanceCollector\Tests\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@ -32,7 +31,6 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\..\bin\Release\Src\PerformanceCollector\Tests\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
--- a/Test/PerformanceCollector/FunctionalTests/FunctionalTests.csproj
+++ b/Test/PerformanceCollector/FunctionalTests/FunctionalTests.csproj
@ -29,7 +29,6 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <UseVSHostingProcess>true</UseVSHostingProcess>
-    <OutputPath>..\..\..\..\bin\Debug\Test\PerformanceCollector\FunctionalTests\</OutputPath>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
--- a/dirs.proj
+++ b/dirs.proj
@ -21,7 +21,7 @@
    <MSBuild Projects="@(Solution)" ContinueOnError="ErrorAndStop"/> 
  </Target>
  <Target Name="Clean">
-    <RemoveDir Directories="$(BinRoot)" />
+    <RemoveDir Directories="$(BinRoot)\$(Configuration)" />
    <RemoveDir Directories="$(BaseIntermediateOutputPath)" />
  </Target>
 </Project>
--- a/runUnitTests.cmd
+++ b/runUnitTests.cmd
@ -1,9 +1,9 @@
@echo off
@setlocal enabledelayedexpansion enableextensions

-CALL buildRelease.cmd
+CALL buildDebug.cmd

-set BuildRoot=%~dp0..\bin\release\
+set BuildRoot=%~dp0..\bin\debug\

-CALL "%VS140COMNTOOLS%..\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" /UseVsixExtensions:true "%BuildRoot%Src\PerformanceCollector\Tests\Unit.Tests.dll" "%BuildRoot%Src\PerformanceCollector\Tests\Xdt.Tests.dll" "%BuildRoot%Src\DependencyCollector\Net40.Tests\Microsoft.ApplicationInsights.DependencyCollector.Net40.Tests.dll" "%BuildRoot%Src\DependencyCollector\Net40.Tests\Microsoft.ApplicationInsights.TestFramework.Net40.dll" "%BuildRoot%Src\DependencyCollector\Net45.Tests\Microsoft.ApplicationInsights.DependencyCollector.Net45.Tests.dll" "%BuildRoot%Src\DependencyCollector\Net45.Tests\Microsoft.ApplicationInsights.TestFramework.Net45.dll" "%BuildRoot%Src\DependencyCollector\Nuget.Tests\Microsoft.ApplicationInsights.DependencyCollector.NuGet.Tests.dll" "%BuildRoot%Src\Web\Web.Net40.Tests\Microsoft.ApplicationInsights.Web.Net40.Tests.dll" "%BuildRoot%Src\Web\Web.Net45.Tests\Microsoft.ApplicationInsights.Web.Net45.Tests.dll" "%BuildRoot%Src\Web\Web.Nuget.Tests\Microsoft.ApplicationInsights.Platform.Web.Nuget.Tests.dll" "%BuildRoot%Src\WindowsServer\WindowsServer.Net40.Tests\Microsoft.ApplicationInsights.TestFramework.Net40.dll" "%BuildRoot%Src\WindowsServer\WindowsServer.Net40.Tests\WindowsServer.Net40.Tests.dll" "%BuildRoot%Src\WindowsServer\WindowsServer.Net45.Tests\Microsoft.ApplicationInsights.TestFramework.Net45.dll" "%BuildRoot%Src\WindowsServer\WindowsServer.Net45.Tests\WindowsServer.Net45.Tests.dll" "%BuildRoot%Src\WindowsServer\WindowsServer.Nuget.Tests\WindowsServer.Nuget.Tests.dll" /logger:trx
+CALL "%VS140COMNTOOLS%..\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" /UseVsixExtensions:true "%BuildRoot%Src\PerformanceCollector\Unit.Tests\Unit.Tests.dll" "%BuildRoot%Src\PerformanceCollector\Xdt.Tests\Xdt.Tests.dll" "%BuildRoot%Src\DependencyCollector\Net40.Tests\Microsoft.ApplicationInsights.DependencyCollector.Net40.Tests.dll" "%BuildRoot%Src\DependencyCollector\Net40.Tests\Microsoft.ApplicationInsights.TestFramework.Net40.dll" "%BuildRoot%Src\DependencyCollector\Net45.Tests\Microsoft.ApplicationInsights.DependencyCollector.Net45.Tests.dll" "%BuildRoot%Src\DependencyCollector\Net45.Tests\Microsoft.ApplicationInsights.TestFramework.Net45.dll" "%BuildRoot%Src\DependencyCollector\Nuget.Tests\Microsoft.ApplicationInsights.DependencyCollector.NuGet.Tests.dll" "%BuildRoot%Src\Web\Web.Net40.Tests\Microsoft.ApplicationInsights.Web.Net40.Tests.dll" "%BuildRoot%Src\Web\Web.Net45.Tests\Microsoft.ApplicationInsights.Web.Net45.Tests.dll" "%BuildRoot%Src\Web\Web.Nuget.Tests\Microsoft.ApplicationInsights.Platform.Web.Nuget.Tests.dll" "%BuildRoot%Src\WindowsServer\WindowsServer.Net40.Tests\Microsoft.ApplicationInsights.TestFramework.Net40.dll" "%BuildRoot%Src\WindowsServer\WindowsServer.Net40.Tests\WindowsServer.Net40.Tests.dll" "%BuildRoot%Src\WindowsServer\WindowsServer.Net45.Tests\Microsoft.ApplicationInsights.TestFramework.Net45.dll" "%BuildRoot%Src\WindowsServer\WindowsServer.Net45.Tests\WindowsServer.Net45.Tests.dll" "%BuildRoot%Src\WindowsServer\WindowsServer.Nuget.Tests\WindowsServer.Nuget.Tests.dll" /logger:trx