Skip to content
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.

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

Nug tools #6499

Merged
merged 11 commits into from
Jun 10, 2019
Merged

Nug tools #6499

merged 11 commits into from
Jun 10, 2019

Conversation

shahabhijeet
Copy link
Member

This PR will make couple of fundamental changes the way management SDKs will be built

Changes:

Their will not be any need moving forward to download build tools by executing msbuild build.proj
1.1 Build tools will be downloaded implicitly
1.2 If you ever need to refresh build tools, you will need to delete the following directory rootDir\restoredPackages\microsoft.internal.NetSdkBuild.Mgmt.Tools directory and execute your build target again.
All existing scenarios to build SDKs are at parity with previous tool set.
Moving forward due to directory restructure, scope path will have to be changed appropriately (documentation will be updated in the next PR)
3.1 Instead of /p:Scope=SDKs\Compute
3.2 /p:Scope=sdk\compute\microsoft.azure.management.compute
3.3 /p:Scope=sdk\compute /p:ProjectCategory=mgmt
This does not support data-plane SDK projects (it might work, but not thoroughly tested, as communicated earlier that data plane SDK projects will not participate in this tool set)
Move all management specific targets under eng\mgmt
Update repo with the right set of test projects that we skipped in the CI jenkins job, now each project has an explicit property to skip tests
TODO:
Consolidate base targets (e.g. Clean, Build, ReBuild) with data plane targets
Workaround is to introduce new mgmtBuild.proj for building management plane SDKs
Lot of bugs/oddities will be squeezed out once the new directory structure is in place.
Block packages to be published if tests are skipped

@@ -22,6 +22,7 @@ tools/Microsoft.WindowsAzure.Build.Tasks/packages/
PublishedNugets/
src/NuGet.Config
tools/7-zip/
#tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.*.nupkg
Copy link
Member

Choose a reason for hiding this comment

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

Is this still needed now that we published the tools package?

<config>
<add key="globalPackagesFolder" value="restoredPackages" />
Copy link
Member

Choose a reason for hiding this comment

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

Is it still a goal to remove these changes in a follow-up?


<ItemGroup Condition="'$(IsTargetingNetStandard)' == 'true'">
<PackageReference Include="System.Net.Http" Version="4.3.0"/>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
Copy link
Member

Choose a reason for hiding this comment

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

I think the data-plane builds are failing because of this removal. In particular I believe they need this Newtonsoft.Json reference.

@@ -1,5 +1,5 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.props'))" />
<!-- <Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.props'))" /> -->
Copy link
Member

Choose a reason for hiding this comment

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

nit: remove

filename: C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.2 Tools\sn.exe
arguments: -Vr *,31bf3856ad364e35
displayName: 'Disable strong name verification'
# - task: CmdLine@1
Copy link
Member

Choose a reason for hiding this comment

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

I'd suggest removing instead of commenting out.

@shahabhijeet shahabhijeet merged commit 7087f15 into Azure:master Jun 10, 2019
@weshaggard
Copy link
Member

@shahabhijeet this PR did break the data-plane builds. You added the files back but you added them under the eng/mgmt directory instead of the eng directory. I'm going to fix that right now.

@shahabhijeet shahabhijeet deleted the nugTools branch June 25, 2019 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants