Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaomi7732 committed Oct 17, 2018
2 parents ec08bac + 903854c commit 226169b
Showing 1 changed file with 39 additions and 44 deletions.
83 changes: 39 additions & 44 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,46 +1,41 @@
<Project>
<!-- <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> -->
<!--Build-->
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>$(MSBuildThisFileDirectory)..\bin\Debug\</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>$(MSBuildThisFileDirectory)..\bin\Release\</OutputPath>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>

<PropertyGroup>
<!--Sign-->
<SignAssembly>True</SignAssembly>
<DelaySign>True</DelaySign>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)PublicKey.snk</AssemblyOriginatorKeyFile>

<!--Package-->
<VersionSuffix Condition=" '$(VersionSuffix)' == '' ">$([System.DateTime]::Now.ToString(yyyyMMddHHmm))</VersionSuffix>
<Version Condition=" '$(Version)' == '' ">1.0.0-private-$(VersionSuffix)</Version>
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' " >1.0.0.0</AssemblyVersion>
<Authors>Microsoft</Authors>
<Company>Microsoft</Company>
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
<PackageLicenseUrl>https://github.com/Microsoft/ApplicationInsights-Kubernetes/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Microsoft/ApplicationInsights-Kubernetes/</PackageProjectUrl>
<PackageIconUrl>http://appanacdn.blob.core.windows.net/cdn/icons/aic.png</PackageIconUrl>
<Copyright>Copyright © Microsoft. All Rights Reserved.</Copyright>
<RepositoryUrl>https://github.com/Microsoft/ApplicationInsights-Kubernetes/</RepositoryUrl>
<RepositoryType />
</PropertyGroup>

<ItemGroup Condition=" '$(IsCIBuild)' == 'true' ">
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(IsCIBuild)' == 'true' AND '$(IsSignBuild)' == 'true'">
<FilesToSign Include="$(OutputPath)\$(AssemblyName).dll">
<Authenticode>Microsoft</Authenticode>
<StrongName>StrongName</StrongName>
</FilesToSign>
</ItemGroup>
<!-- <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> -->
<!--Build-->
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>$(MSBuildThisFileDirectory)..\bin\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>$(MSBuildThisFileDirectory)..\bin\Release\</OutputPath>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<!--Sign-->
<SignAssembly>True</SignAssembly>
<DelaySign>True</DelaySign>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)PublicKey.snk</AssemblyOriginatorKeyFile>
<!--Package-->
<VersionSuffix Condition=" '$(VersionSuffix)' == '' ">$([System.DateTime]::Now.ToString(yyyyMMddHHmm))</VersionSuffix>
<Version Condition=" '$(Version)' == '' ">1.0.0-private-$(VersionSuffix)</Version>
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' " >1.0.0.0</AssemblyVersion>
<Authors>Microsoft</Authors>
<Company>Microsoft</Company>
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
<PackageLicenseUrl>https://github.com/Microsoft/ApplicationInsights-Kubernetes/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Microsoft/ApplicationInsights-Kubernetes/</PackageProjectUrl>
<PackageIconUrl>http://appanacdn.blob.core.windows.net/cdn/icons/aic.png</PackageIconUrl>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<RepositoryUrl>https://github.com/Microsoft/ApplicationInsights-Kubernetes/</RepositoryUrl>
<RepositoryType />
</PropertyGroup>
<ItemGroup Condition=" '$(IsCIBuild)' == 'true' ">
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(IsCIBuild)' == 'true' AND '$(IsSignBuild)' == 'true'">
<FilesToSign Include="$(OutputPath)\$(AssemblyName).dll">
<Authenticode>Microsoft</Authenticode>
<StrongName>StrongName</StrongName>
</FilesToSign>
</ItemGroup>
</Project>

0 comments on commit 226169b

Please sign in to comment.