Skip to content

strong signed build tools assemblies. Creating a new target for devop… #5076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahabhijeet merged 3 commits into from
Dec 12, 2018
Merged

strong signed build tools assemblies. Creating a new target for devop… #5076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dfadc0
strong signed build tools assemblies. Creating a new target for devop…
Dec 11, 2018
5be1237
removed redundant property from the project that was missed
Dec 12, 2018
e075921
addressing PR feedback
Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions ...icrosoft.Azure.Sdk.Build.Tasks/BootstrapTasks/Microsoft.Azure.Build.BootstrapTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('buildTools.props'))" />
<PropertyGroup>
<PackageId>Microsoft.Azure.Build.BootstrapTasks</PackageId>
<Description>Provides .NET SDK Build bootstrapper tasks</Description>
Expand All @@ -18,7 +19,6 @@
<TaskBinaryOutput>..\..\..\tasks</TaskBinaryOutput>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net46</TargetFramework>
Copy link
Copy Markdown
Member

@weshaggard weshaggard Dec 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is TargetFramework getting set to net46 now?

Copy link
Copy Markdown
Contributor Author

@shahabhijeet shahabhijeet Dec 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't quite follow the "where" part.
If you are wondering why are we targeting .NET 46, then all our build tools are targeting net 46 and above.

Copy link
Copy Markdown
Member

@weshaggard weshaggard Dec 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The where question is because you removed this property from this project so I was curious where it is getting set now.

<OutputPath>$(TaskBinaryOutput)</OutputPath>
</PropertyGroup>
<ItemGroup>
Expand All @@ -27,11 +27,4 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.1.1012" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.1012" />
</ItemGroup>
<!-- <Target Name="CopyOutput" AfterTargets="AfterBuild" Condition="'$(CIBuild)' != 'true'"> -->
<!-- <Message Text="CIBuild status ... $(CIBuild)"/> -->
<!-- <Copy -->
<!-- SourceFiles="$(OutputPath)\$(AssemblyName).dll" -->
<!-- DestinationFiles="..\..\..\..\bootstraptools\taskBinaries\Microsoft.Azure.Build.BootstrapTasks.dll" -->
<!-- ContinueOnError="false" /> -->
<!-- </Target> -->
</Project>
1 change: 1 addition & 0 deletions ...asks/Microsoft.Azure.Sdk.Build.Tasks/Build.Common/Microsoft.Azure.Sdk.Build.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('buildTools.props'))" />
<PropertyGroup>
<PackageId>Microsoft.Azure.Sdk.Build.Common</PackageId>
<Description>Azure SDK build common </Description>
Expand Down
2 changes: 1 addition & 1 deletion ...asks/Microsoft.Azure.Sdk.Build.Tasks/SdkBuildTasks/Microsoft.Azure.Sdk.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('buildTools.props'))" />
<PropertyGroup>
<PackageId>Microsoft.Azure.Sdk.Build.Tasks</PackageId>
<Description>Provides .NET SDK Build tools tasks</Description>
Expand All @@ -17,7 +18,6 @@
<TaskBinaryOutput>..\..\..\tasks</TaskBinaryOutput>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net46</TargetFramework>
<OutputPath>$(TaskBinaryOutput)</OutputPath>
</PropertyGroup>
<ItemGroup>
Expand Down
11 changes: 11 additions & 0 deletions tools/BuildAssets/BuildTasks/Microsoft.Azure.Sdk.Build.Tasks/buildTools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<IsBuildToolsProject>true</IsBuildToolsProject>
</PropertyGroup>

<PropertyGroup Condition=" '$(IsBuildToolsProject)' == 'true' ">
<SignAssembly>true</SignAssembly>
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\BuildTools.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
</Project>
34 changes: 7 additions & 27 deletions tools/BuildAssets/targets/common.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,61 +18,41 @@
<BuildWideDebugTrace Condition=" '$(DebugTrace)' == '' ">false</BuildWideDebugTrace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<!-- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' AND '$(DelaySignForInternalsVisible)' == 'true' ">
There are certain projects that needs internals visible for test purpose
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup> -->

<PropertyGroup>
<SignManifestRootDir>$(BinariesFolder)\signManifest</SignManifestRootDir>
<SignServiceDir>$(SignManifestRootDir)\signService</SignServiceDir>
<SignClientConfigDir>$(SignManifestRootDir)\signClientConfig</SignClientConfigDir>
<AuthenticodeSign>false</AuthenticodeSign>
</PropertyGroup>
<PropertyGroup>
</PropertyGroup>
<PropertyGroup>
<PackageRootDir>$(BuiltPackageOutputDir)</PackageRootDir>
<UnsignedPackageRootDir>$(PackageRootDir)\unsigned</UnsignedPackageRootDir>
<SignedPackageRootDir>$(PackageRootDir)\signed</SignedPackageRootDir>
</PropertyGroup>

<PropertyGroup>
</PropertyGroup>
<PropertyGroup>
<BuildNameLabel>DesktopBuild</BuildNameLabel>
</PropertyGroup>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)'=='net452' ">
<DefineConstants>net452;FullNetFx;LEGACY</DefineConstants>
<OutputPath>bin\$(Configuration)\</OutputPath>
<!-- <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> -->
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
<DefineConstants>netstandard14</DefineConstants>
<OutputPath>bin\$(Configuration)\</OutputPath>
<!-- <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> -->
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
<DefineConstants>netcoreapp11</DefineConstants>
<OutputPath>bin\$(Configuration)\</OutputPath>
<!-- <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> -->
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<DefineConstants>netcoreapp20</DefineConstants>
<OutputPath>bin\$(Configuration)\</OutputPath>
<!-- <DocumentationFile>bin\$(Configuration)\$(TargetFrameworks)\$(AssemblyName).xml</DocumentationFile> -->
</PropertyGroup>

<Choose>
Expand Down
12 changes: 8 additions & 4 deletions tools/BuildAssets/targets/common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,15 @@
<Exec Command="dotnet test -f $(NetFx461) %(net452TestProj.Identity) -l trx;LogFileName=$(LibraryRoot)TestResults\$(NetFx461)\%(net452TestProj.Filename).trx /nodeReuse:false" Condition="@(net461TestProj) != ''" ContinueOnError="false" WorkingDirectory="%(net461TestProj.RootDir)%(net461TestProj.Directory)" />
</Target>

<Target Name="PackgNugetBootStrap" DependsOnTargets="Package;SignNugetPackage">

</Target>
<!--
This target is primarily being used by DevOps pipeline scenario for data plan which is using VSO tasks to sign.
So this target assumes build outputs are already generated and would simply like to package the
signed artificats (without rebuilding)
NOTE: This package cannot be used independently, will get an error as build outputs are not generated.
Copy link
Copy Markdown
Member

@weshaggard weshaggard Dec 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume you meant "This package" -> "This target".

Copy link
Copy Markdown
Contributor Author

@shahabhijeet shahabhijeet Dec 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weshaggard @kurtzeborn I have made one minor change and added a new target so that it can be used without affecting existing linked targets.
This new target can be used exactly what you intended for, except the new name.

Copy link
Copy Markdown
Member

@weshaggard weshaggard Dec 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My comment was talking about the typo where I think you wanted to say "target" and not "package".

-->
<Target Name="PackageNoBuild" DependsOnTargets="CategorizeProjects;Package" />

<Target Name="Package" DependsOnTargets="CategorizeProjects">
<Target Name="Package">
<Message Text="Packaging..... @(net452SDKProj);@(netStd14SDKProj);@(nonSdkProject)" />
<Message Text="PackageOutputDir....... $(BuiltPackageOutputDir)" />
<PropertyGroup>
Expand Down
Binary file modified tools/BuildAssets/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.dll
View file
Open in desktop
Binary file not shown.
Binary file modified tools/BuildAssets/tasks/net46/Microsoft.Azure.Sdk.Build.Tasks.dll
View file
Open in desktop
Binary file not shown.
Binary file modified tools/BuildAssets/tasks/net46/Microsoft.Build.Framework.dll
View file
Open in desktop
Binary file not shown.
Binary file modified tools/BuildAssets/tasks/net46/Microsoft.Build.Tasks.Core.dll
View file
Open in desktop
Binary file not shown.
Binary file modified tools/BuildAssets/tasks/net46/Microsoft.Build.Utilities.Core.dll
View file
Open in desktop
Binary file not shown.
Binary file modified tools/BuildAssets/tasks/net46/Microsoft.Build.dll
View file
Open in desktop
Binary file not shown.
Binary file added tools/BuildTools.snk
View file
Open in desktop
Binary file not shown.