This commit is contained in:
Liudmila Molkova 2018-08-28 11:22:17 -07:00 коммит произвёл GitHub
Родитель 675f794b97
Коммит 5344e0e17f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
15 изменённых файлов: 203 добавлений и 40 удалений

Просмотреть файл

@ -1,20 +1,12 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="tools\Microsoft.AspNet.TelemetryCorrelation.settings.targets"/>
<ItemGroup>
<AssemblyProject Include="src\Microsoft.AspNet.TelemetryCorrelation\Microsoft.AspNet.TelemetryCorrelation.csproj" />
</ItemGroup>
<ItemGroup>
<AssemblyProject Include="test\Microsoft.AspNet.TelemetryCorrelation.Tests\Microsoft.AspNet.TelemetryCorrelation.Tests.csproj" />
</ItemGroup>
<ItemGroup>
<PackageProject Include="src\Packages\Packages.csproj" />
</ItemGroup>
<!-- Composite targets -->
<Target Name="BuildCI" DependsOnTargets="Clean;Build" />
<Target Name="Build" DependsOnTargets="BuildAssemblies;BuildPackages" />
<Target Name="Clean" DependsOnTargets="CleanPackages;CleanAssemblies" />
<Target Name="Rebuild" DependsOnTargets="Clean;Build" />

Просмотреть файл

@ -14,7 +14,7 @@
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>..\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>$(RepositoryRoot)tools\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
@ -27,6 +27,7 @@
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
@ -68,9 +69,10 @@
</ItemGroup>
<ItemGroup>
<None Include="Microsoft.AspNet.TelemetryCorrelation.ruleset" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config"/>
</ItemGroup>
<ItemGroup>
<None Include="35MSSharedLib1024.snk" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
@ -79,10 +81,25 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets" Condition="Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets'))" />
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props'))" />
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets'))" />
</Target>
<Import Project="..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" />
<Target Name="AddToSign" AfterTargets="AfterBuild">
<ItemGroup>
<FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
<Authenticode>Microsoft</Authenticode>
<StrongName>MsSharedLib72</StrongName>
</FilesToSign>
</ItemGroup>
<Message Text="FilesToSign: %(FilesToSign.Identity); %(FilesToSign.Authenticode); %(FilesToSign.StrongName)" Importance="high"/>
</Target>
</Project>

Просмотреть файл

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MicroBuild.Core" version="0.3.0" targetFramework="net45" developmentDependency="true" />
<package id="Microsoft.Diagnostics.Tracing.EventRegister" version="1.1.28" targetFramework="net45" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
<package id="System.Diagnostics.DiagnosticSource" version="4.4.0" targetFramework="net45" />

Просмотреть файл

@ -5,6 +5,7 @@
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
<NuGetPackageId>$(MSBuildProjectName)</NuGetPackageId>
<NuSpecFile>$(MSBuildProjectName).nuspec</NuSpecFile>
<IsPackage>true</IsPackage>
</PropertyGroup>
<ItemGroup>
<NuGetContent Include="$(AssemblyName).dll">
@ -24,5 +25,15 @@
<Destination>content\net45</Destination>
</NuGetContent>
</ItemGroup>
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
<Import Project="$(RepositoryRoot)tools\NuGetProj.targets"/>
<Target Name="AfterBuild">
<PropertyGroup>
<OutDir>$(PackageOutputDir)</OutDir>
</PropertyGroup>
<ItemGroup>
<FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
<Authenticode>NuGet</Authenticode>
</FilesToSign>
</ItemGroup>
</Target>
</Project>

Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<package>
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>$NuGetPackageId$</id>
<title>Microsoft.AspNet.TelemetryCorrelation</title>

Двоичный файл не отображается.

Просмотреть файл

@ -37,7 +37,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>$(RepositoryRoot)tools\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<DelaySign>true</DelaySign>
@ -103,6 +103,9 @@
<Link>Resources\web.config.uninstall.xdt</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="35MSSharedLib1024.snk" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
@ -110,13 +113,6 @@
<Analyzer Include="..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<UsingTask AssemblyFile="$(OutputPath)xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
<Target Name="AfterBuild">
<xunit Assemblies="$(OutputPath)Microsoft.AspNet.TelemetryCorrelation.Tests.dll" />

Просмотреть файл

Просмотреть файл

@ -0,0 +1,23 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<RepositoryRootEx Condition="'$(RepositoryRootEx)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.AspNet.TelemetryCorrelation.sln))\</RepositoryRootEx>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
<BinPath>$(RepositoryRootEx)bin\</BinPath>
<ObjPath>$(RepositoryRootEx)obj\</ObjPath>
<OutputPath>$(BinPath)$(Configuration)\</OutputPath>
<IntermediateOutputPath>$(ObjPath)$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup>
<AssemblyPath Condition="'$(CodeSignEnabled)' == 'true'">$(CodeSignOutputPath)</AssemblyPath>
<AssemblyPath Condition="'$(AssemblyPath)' == ''">$(OutputPath)</AssemblyPath>
</PropertyGroup>
<PropertyGroup>
<CustomAfterProjectTargets>$(MSBuildThisFileDirectory)Microsoft.AspNet.TelemetryCorrelation.Extensions.targets</CustomAfterProjectTargets>
</PropertyGroup>
</Project>

Просмотреть файл

@ -5,14 +5,5 @@
<NuGetPackageVersion Condition="'$(UpdateNightlyPackages)' == 'true'">$(NuGetPackageVersion)-b$(VersionBuild)</NuGetPackageVersion>
</PropertyGroup>
<ItemGroup>
<NuGetInstallScripts Include="$(RepositoryRootEx)src\Packages\Microsoft.AspNet.TelemetryCorrelation\tools\*.ps1"/>
</ItemGroup>
<Target Name="CopyInstallScripts">
<Copy SourceFiles="@(NuGetInstallScripts)"
DestinationFolder="$(AssemblyPath)"
/>
</Target>
</Project>

Просмотреть файл

@ -1,7 +1,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Configurable properties-->
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CustomBeforeProjectTargets>$(MSBuildThisFileDirectory)Microsoft.AspNet.TelemetryCorrelation.Extensions.settings.targets</CustomBeforeProjectTargets>
<BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
<VersionStartYear>2018</VersionStartYear>
<VersionMajor>1</VersionMajor>
@ -14,12 +14,13 @@
<DiagnosticSourceNuGetPackageVersion>4.4.0</DiagnosticSourceNuGetPackageVersion>
</PropertyGroup>
<!-- Default properties -->
<PropertyGroup>
<RepositoryRoot Condition="'$(RepositoryRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Microsoft.AspNet.TelemetryCorrelation.sln))\</RepositoryRoot>
<RepositoryRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Microsoft.AspNet.TelemetryCorrelation.sln'))\</RepositoryRoot>
</PropertyGroup>
<Import Project="$(CustomBeforeProjectTargets)" Condition="Exists('$(CustomBeforeProjectTargets)')" Label="Pre-targets Build Extensibility Point"/>
<PropertyGroup Label="Common Configuration">
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
<OutputPath>$(RepositoryRoot)bin\$(Configuration)\</OutputPath>

Просмотреть файл

@ -304,10 +304,11 @@ GetNuGetProjectOutputs: Reads build-generated files from outputs file.
<Target Name="GetNuGetProjectOutputs">
<PropertyGroup>
<NuGetPackTargetFile>$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).nupkg</NuGetPackTargetFile>
<NuGetPackTargetFile Condition="'$(NuGetPackSymbols)' == 'true'">$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).symbols.nupkg</NuGetPackTargetFile>
<NuGetSymbolPackTargetFile Condition="'$(NuGetPackSymbols)' == 'true'">$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).symbols.nupkg</NuGetSymbolPackTargetFile>
</PropertyGroup>
<ItemGroup>
<NuGetProjectOutput Include="$(NuGetPackTargetFile)" />
<NuGetProjectOutput Include="$(NuGetSymbolPackTargetFile)" Condition="'$(NuGetSymbolPackTargetFile)' != ''" />
<NuGetProjectOutput Include="$(NuGetProjectOutputsFile)" />
</ItemGroup>
</Target>

Двоичные данные
tools/NuProj.Tasks.dll Normal file

Двоичный файл не отображается.

129
tools/NuProj.targets Normal file
Просмотреть файл

@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
DEFAULTS
Those can be overriden.
-->
<PropertyGroup>
<OutDir Condition=" '$(OutDir)' == ''" >$(MSBuildProjectDirectory)\bin\</OutDir>
<IntermediateOutputPath Condition=" '$(IntermediateOutputPath)' == '' ">$(MSBuildProjectDirectory)\obj\</IntermediateOutputPath>
<NuSpecPath Condition=" '$(NuSpecPath)' == '' ">$(IntermediateOutputPath)$(Id).nuspec</NuSpecPath>
<NuProjTasksPath Condition=" '$(NuProjTasksPath)' == '' ">$(MSBuildThisFileDirectory)NuProj.Tasks.dll</NuProjTasksPath>
<NuGetToolPath Condition=" '$(NuGetToolPath)' == '' ">$(MSBuildThisFileDirectory)</NuGetToolPath>
<NuGetToolExe Condition=" '$(NuGetToolExe)' == '' ">NuGet.exe</NuGetToolExe>
</PropertyGroup>
<!--
OUPUT PATH
This property isn't passed to NuGet.exe - it's implicit. However, we need to know the ouput path
at several occasions (e.g. incremental build or clean up) so we want a central spot to capture it.
-->
<PropertyGroup>
<NuGetOuputPath>$(OutDir)$(Id).$(Version).nupkg</NuGetOuputPath>
</PropertyGroup>
<!--
MSBuildAllProjects is used to keep track of all projects the build depends on.
We make all targets depending on it to make sure everything rebuilds.
-->
<PropertyGroup>
<MSBuildAllProjects Condition="Exists('$(MSBuildProjectFullPath)')">$(MSBuildAllProjects);$(MSBuildProjectFullPath)</MSBuildAllProjects>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<!--
CUSTOM TASKS
-->
<UsingTask TaskName="GenerateNuSpec" AssemblyFile="$(NuProjTasksPath)" />
<UsingTask TaskName="NuGetPack" AssemblyFile="$(NuProjTasksPath)" />
<!--
CONVERT ITEMS
-->
<Target Name="ConvertItems">
<CreateItem Include="@(Library)"
AdditionalMetadata="TargetPath=lib\%(Library.TargetFramework)">
<Output TaskParameter="Include"
ItemName="File"/>
</CreateItem>
<CreateItem Include="@(Content)"
AdditionalMetadata="TargetPath=content\%(Content.TargetPath)">
<Output TaskParameter="Include"
ItemName="File"/>
</CreateItem>
</Target>
<!--
GENERATE NU SPEC
-->
<Target Name="GenerateNuSpec"
Inputs="$(MSBuildAllProjects)"
Outputs="$(NuSpecPath)"
DependsOnTargets="ConvertItems">
<GenerateNuSpec OutputFileName="$(NuSpecPath)"
Id="$(Id)"
Version="$(Version)"
Title="$(Title)"
Authors="$(Authors)"
Owners="$(Owners)"
Description="$(Description)"
ReleaseNotes="$(ReleaseNotes)"
Summary="$(Summary)"
Language="$(Language)"
ProjectUrl="$(ProjectUrl)"
IconUrl="$(IconUrl)"
LicenseUrl="$(LicenseUrl)"
Copyright="$(Copyright)"
RequireLicenseAcceptance="$(RequireLicenseAcceptance)"
Tags="$(Tags)"
Dependencies="@(Dependency)"
References="@(Reference)"
FrameworkReferences="@(FrameworkReference)"
Files="@(File)"/>
</Target>
<!--
CREATE PACKAGE
-->
<Target Name="CreatePackage"
Inputs="$(MSBuildAllProjects);
$(NuSpecPath);
@(File)"
Outputs="$(NuGetOuputPath)"
DependsOnTargets="GenerateNuSpec">
<MakeDir Directories="$(OutDir)"
Condition="!Exists('$(OutDir)')" />
<NuGetPack OutputDirectory="$(OutDir)"
ToolPath="$(NuGetToolPath)"
ToolExe="$(NuGetToolExe)"
NuSpecPath="$(NuSpecPath)"/>
</Target>
<!--
STANDARD BUILD TARGETS
-->
<Target Name="Clean">
<ItemGroup>
<_ToBeDeleted Include="$(NuSpecPath)" />
<_ToBeDeleted Include="$(NuGetOuputPath)" />
</ItemGroup>
<Delete Files="@(_ToBeDeleted)" />
</Target>
<Target Name="Build" DependsOnTargets="CreatePackage" />
<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
</Project>

Просмотреть файл

@ -16,7 +16,7 @@ Project global versioning targets.
</PropertyGroup>
<PropertyGroup>
<VersionStartYear Condition="'$(VersionStartYear)' == ''">2013</VersionStartYear>
<VersionStartYear Condition="'$(VersionStartYear)' == ''">2016</VersionStartYear>
<VersionMajor Condition="'$(VersionMajor)' == ''">INVALID_VersionMajor</VersionMajor>
<VersionMinor Condition="'$(VersionMinor)' == ''">INVALID_VersionMinor</VersionMinor>
<VersionBuild Condition="'$(VersionBuild)' == '' OR '$(VersionBuild)' == '0'">$([MSBuild]::Add(1, $([MSBuild]::Subtract($([System.DateTime]::Now.Year), $(VersionStartYear)))))$([System.DateTime]::Now.ToString("MMdd"))</VersionBuild>
@ -27,7 +27,7 @@ Project global versioning targets.
<!-- Comptued parameters -->
<PropertyGroup>
<AssemblyVersion>$(VersionMajor).$(VersionMinor).$(VersionRelease).$(VersionRevision)</AssemblyVersion>
<AssemblyVersion>$(VersionMajor).$(VersionMinor).0.$(VersionRevision)</AssemblyVersion>
<AssemblyFileVersion>$(VersionMajor).$(VersionMinor).$(VersionBuild).$(VersionRevision)</AssemblyFileVersion>
<AssemblyInfoVersion Condition="'$(VersionRelease)' != ''">$(VersionMajor).$(VersionMinor).$(VersionRelease)-$(VersionBuild)</AssemblyInfoVersion>
<AssemblyInfoVersion Condition="'$(AssemblyInfoVersion)' == ''">$(AssemblyFileVersion)</AssemblyInfoVersion>
@ -36,6 +36,7 @@ Project global versioning targets.
<PropertyGroup>
<NuGetPackageVersion Condition="'$(NuGetPackageVersion)' == ''">$(VersionMajor).$(VersionMinor).$(VersionRelease)</NuGetPackageVersion>
<NuGetPackageVersion Condition="'$(BuildQuality)' != 'rtm'">$(NuGetPackageVersion)-$(BuildQuality)</NuGetPackageVersion>
</PropertyGroup>
<ItemGroup Condition="'$(VersionFileGenerationEnabled)' == 'true'">
@ -104,7 +105,7 @@ Project global versioning targets.
<PropertyGroup>
<VersionMajor>$([System.Convert]::ToInt16('$(VersionMajor)'))</VersionMajor>
<VersionMinor>$([System.Convert]::ToInt16('$(VersionMinor)'))</VersionMinor>
<VersionBuild>$([System.Convert]::ToInt32('$(VersionBuild)'))</VersionBuild>
<VersionBuild>$([System.Convert]::ToInt16('$(VersionBuild)'))</VersionBuild>
<VersionRevision>$([System.Convert]::ToInt16('$(VersionRevision)'))</VersionRevision>
</PropertyGroup>
</Target>