update tools package to the latest version with bug fixes #6937
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,13 @@ | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <PkgVersion>0.12.0-dev.20190715.1</PkgVersion> | ||
| <PkgLocalDir>$(RepoRoot)\restoredPackages\microsoft.internal.netsdkbuild.mgmt.tools\$(PkgVersion)\Sdk</PkgLocalDir> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- during execution of tasks tests, this conditional import will satisfy the import resolution. And you will have to manually execute a target to restore the package | ||
|
There was a problem hiding this comment. Now that I've got the release pipeline working and publishing for these tools can you please go ahead and update this version to the latest published (0.12.0-dev.20190716.14) and delete the package? If so I'll go ahead and close my PR #6879 instead of us fighting which one merges first :) There was a problem hiding this comment. @weshaggard I am going to ask @erich-wang to open a new PR to get rid of the checked in package. |
||
| Again this is strickly for build tools tests that will be run against this repo --> | ||
| <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.12.0-dev.20190715.1" /> | ||
| <Import Project="$(RepoRoot)\tools\bootstrapTools\bootstrap.targets" /> | ||
| <PropertyGroup> | ||
| <SignAssembly>true</SignAssembly> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.