-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests #9421
Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests #9421
Conversation
…for Microsoft.NETCore.App "2.1.0" or "2.1.1*"
@@ -89,7 +89,7 @@ | |||
</Target> | |||
|
|||
<Target Name="TestsForBuildItself"> | |||
<DotNetMSBuild Arguments="/v:diag $(RepoRoot)/test/MsBuildScript.Tests/runtests.target" | |||
<DotNetMSBuild Arguments="/v:diag $(RepoRoot)/test/MsBuildScript.Tests/runtests.target /p:PB_AssetRootUrl=$(PB_AssetRootUrl)" |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
@@ -304,7 +304,7 @@ public void ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile() | |||
|
|||
result.Should().NotBeNull(); | |||
|
|||
result.Args.Should().Contain("--fx-version 2.1.0"); | |||
result.Args.Should().Contain("--fx-version 2.1."); |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
@@ -75,8 +75,7 @@ public void RestoreDoesNotUseAnyCliProducedPackagesOnItsTemplates() | |||
} | |||
|
|||
[Theory] | |||
[InlineData("console", "microsoft.netcore.app")] |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
@@ -107,7 +106,7 @@ string GetFrameworkPackageVersion() | |||
var sharedFxDir = dotnetDir | |||
.GetDirectory("shared", "Microsoft.NETCore.App") | |||
.EnumerateDirectories() | |||
.Single(d => d.Name.StartsWith("2.1.0")); | |||
.Single(d => d.Name.StartsWith("2.1.")); |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
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.
See my comments.
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.
LGTM
@livarcocc Failed Microsoft.DotNet.New.Tests.GivenThatIWantANewApp.NewProjectRestoresCorrectPackageVersion(type: "console", packageName: "microsoft.netcore.app") |
Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*"
Two basic ProdCon issues:
Additional:
The AllLinux VSO build definition was altered to include 3 secrets as environmental variables - as adding the secret values explicitly to the secondary MSBuild call yielded this error: System.InvalidOperationException: An invalid request URI was provided. /p:PB_PackageVersionPropsUrl=https:/dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180603-02/cli-inputs/orchestration-metadata/PackageVersions.props
Please notice the escaped "//"
Related: https://github.com/dotnet/cli/issues/9420