Skip to content

Use sdk paths! #62619

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
merged 7 commits into from
Aug 22, 2025
Merged

Use sdk paths! #62619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fb83755
Use sdk paths!
BrennanConroy Jul 8, 2025
c9c2f04
error message
BrennanConroy Jul 8, 2025
443f2d8
Merge branch 'main' into brecon/paths
BrennanConroy Jul 22, 2025
75b08a7
Merge branch 'main' into brecon/paths
ilonatommy Aug 21, 2025
4716094
Update PrepareForTest.targets
BrennanConroy Aug 21, 2025
7746223
Try fixing templates.
ilonatommy Aug 22, 2025
5291ac3
Real fix but it requires bumping version in two places.
ilonatommy Aug 22, 2025
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
4 changes: 3 additions & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"sdk": {
"version": "10.0.100-rc.1.25411.109"
"version": "10.0.100-rc.1.25411.109",
"paths": [ ".dotnet", "$host$" ],
"errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
Copy link

Copilot AI Aug 21, 2025

Choose a reason for hiding this comment

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

The error message references './restore.cmd' and './restore.sh' scripts, but based on the coding guidelines, the repository uses './build.sh' scripts in subdirectories for building and running tests. Consider updating the error message to reference the correct scripts or provide more accurate guidance.

Suggested change
"errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
"errorMessage": "The .NET SDK could not be found. Please run ./build.sh (or ./build.cmd on Windows) in the appropriate subdirectory first."

Copilot uses AI. Check for mistakes.

},
"tools": {
"dotnet": "10.0.100-rc.1.25411.109",
Expand Down
3 changes: 2 additions & 1 deletion src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<PropertyGroup>
<TestTemplateCreationFolder>$([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)'))</TestTemplateCreationFolder>
<CustomTemplateHivePath>$(TestTemplateCreationFolder)\Hives\$([System.Guid]::NewGuid())\.templateengine</CustomTemplateHivePath>
<TemplateTestDotNetRoot Condition="'$(IsHelixJob)' != 'true'">$(TestTemplateCreationFolder)dotnet\</TemplateTestDotNetRoot>
<TemplateTestDotNetRoot Condition="'$(IsHelixJob)' != 'true'">$(TestTemplateCreationFolder).dotnet\</TemplateTestDotNetRoot>
<_DotNetHostFileName>dotnet</_DotNetHostFileName>
<_DotNetHostFileName Condition="$([MSBuild]::IsOSPlatform(`Windows`))">dotnet.exe</_DotNetHostFileName>
</PropertyGroup>
Expand Down Expand Up @@ -120,6 +120,7 @@
<_FilesToCopy Include="$(LocalDotNetRoot)shared\**\*" DestinationRelativeFolder="shared\" />
<_FilesToCopy Include="$(LocalDotNetRoot)sdk\**\*" DestinationRelativeFolder="sdk\" />
<_FilesToCopy Include="$(SharedFrameworkLayoutRoot)\**\*" />
<_FilesToCopy Include="$(RepoRoot)\global.json" />

<_DestinationFiles Include="@(_FilesToCopy->'$(TemplateTestDotNetRoot)%(DestinationRelativeFolder)%(RecursiveDir)%(Filename)%(Extension)')" />
</ItemGroup>
Expand Down
7 changes: 7 additions & 0 deletions src/ProjectTemplates/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"version": "10.0.100-rc.1.25411.109",
"paths": [ "scripts/.dotnet", "$host$" ],
"errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
}
}
Loading