Skip to content

Commit

Permalink
Separate mgmt tools project
Browse files Browse the repository at this point in the history
- Move mgmt tools to mgmtci.proj and not in dotnet.proj
- update mgmt package project to use project instead of nuspec
  So that we can have a unique build each time.

For now to build the mgmt tools you need to specific mgmtci.proj
from the build queue when starting the build.
  • Loading branch information
weshaggard committed Jul 13, 2019
1 parent aa0d0d9 commit a4e3d4b
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 108 deletions.
2 changes: 1 addition & 1 deletion dotnet.proj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.Build.Traversal">
<ItemGroup>
<ProjectReference
Include="src\dotnet\**\*.csproj;mgmtci.proj"
Include="src\dotnet\**\*.csproj"
Exclude="src\dotnet\Mgmt.CI.BuildTools\**\*.*" />
</ItemGroup>
</Project>
19 changes: 4 additions & 15 deletions mgmtci.proj
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
<Project DefaultTargets="BuildToolsPackage" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Default property -->
<PropertyGroup>
<Scope>ci</Scope>
</PropertyGroup>
<Target Name="VsTest" />
<Import Project="eng/mgmt/ci.buildtools.props" />
<Import Project="eng/mgmt/ci.buildtools.targets" />

<Target Name="Clean" DependsOnTargets="$(CleanProjectDependsOn)" />
<Target Name="Build" DependsOnTargets="$(BuildProjectDependsOn)" />
<Target Name="ReBuild" DependsOnTargets="Clean;Build" />
<Target Name="RestoreProjects" DependsOnTargets="$(RestoreProjectDependsOn)" />
<Target Name="BuildToolsPackage" DependsOnTargets="$(BuildToolsPackageDependsOn)" />
<Target Name="Pack" DependsOnTargets="$(BuildToolsPackageDependsOn)" />
<Project Sdk="Microsoft.Build.Traversal">
<ItemGroup>
<ProjectReference Include="src\dotnet\Mgmt.CI.BuildTools\**\*.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Import Project="$([MSBuild]::GetPathOfFileAbove('ci.common.props'))" />
<PropertyGroup>
<PackageId>MS.Az.NetSdk.Build.Tasks</PackageId>
<Description>Provides .NET SDK Build tools and msbuild tasks</Description>
<AssemblyTitle>Microsoft.Azure.NetSdk.Build.Tasks</AssemblyTitle>
<AssemblyName>MS.Az.Mgmt.NetSdk.BuildTasks</AssemblyName>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<IncludeBuildOutput>false</IncludeBuildOutput>
<NoWarn>$(NoWarn);NU5100;NU5110;NU5111</NoWarn>

<PackageId>Microsoft.Internal.NetSdkBuild.Mgmt.Tools</PackageId>
<Description>Build tools for building Azure SDK for NET repository</Description>
<PackageProjectUrl>https://github.com/Azure/azure-sdk-for-net</PackageProjectUrl>
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
<RepositoryUrl>https://github.com/Azure/azure-sdk-for-net</RepositoryUrl>
<PackageTags>Azure.NETSDKBuildToolsPackage</PackageTags>
<PackageReleaseNotes>Build tools for Azure .NET SDKs repository</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
</PropertyGroup>

<!-- Their is an issue building dependencies that have platform specific dependencies -->
<PropertyGroup Condition="'$(TargetFramework)|$(Platform)'=='net461|AnyCPU'">
<PlatformTarget>$(FullNetFxBitness)</PlatformTarget>
<NoWarn>CS0414;CS0219;CS0649</NoWarn>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);CS0414;CS0219;CS0649</NoWarn>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>$(CurrentTargetFxVersion)</TargetFrameworks>
<TargetFrameworks>$(CurrentTargetFxVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Models\Backup_SdkProjectMetaData.cs" />
Expand All @@ -28,5 +36,18 @@

<ItemGroup>
<ProjectReference Include="..\..\CI.Common\Mgmt.CI.Common\MS.Az.Mgmt.CI.Common.csproj" />
</ItemGroup>
<None Include="$(PackageFilesPath)\**\*.*" Pack="true" PackagePath="" />
</ItemGroup>

<PropertyGroup>
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddPublishOutputToPackage</TargetsForTfmSpecificContentInPackage>
</PropertyGroup>

<Target Name="_AddPublishOutputToPackage" DependsOnTargets="Publish">
<ItemGroup>
<!-- Publish .NET Core assets and include them in the package under tools directory. -->
<TfmSpecificPackageFile Include="$(PublishDir)**"
PackagePath="tasks/$(TargetFramework)/%(RecursiveDir)%(FileName)%(Extension)"/>
</ItemGroup>
</Target>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
<Description>Tests for MS.Az.NetSdk.Build.Tasks msbuild build tasks tests</Description>
<AssemblyTitle>MS.Az.NetSdk.Build.Tasks Tests</AssemblyTitle>
<AssemblyName>Build.Tasks.Tests</AssemblyName>
</PropertyGroup>

<!-- Skip test projects until tests can be fixed -->
<IsTestProject>false</IsTestProject>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand All @@ -19,6 +22,6 @@
<ItemGroup>
<ProjectReference Include="..\..\Mgmt.CI.BuildTasks\MS.Az.Mgmt.CI.BuildTasks.csproj" />
<ProjectReference Include="..\..\..\CI.Common\Tests\Tests.CI.Common.csproj" />
<ProjectReference Include="..\..\..\CI.Common\Mgmt.CI.Common\MS.Az.Mgmt.CI.Common.csproj" />
<ProjectReference Include="..\..\..\CI.Common\Mgmt.CI.Common\MS.Az.Mgmt.CI.Common.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('ci.common.props'))" />
<PropertyGroup>
<PackageId>MS.Az.NetSdk.Build.Common</PackageId>
<Description>Azure SDK build common </Description>
Expand All @@ -8,7 +7,6 @@
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>$(CurrentTargetFxVersion)</TargetFrameworks>
<!-- <TargetFrameworks>net461;netstandard2.0;netcoreapp2.1</TargetFrameworks> -->
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand All @@ -25,9 +23,9 @@
<PackageReference Include="Octokit" Version="0.32.0" />
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.3" />
<!--<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.99-private" />-->
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="4.5.0" />
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
<PackageReference Include="System.Reflection.Metadata" Version="1.7.0-preview6.19303.8" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="4.5.0" />
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
<PackageReference Include="System.Reflection.Metadata" Version="1.7.0-preview6.19303.8" />
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="4.6.0-preview6.19303.8" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
Expand All @@ -36,7 +34,7 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="NuGet.Versioning" Version="4.9.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<PackageReference Include="NuGet.Versioning" Version="5.0.0" />
</ItemGroup>
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
<AssemblyTitle>MS.Az.NetSdk.Common.BuildTasks Tests</AssemblyTitle>
<AssemblyName>Common.BuildTasks.Tests</AssemblyName>
<ProjectGuid>{DB4263F3-7041-4C7E-A373-BB04A5A32C34}</ProjectGuid>

<!-- Skip test projects until tests can be fixed -->
<IsTestProject>false</IsTestProject>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand Down
34 changes: 34 additions & 0 deletions src/dotnet/Mgmt.CI.BuildTools/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\Directory.Build.props" />
<PropertyGroup>
<VersionPrefix>0.10.0</VersionPrefix>
<FullNetFxBitness>AnyCPU</FullNetFxBitness>
<CurrentTargetFxVersion>net461;netstandard2.0</CurrentTargetFxVersion>
<TargetFrameworks>$(CurrentTargetFxVersion)</TargetFrameworks>
<OutputPath>$(CIBuildOutputDir)</OutputPath>
<SignAssembly>false</SignAssembly>
<DelaySign>false</DelaySign>
<PackageFilesPath>$(MSBuildThisFileDirectory)NugetToolsPackage\CI.Tools.Package\build</PackageFilesPath>
</PropertyGroup>

<!--TestLoaded property is being set in test project file-->
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="15.9.20" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Framework" Version="15.9.20" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" ExcludeAssets="runtime"/>
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" ExcludeAssets="runtime"/>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<PropertyGroup Label="PackageMetaData">
<Company>Microsoft Corporation</Company>
<Product>Azure .NET SDK Build Tools</Product>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<Authors>Microsoft</Authors>
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageTags>$(PackageTags);$(NugetCommonTags);$(NugetCommonProfileTags);$(AzureApiVersionInTags)</PackageTags>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.4' ">1.6.1</NetStandardImplicitPackageVersion>
</PropertyGroup>
</Project>

This file was deleted.

36 changes: 0 additions & 36 deletions src/dotnet/Mgmt.CI.BuildTools/ci.common.props

This file was deleted.

0 comments on commit a4e3d4b

Please sign in to comment.