diff --git a/global.json b/global.json index 9364cfded31b..eab2b9c2bc49 100644 --- a/global.json +++ b/global.json @@ -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." }, "tools": { "dotnet": "10.0.100-rc.1.25411.109", diff --git a/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets b/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets index 1d4a655b7c61..42c4fad6af49 100644 --- a/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets +++ b/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets @@ -59,7 +59,7 @@ $([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)')) $(TestTemplateCreationFolder)\Hives\$([System.Guid]::NewGuid())\.templateengine - $(TestTemplateCreationFolder)dotnet\ + $(TestTemplateCreationFolder).dotnet\ <_DotNetHostFileName>dotnet <_DotNetHostFileName Condition="$([MSBuild]::IsOSPlatform(`Windows`))">dotnet.exe @@ -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)')" /> diff --git a/src/ProjectTemplates/global.json b/src/ProjectTemplates/global.json new file mode 100644 index 000000000000..455cda64f319 --- /dev/null +++ b/src/ProjectTemplates/global.json @@ -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." + } +}