Skip to content

Set PlatformName and other properties early enough in outer build #33003

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

Merged
marcpopMSFT merged 1 commit into from
Jun 13, 2023
Merged

Set PlatformName and other properties early enough in outer build #33003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.DefaultAssemblyInfo.targets" Condition="'$(UsingNETSdkDefaults)' == 'true'"/>

<!--
Apply the same default output paths as Microsoft.Common.targets now since we're running before them,
Apply these defaults from Microsoft.Common.CurrentVersion.targets now since we're running before them,
but need to adjust them and/or make decisions in terms of them.
-->
<PropertyGroup>
Expand Down
10 changes: 10 additions & 0 deletions ...ks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommonCrossTargeting.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ Copyright (c) .NET Foundation. All rights reserved.
-->
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!--
Apply these defaults from Microsoft.Common.CurrentVersion.targets now since we're running before them,
but need to adjust them and/or make decisions in terms of them.
-->
<PropertyGroup>
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
<Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
<PlatformName Condition="'$(PlatformName)' == ''">$(Platform)</PlatformName>
Comment on lines +19 to +21
Copy link
Member

@MiYanni MiYanni Jun 6, 2023

Choose a reason for hiding this comment

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

nit: ''=='' or '' == ''? Not sure what the standard is.

</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.DefaultAssemblyInfo.targets" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.DefaultOutputPaths.targets" />
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Workloads.CrossTargeting.targets" />
Expand Down
33 changes: 33 additions & 0 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACrossTargetedLibrary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using System.Linq;
using FluentAssertions;
using Xunit.Abstractions;
using Microsoft.NET.TestFramework.ProjectConstruction;

namespace Microsoft.NET.Build.Tests
{
Expand Down Expand Up @@ -119,5 +120,37 @@ public void It_combines_inner_rids_for_restore(
command.ExecuteWithoutRestore().Should().Pass();
command.GetValues().Should().BeEquivalentTo(expectedCombination.Split(';'));
}

[Fact]
public void OutputPathDoesNotHaveDuplicatedBackslashesInOuterBuild()
{
var testProject = new TestProject()
{
TargetFrameworks = $"{ToolsetInfo.CurrentTargetFramework};net7.0"
};

testProject.ProjectChanges.Add(xml =>
{
var target = """
<Target Name="GetOutputPath">
<WriteLinesToFile File="$(MSBuildProjectDirectory)\OutputPathValue.txt"
Lines="$(OutputPath)"
Overwrite="true" />
</Target>
""";

xml.Root.Add(XElement.Parse(target));
});

var testAsset = _testAssetsManager.CreateTestProject(testProject);

new MSBuildCommand(testAsset, "GetOutputPath")
.Execute()
.Should()
.Pass();

string outputPathValue = File.ReadAllText(Path.Combine(testAsset.TestRoot, testProject.Name, "OutputPathValue.txt"));
outputPathValue.Trim().Should().NotContain("\\\\");
}
}
}