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
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0015821
Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking …
Jun 5, 2018
74a7d63
Update the version for 'microsoft.netcore.app' to "2.1.1*"
Jun 5, 2018
79b4809
Disable NewProjectRestoresCorrectPackageVersion "console" test for now.
Jun 5, 2018
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
2 changes: 1 addition & 1 deletion build/DependencyVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<DotnetSqlCachePackageVersion>2.1.0</DotnetSqlCachePackageVersion>
<DotnetUserSecretsPackageVersion>2.1.0</DotnetUserSecretsPackageVersion>
<DotnetWatchPackageVersion>2.1.0</DotnetWatchPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.0</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.1-rtm-26531-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftBuildPackageVersion>15.7.179</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion build/Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

ToolPath="$(PreviousStageDirectory)" />
</Target>

Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1");
}

[Fact]
Expand Down
5 changes: 2 additions & 3 deletions test/dotnet-new.Tests/GivenThatIWantANewApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ private void CreateAndRestoreNewProject(
}

[Theory]
[InlineData("console", "microsoft.netcore.app")]

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

// re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574
// [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420"
[InlineData("classlib", "netstandard.library")]
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName)
{
Expand Down Expand Up @@ -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.1"));

if (packageName == "microsoft.netcore.app")
{
Expand Down