File tree Expand file tree Collapse file tree 5 files changed +44
-3
lines changed
eng/pipelines/templates/jobs Expand file tree Collapse file tree 5 files changed +44
-3
lines changed Original file line number Diff line number Diff line change @@ -104,10 +104,10 @@ jobs:
104
104
env :
105
105
BuildConfig : $(buildConfiguration)
106
106
TestFullMSBuild : ${{ parameters.testFullMSBuild }}
107
-
107
+
108
108
- powershell : build/RunTestTemplateTests.ps1
109
109
displayName : 🟣 Run Test Templates Tests
110
-
110
+
111
111
- ${{ else }} :
112
112
- script : |
113
113
source $(Build.SourcesDirectory)/eng/common/native/init-os-and-arch.sh
@@ -137,6 +137,7 @@ jobs:
137
137
- ${{ if eq(parameters.runAoTTests, true) }} :
138
138
# For the reason this is here, see: https://github.com/dotnet/sdk/issues/22655
139
139
- script : $(Build.SourcesDirectory)/artifacts/bin/redist/$(buildConfiguration)/dotnet/dotnet workload install wasm-tools --skip-manifest-update
140
+ workingDirectory : $(Build.SourcesDirectory)/artifacts
140
141
displayName : 🟣 Install wasm-tools Workload
141
142
# For the /p:Projects syntax for PowerShell, see: https://github.com/dotnet/msbuild/issues/471#issuecomment-1146466335
142
143
- ${{ if eq(parameters.pool.os, 'windows') }} :
Original file line number Diff line number Diff line change 1
1
{
2
+ "sdk" : {
3
+ "paths" : [
4
+ " .dotnet" ,
5
+ " $host$"
6
+ ],
7
+ "errorMessage" : " The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
8
+ },
2
9
"tools" : {
3
10
"dotnet" : " 10.0.100-preview.6.25315.102" ,
4
11
"runtimes" : {
Original file line number Diff line number Diff line change 117
117
</Target >
118
118
119
119
<Target Name =" ReturnProductVersion" Returns =" $(FullNugetVersion)" />
120
-
121
120
</Project >
Original file line number Diff line number Diff line change 21
21
<Import Project =" GenerateArchives.targets" />
22
22
23
23
<Import Project =" OverlaySdkOnLKG.targets" />
24
+ <Import Project =" GenerateTestingGlobalJson.targets" />
24
25
</ImportGroup >
25
26
26
27
<!-- Installers -->
Original file line number Diff line number Diff line change
1
+ <Project >
2
+ <PropertyGroup >
3
+ <!-- We put this in the root of the artifacts dir so that any usage (not just from ./tmp, but also from ./bin) gets redirected. -->
4
+ <_TestingGlobalJsonPath >$(ArtifactsDir)global.json</_TestingGlobalJsonPath >
5
+ </PropertyGroup >
6
+
7
+ <!-- Since the dotnet binary respects sdk.paths in global.json now, and we use this in the repo root to make sure that we consistently use the repo-local
8
+ SDK for building/etc, we need to put something in place so that tests don't use the repo-local SDK and instead use the redist SDK. -->
9
+ <Target Name =" CreateRedistGlobalJsonForTesting"
10
+ BeforeTargets =" AfterBuild"
11
+ Outputs =" $(_TestingGlobalJsonPath)" >
12
+ <PropertyGroup >
13
+ <_TestingRedistDotnetPath >$(TestHostDotNetRoot.Replace('\', '\\'))</_TestingRedistDotnetPath >
14
+ </PropertyGroup >
15
+ <ItemGroup >
16
+ <_RedistGlobalJsonLines Include =" {" />
17
+ <_RedistGlobalJsonLines Include =" " sdk" : {" />
18
+ <_RedistGlobalJsonLines Include =" " paths" : [" />
19
+ <_RedistGlobalJsonLines Include =" " $(_TestingRedistDotnetPath)" " />
20
+ <_RedistGlobalJsonLines Include =" ]" />
21
+ <_RedistGlobalJsonLines Include =" }" />
22
+ <_RedistGlobalJsonLines Include =" }" />
23
+ </ItemGroup >
24
+ <WriteLinesToFile File =" $(_TestingGlobalJsonPath)"
25
+ Lines =" @(_RedistGlobalJsonLines)"
26
+ Overwrite =" true"
27
+ Encoding =" utf-8"
28
+ WriteOnlyWhenDifferent =" true" />
29
+ <ItemGroup >
30
+ <FileWrites Include =" $(_TestingGlobalJsonPath)" />
31
+ </ItemGroup >
32
+ </Target >
33
+ </Project >
You can’t perform that action at this time.
0 commit comments