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.

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

update tools package to the latest version with bug fixes #6937

Merged
merged 4 commits into from
Jul 18, 2019
Merged

update tools package to the latest version with bug fixes #6937

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6eea9ea
update tools package to the latest version with bug fixes
Jul 15, 2019
0f8bd35
adding comments
Jul 16, 2019
e85183e
increasing mgmt sdk pr validation timeout to 120 minutes
Jul 16, 2019
7ef46e8
updating package, fixing clientruntime tests
Jul 18, 2019
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
4 changes: 2 additions & 2 deletions eng/mgmt/Directory.Build.Mgmt.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PkgVersion>0.10.0</PkgVersion>
<PkgVersion>0.12.0-dev.20190715.1</PkgVersion>
Copy link
Member

Choose a reason for hiding this comment

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

We should be able to eliminate this. I don't think we really need condition on the Import below. msbuild will handle the case where the package already exists.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok here why you need this condition, I thought of adding a comment, but I am glad you caught this and now I will add a comment so that it is clear.
When you execute tests for the build tools tasks, it will actually will not restore the package for you during test execution if the project needs to resolve the imports and hence your test will fail.
So in that case, you will have to provide a conditional import and prior to executing tests you will have to restore it manually, hence you need it.

<PkgLocalDir>$(RepoRoot)\restoredPackages\microsoft.internal.netsdkbuild.mgmt.tools\$(PkgVersion)\Sdk</PkgLocalDir>
</PropertyGroup>

<Import Condition="Exists($(PkgLocalDir))" Project="$(PkgLocalDir)\CI.Bootstrap.targets" />
<Import Condition="!Exists($(PkgLocalDir))" Project="CI.Bootstrap.targets" Sdk="Microsoft.Internal.NetSdkBuild.Mgmt.Tools" Version="0.10.0" />
<Import Condition="!Exists($(PkgLocalDir))" Project="CI.Bootstrap.targets" Sdk="Microsoft.Internal.NetSdkBuild.Mgmt.Tools" Version="0.12.0-dev.20190715.1" />
<Import Project="$(RepoRoot)\tools\bootstrapTools\bootstrap.targets" />
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand Down
Binary file removed tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.10.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file added tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.12.0-dev.20190715.1.nupkg
View file
Open in desktop
Binary file not shown.