Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests #9421

Merged
merged 3 commits into from
Jun 5, 2018

Conversation

johnbeisner
Copy link

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:

  1. Some of the secondary or internal MSBuild calls need to know secret values
  2. The version of Microsoft.NETCore.App could be something other than "2.1.0"

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

…for Microsoft.NETCore.App "2.1.0" or "2.1.1*"
@johnbeisner johnbeisner added this to the 2.1.3xx milestone Jun 5, 2018
@johnbeisner johnbeisner self-assigned this Jun 5, 2018
@johnbeisner johnbeisner requested review from nguerrera, MattGal, mmitche and a team June 5, 2018 17:01
@@ -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.

This comment was marked as spam.

@@ -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.

@@ -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.

This comment was marked as spam.

@@ -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.

Copy link

@livarcocc livarcocc left a comment

Choose a reason for hiding this comment

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

See my comments.

Copy link
Member

@MattGal MattGal left a comment

Choose a reason for hiding this comment

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

LGTM

@johnbeisner
Copy link
Author

johnbeisner commented Jun 5, 2018

@livarcocc
Renabling the NewProjectRestoresCorrectPackageVersion test doesn't pass for ProdCon type builds:

Failed Microsoft.DotNet.New.Tests.GivenThatIWantANewApp.NewProjectRestoresCorrectPackageVersion(type: "console", packageName: "microsoft.netcore.app")
Expected directory "2.1.1-servicing-26603-03" cannot be found inside directory "E:\A_work\577\s\bin\3\win-x64\test\dotnet-new.Tests\NewProjectRestoresCorrectPackageVersion_console\temp\packages\microsoft.netcore.app".

@mmitche mmitche closed this Jun 5, 2018
@mmitche mmitche reopened this Jun 5, 2018
@livarcocc livarcocc merged commit 5952487 into dotnet:release/2.1.3xx Jun 5, 2018
@livarcocc livarcocc deleted the FixProdConIssues branch June 5, 2018 21:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants