Skip to content

Fix incorrect merge suppressing my change to publish CG2 framework #49666

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
trylek merged 11 commits into from
Mar 17, 2021
Merged

Fix incorrect merge suppressing my change to publish CG2 framework #49666

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9123ea6
Fix incorrect merge suppressing my change to publish CG2 framework
trylek Mar 15, 2021
3489e1c
Fix DOTNET_ROOT location
trylek Mar 15, 2021
ed44b8e
Address David's PR feedback; add instrumentation to show the .NET root
trylek Mar 15, 2021
43a0d4d
Address additional Anton's PR feedback; use RepoRoot instead of Artif…
trylek Mar 16, 2021
1b1581b
Actually set the DOTNET_ROOT environment variable for Crossgen2
trylek Mar 16, 2021
703be45
Instrumentation
trylek Mar 16, 2021
fcdf285
Normalize path to the sdk.txt file
trylek Mar 16, 2021
19fba36
More instrumentation as I still fail to grasp why it doesn't work
trylek Mar 16, 2021
305071a
Explicitly initialize the .NET CLI per Jeremy's suggestion
trylek Mar 16, 2021
755ffc2
Simplify DOTNET_ROOT logic based on Jeremy's advice
trylek Mar 17, 2021
24255b3
Remove instrumentation as the change finally works
trylek Mar 17, 2021
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
33 changes: 24 additions & 9 deletions src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<CrossDir Condition="'$(BuildArchitecture)' != '$(TargetArchitecture)'">x64</CrossDir>
<Crossgen2Dir>$(CoreCLRArtifactsPath)\$(CrossDir)\crossgen2</Crossgen2Dir>
<Crossgen2Exe>$(Crossgen2Dir)\crossgen2$(ExeSuffix)</Crossgen2Exe>
<PublishReadyToRunUseCrossgen2>true</PublishReadyToRunUseCrossgen2>
<PublishReadyToRunCrossgen2ExtraArgs>--targetarch:$(TargetArchitecture)</PublishReadyToRunCrossgen2ExtraArgs>

<JitTargetOSComponent>unix</JitTargetOSComponent>
Expand Down Expand Up @@ -40,22 +41,36 @@
<!-- Crossgen2 bring-up before SDK 6.0 Preview 2 propagates to the runtime repo. -->
<!-- https://github.com/dotnet/runtime/issues/48252 -->

<UsingTask
TaskName="SetEnvVar"
TaskFactory="RoslynCodeTaskFactory"
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >

<ParameterGroup>
<Name ParameterType="System.String" Required="true" />
<Value ParameterType="System.String" Required="false" />
</ParameterGroup>

<Task>
<Using Namespace="System" />
<Code Type="Fragment" Language="cs">
<![CDATA[
Environment.SetEnvironmentVariable(Name, Value);
]]>
</Code>
</Task>
</UsingTask>

<PropertyGroup>
<OriginalDotnetRootValue />
<DOTNET_ROOT />
<OriginalDotnetRootValue>$(DOTNET_ROOT)</OriginalDotnetRootValue>
</PropertyGroup>

<Target Name="PatchDotnetRootBeforeRunningCrossgen2" BeforeTargets="_CreateR2RImages">
<PropertyGroup>
<OriginalDotnetRootValue>$(DOTNET_ROOT)</OriginalDotnetRootValue>
<DOTNET_ROOT>$(RepoRoot)</DOTNET_ROOT>
</PropertyGroup>
<SetEnvVar Name="DOTNET_ROOT" Value="$(DOTNET_INSTALL_DIR)" />
</Target>

<Target Name="RestoreDotnetRootAfterRunningCrossgen2" AfterTargets="_CreateR2RImages">
<PropertyGroup>
<DOTNET_ROOT>$(OriginalDotnetRootValue)</DOTNET_ROOT>
</PropertyGroup>
<SetEnvVar Name="DOTNET_ROOT" Value="$(OriginalDotnetRootValue)" />
</Target>

<!-- End of hack to patch DOTNET_ROOT for the duration of Crossgen2 compilation. -->
Expand Down