|
6 | 6 | <CrossDir Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)'">x64</CrossDir> |
7 | 7 | <Crossgen2Dir>$(CoreCLRArtifactsPath)\$(CrossDir)\crossgen2</Crossgen2Dir> |
8 | 8 | <Crossgen2Exe>$(Crossgen2Dir)\crossgen2$(ExeSuffix)</Crossgen2Exe> |
| 9 | + <PublishReadyToRunUseCrossgen2>true</PublishReadyToRunUseCrossgen2> |
9 | 10 | <PublishReadyToRunCrossgen2ExtraArgs>--targetarch:$(TargetArchitecture)</PublishReadyToRunCrossgen2ExtraArgs> |
10 | 11 |
|
11 | 12 | <JitTargetOSComponent>unix</JitTargetOSComponent> |
|
40 | 41 | <!-- Crossgen2 bring-up before SDK 6.0 Preview 2 propagates to the runtime repo. --> |
41 | 42 | <!-- https://github.com/dotnet/runtime/issues/48252 --> |
42 | 43 |
|
| 44 | + <UsingTask |
| 45 | + TaskName="SetEnvVar" |
| 46 | + TaskFactory="RoslynCodeTaskFactory" |
| 47 | + AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" > |
| 48 | + |
| 49 | + <ParameterGroup> |
| 50 | + <Name ParameterType="System.String" Required="true" /> |
| 51 | + <Value ParameterType="System.String" Required="false" /> |
| 52 | + </ParameterGroup> |
| 53 | + |
| 54 | + <Task> |
| 55 | + <Using Namespace="System" /> |
| 56 | + <Code Type="Fragment" Language="cs"> |
| 57 | + <![CDATA[ |
| 58 | + Environment.SetEnvironmentVariable(Name, Value); |
| 59 | + ]]> |
| 60 | + </Code> |
| 61 | + </Task> |
| 62 | + </UsingTask> |
| 63 | + |
43 | 64 | <PropertyGroup> |
44 | | - <OriginalDotnetRootValue /> |
45 | | - <DOTNET_ROOT /> |
| 65 | + <OriginalDotnetRootValue>$(DOTNET_ROOT)</OriginalDotnetRootValue> |
46 | 66 | </PropertyGroup> |
47 | 67 |
|
48 | 68 | <Target Name="PatchDotnetRootBeforeRunningCrossgen2" BeforeTargets="_CreateR2RImages"> |
49 | | - <PropertyGroup> |
50 | | - <OriginalDotnetRootValue>$(DOTNET_ROOT)</OriginalDotnetRootValue> |
51 | | - <DOTNET_ROOT>$(RepoRoot)</DOTNET_ROOT> |
52 | | - </PropertyGroup> |
| 69 | + <SetEnvVar Name="DOTNET_ROOT" Value="$(DOTNET_INSTALL_DIR)" /> |
53 | 70 | </Target> |
54 | 71 |
|
55 | 72 | <Target Name="RestoreDotnetRootAfterRunningCrossgen2" AfterTargets="_CreateR2RImages"> |
56 | | - <PropertyGroup> |
57 | | - <DOTNET_ROOT>$(OriginalDotnetRootValue)</DOTNET_ROOT> |
58 | | - </PropertyGroup> |
| 73 | + <SetEnvVar Name="DOTNET_ROOT" Value="$(OriginalDotnetRootValue)" /> |
59 | 74 | </Target> |
60 | 75 |
|
61 | 76 | <!-- End of hack to patch DOTNET_ROOT for the duration of Crossgen2 compilation. --> |
|
0 commit comments