Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit f6494de

Browse files
committed
Update mscorlib facade to use the rewritten S.P.CoreLib
Indirectly we were building the mscorlib facade against the pre-rewritten S.P.CoreLib which had more types in it that weren't present after we rewrote the assembly. This change forces the TargetPath to be the final output for S.P.CoreLib so the ProjectReference pulls in the correct assembly and will give errors if there are missing types when generating the facade. ICloneable and and ResolveEventHandler were missing so including those in the model.xml file.
1 parent 61cb42c commit f6494de

File tree

2 files changed

+170
-166
lines changed

2 files changed

+170
-166
lines changed

src/mscorlib/Tools/BclRewriter/BclRewriter.targets

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@
99
<BclRewriterWorkDir>$(IntermediateOutputPath)\BclRewriter</BclRewriterWorkDir>
1010
<BclRewriterSymbolOutput>$(IntermediateOutputPath)\BclRewriter\$(TargetName).pdb</BclRewriterSymbolOutput>
1111
<BclRewriterOutput>$(IntermediateOutputPath)\BclRewriter\$(TargetName)$(TargetExt)</BclRewriterOutput>
12+
<TargetPath>$(BclRewriterOutput)</TargetPath>
1213
</PropertyGroup>
13-
14+
1415
<ItemGroup>
1516
<RewrittenAssembly Include="$(BclRewriterOutput)" />
1617
</ItemGroup>
17-
18-
<Target Name="RewriteWithBclRewriter"
18+
19+
<Target Name="RewriteWithBclRewriter"
1920
Inputs="$(BclRewriterModelFile);@(AnnotatedAssembly)" Outputs="@(RewrittenAssembly)" DependsOnTargets="$(BclRewriterDependencyTargets)">
2021

2122
<PropertyGroup>
2223
<OSPlatform Condition="'$(TargetsWindows)' == 'true'">win</OSPlatform>
2324
<OSPlatform Condition="'$(TargetsWindows)' != 'true'">unix</OSPlatform>
2425
<BclRewriterCommand Condition="'$(BclRewriterCommand)'==''">"$(ToolRuntimePath)dotnetcli/$(ToolHost)" "$(ToolsDir)BclRewriter.exe"</BclRewriterCommand>
2526
</PropertyGroup>
26-
27+
2728
<Exec Command="$(BclRewriterCommand) -in:&quot;@(AnnotatedAssembly)&quot; -out:&quot;$(BclRewriterOutput)&quot; -include:&quot;$(BclRewriterModelFile)&quot; -platform:$(OSPlatform) -architecture:$(Platform) -flavor:$(_BuildType) -removeSerializable- -define:&quot;$(DefineConstants)&quot; -keepTempFiles+" StandardOutputImportance="Normal" />
2829

2930
<!-- Update the location of the symbol file-->

0 commit comments

Comments
 (0)