Skip to content

Fix test assets importing repo defaults instead of SDK defaults #122154

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

Draft
Copilot wants to merge 9 commits into
base: main
Choose a base branch
from
+38 −2
Draft

Fix test assets importing repo defaults instead of SDK defaults #122154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f53ee46
Initial plan
Copilot Dec 3, 2025
c9a7bf5
Remove parent Directory.Build.props import from test assets
Copilot Dec 3, 2025
8ca13f7
Add clarifying comment about intentional hard-coded path
Copilot Dec 3, 2025
9dfe47a
Define TestTfm property and use it in all test asset projects
Copilot Dec 4, 2025
5a37deb
Address review feedback: simplify Directory.Build.props
Copilot Dec 4, 2025
f6d3163
Use NetCoreAppCurrent instead of TestTfm in all projects
Copilot Dec 5, 2025
523dd54
Port over some needed properties and disable warnings
agocke Dec 5, 2025
dbfc4fc
Merge branch 'main' into copilot/fix-directory-build-props-import
agocke Apr 14, 2026
f11d488
Derive NetCoreAppCurrentVersion from eng/Versions.props instead of ha…
Copilot Jul 24, 2026
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
38 changes: 37 additions & 1 deletion src/installer/tests/Assets/Projects/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,42 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
<!-- Calculate necessary paths manually without depending on repo-level properties -->
<PropertyGroup>
<!-- Determine the repo root by walking up from this directory.
Hard-coded path traversal is intentional to avoid automatic discovery of parent Directory.Build.props.
Path: src/installer/tests/Assets/Projects -> repo root requires 5 levels up. -->
<RepoRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', '..', '..', '..', '..'))</RepoRoot>
<RepositoryEngineeringDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng'))</RepositoryEngineeringDir>
<ArtifactsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))</ArtifactsDir>
<ArtifactsBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin'))</ArtifactsBinDir>
</PropertyGroup>

<!-- Import Versions.props to get MajorVersion/MinorVersion for NetCoreAppCurrentVersion -->
<Import Project="$(RepositoryEngineeringDir)Versions.props" />

<!-- Define the target framework version these test assets should build against -->
<PropertyGroup>
<NetCoreAppCurrentVersion Condition="'$(NetCoreAppCurrentVersion)' == ''">$(MajorVersion).$(MinorVersion)</NetCoreAppCurrentVersion>
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
</PropertyGroup>

<PropertyGroup>
<MicrosoftNetCoreAppRefPackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.ref'))</MicrosoftNetCoreAppRefPackDir>
<MicrosoftNetCoreAppRefPackRefDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRefPackRefDir>
<MicrosoftNetCoreAppRefPackDataDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'data'))</MicrosoftNetCoreAppRefPackDataDir>

<MicrosoftNetCoreAppRuntimePackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.runtime.$(TargetRid)', '$(LibrariesConfiguration)'))</MicrosoftNetCoreAppRuntimePackDir>
<MicrosoftNetCoreAppRuntimePackRidDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackDir)', 'runtimes', '$(TargetRid)'))</MicrosoftNetCoreAppRuntimePackRidDir>
<MicrosoftNetCoreAppRuntimePackRidLibTfmDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'lib', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRuntimePackRidLibTfmDir>
<MicrosoftNetCoreAppRuntimePackNativeDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'native'))</MicrosoftNetCoreAppRuntimePackNativeDir>
</PropertyGroup>

<PropertyGroup>
<!-- Allow nullable, but don't check for correctness -->
<Nullable>annotations</Nullable>
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>

<!-- Test asset build configuration -->
<PropertyGroup>
<EnableDefaultItems>true</EnableDefaultItems>
<UseLocalTargetingRuntimePack>true</UseLocalTargetingRuntimePack>
Expand Down
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/Projects/HelloWorld/SelfContained.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>HelloWorld</AssemblyName>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<OutputType>Exe</OutputType>
<SelfContained>true</SelfContained>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
Expand Down
Loading