Skip to content

[release/6.0.1xx-preview7] Update dependencies from dotnet/msbuild #19399

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

Closed
wants to merge 4 commits into from
Closed

[release/6.0.1xx-preview7] Update dependencies from dotnet/msbuild #19399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dec60f2
Update dependencies from https://github.com/dotnet/msbuild build 2021…
dotnet-maestro[bot] Jul 29, 2021
9da3787
Update dependencies from https://github.com/dotnet/msbuild build 2021…
dotnet-maestro[bot] Jul 29, 2021
a6e268b
Update dependencies from https://github.com/dotnet/msbuild build 2021…
dotnet-maestro[bot] Jul 30, 2021
80e42cf
Revert tests fixes from PR#19089.
AR-May Jul 30, 2021
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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91ba01788d4d83475fec3aea7c830376e08585da</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21378-03">
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21380-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d592862edb5896aef3c1e1526c08f3be0285ca98</Sha>
<Sha>b6e7d6051a3c3f595bfa11bd3b2749c0c8cc7f3c</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.0.0-preview-21378-03">
<Dependency Name="Microsoft.Build.Localization" Version="17.0.0-preview-21380-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d592862edb5896aef3c1e1526c08f3be0285ca98</Sha>
<Sha>b6e7d6051a3c3f595bfa11bd3b2749c0c8cc7f3c</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21377.1">
<Uri>https://github.com/dotnet/fsharp</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
<MicrosoftBuildPackageVersion>17.0.0-preview-21378-03</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>17.0.0-preview-21380-01</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.0.0-preview-21378-03</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.0.0-preview-21380-01</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
Expand Down
11 changes: 3 additions & 8 deletions src/Tests/Microsoft.NET.Build.Tests/AppHostTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Microsoft.NET.Build.Tests
{
public class AppHostTests : SdkTest
{
private string[] GetExpectedFilesFromBuild(TestAsset testAsset, string targetFramework)
private static string[] GetExpectedFilesFromBuild(TestAsset testAsset, string targetFramework)
{
var testProjectName = testAsset.TestProject?.Name ?? testAsset.Name;
var expectedFiles = new List<string>()
Expand All @@ -39,13 +39,8 @@ private string[] GetExpectedFilesFromBuild(TestAsset testAsset, string targetFra
if (!string.IsNullOrEmpty(targetFramework))
{
var parsedTargetFramework = NuGetFramework.Parse(targetFramework);

// TODO: Remove after Framework MSBuild picks up https://github.com/dotnet/msbuild/pull/6560
if (UsingFullFrameworkMSBuild)
{
if (parsedTargetFramework.Version.Major >= 5)
expectedFiles.Add($"ref/{testProjectName}.dll");
}
if (parsedTargetFramework.Version.Major >= 5)
expectedFiles.Add($"ref/{testProjectName}.dll");

if (parsedTargetFramework.Version.Major < 6)
expectedFiles.Add($"{testProjectName}.runtimeconfig.dev.json");
Expand Down
6 changes: 3 additions & 3 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,17 +891,17 @@ public void It_builds_the_project_successfully_with_only_reference_assembly_set(
.Should()
.Pass();

var intermediatePath = buildCommand.GetIntermediateDirectory(targetFramework: "net5.0").FullName;
var outputPath = buildCommand.GetOutputDirectory(targetFramework: "net5.0").FullName;
if (produceOnlyReferenceAssembly == true)
{
var refPath = Path.Combine(intermediatePath, "ref");
var refPath = Path.Combine(outputPath, "ref");
Directory.Exists(refPath)
.Should()
.BeFalse();
}
else
{
var refPath = Path.Combine(intermediatePath, "ref", "MainProject.dll");
var refPath = Path.Combine(outputPath, "ref", "MainProject.dll");
File.Exists(refPath)
.Should()
.BeTrue();
Expand Down
34 changes: 8 additions & 26 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToProduceReferenceAssembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,43 +19,25 @@ public GivenThatWeWantToProduceReferenceAssembly(ITestOutputHelper log) : base(l
{}

[RequiresMSBuildVersionTheory("16.8.0")]
[InlineData("netcoreapp3.1", false, false)]
[InlineData("net5.0", true, false)]
[InlineData("net5.0", true, true)]
public void It_produces_ref_assembly_for_appropriate_frameworks(string targetFramework, bool expectedExists, bool expectedInBinDir)
[InlineData("netcoreapp3.1", false)]
[InlineData("net5.0", true)]
public void It_produces_ref_assembly_for_appropriate_frameworks(string targetFramework, bool expectedExists)
{
TestProject testProject = new TestProject()
{
Name = "ProduceRefAssembly",
IsExe = true,
IsExe = true,
TargetFrameworks = targetFramework
};

var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework + expectedExists + expectedInBinDir);
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework);

var buildCommand = new BuildCommand(testAsset);
var buildArgument = expectedInBinDir ? "/p:ProduceReferenceAssemblyInOutDir=true" : string.Empty;
buildCommand.Execute(buildArgument)
buildCommand.Execute()
.Should()
.Pass();

// TODO: Remove after Framework MSBuild picks up https://github.com/dotnet/msbuild/pull/6560
if (UsingFullFrameworkMSBuild)
{
var filePath = Path.Combine(testAsset.Path, testProject.Name, "obj", "Debug", targetFramework, "ref", $"{testProject.Name}.dll");
File.Exists(filePath).Should().Be(expectedExists);
}
else
{
var filePath = Path.Combine(testAsset.Path, testProject.Name, "obj", "Debug", targetFramework, "ref", $"{testProject.Name}.dll");
File.Exists(filePath).Should().Be(expectedExists && !expectedInBinDir);

var intFilePath = Path.Combine(testAsset.Path, testProject.Name, "obj", "Debug", targetFramework, "refint", $"{testProject.Name}.dll");
File.Exists(intFilePath).Should().Be(expectedExists);

var binFilePath = Path.Combine(testAsset.Path, testProject.Name, "bin", "Debug", targetFramework, "ref", $"{testProject.Name}.dll");
File.Exists(binFilePath).Should().Be(expectedExists && expectedInBinDir);
}
var filePath = Path.Combine(testAsset.Path, testProject.Name, "obj", "Debug", targetFramework, "ref", $"{testProject.Name}.dll");
File.Exists(filePath).Should().Be(expectedExists);
}
}
}