Skip to content

Commit 9f2977b

Browse files
Use sdk paths! (#62619)
1 parent 6a148ec commit 9f2977b

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

global.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25411.109"
3+
"version": "10.0.100-rc.1.25411.109",
4+
"paths": [ ".dotnet", "$host$" ],
5+
"errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
46
},
57
"tools": {
68
"dotnet": "10.0.100-rc.1.25411.109",

src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<PropertyGroup>
6060
<TestTemplateCreationFolder>$([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)'))</TestTemplateCreationFolder>
6161
<CustomTemplateHivePath>$(TestTemplateCreationFolder)\Hives\$([System.Guid]::NewGuid())\.templateengine</CustomTemplateHivePath>
62-
<TemplateTestDotNetRoot Condition="'$(IsHelixJob)' != 'true'">$(TestTemplateCreationFolder)dotnet\</TemplateTestDotNetRoot>
62+
<TemplateTestDotNetRoot Condition="'$(IsHelixJob)' != 'true'">$(TestTemplateCreationFolder).dotnet\</TemplateTestDotNetRoot>
6363
<_DotNetHostFileName>dotnet</_DotNetHostFileName>
6464
<_DotNetHostFileName Condition="$([MSBuild]::IsOSPlatform(`Windows`))">dotnet.exe</_DotNetHostFileName>
6565
</PropertyGroup>
@@ -120,6 +120,7 @@
120120
<_FilesToCopy Include="$(LocalDotNetRoot)shared\**\*" DestinationRelativeFolder="shared\" />
121121
<_FilesToCopy Include="$(LocalDotNetRoot)sdk\**\*" DestinationRelativeFolder="sdk\" />
122122
<_FilesToCopy Include="$(SharedFrameworkLayoutRoot)\**\*" />
123+
<_FilesToCopy Include="$(RepoRoot)\global.json" />
123124

124125
<_DestinationFiles Include="@(_FilesToCopy->'$(TemplateTestDotNetRoot)%(DestinationRelativeFolder)%(RecursiveDir)%(Filename)%(Extension)')" />
125126
</ItemGroup>

src/ProjectTemplates/global.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "10.0.100-rc.1.25411.109",
4+
"paths": [ "scripts/.dotnet", "$host$" ],
5+
"errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
6+
}
7+
}

0 commit comments

Comments
 (0)