diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2016-07-22 22:38:43 -0700 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2016-07-22 22:38:43 -0700 |
| commit | f6494de96ed4683fbe0fd5aa146c3bb8fdd69a97 (patch) | |
| tree | 334a0d149eb2e7bc306b8291a5af26588fadf3d6 /src/mscorlib/Tools | |
| parent | 61cb42ceb8f6f542606c7863c7e26edea7b9653c (diff) | |
| download | coreclr-f6494de96ed4683fbe0fd5aa146c3bb8fdd69a97.tar.gz coreclr-f6494de96ed4683fbe0fd5aa146c3bb8fdd69a97.tar.bz2 coreclr-f6494de96ed4683fbe0fd5aa146c3bb8fdd69a97.zip | |
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.
Diffstat (limited to 'src/mscorlib/Tools')
| -rw-r--r-- | src/mscorlib/Tools/BclRewriter/BclRewriter.targets | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mscorlib/Tools/BclRewriter/BclRewriter.targets b/src/mscorlib/Tools/BclRewriter/BclRewriter.targets index 9121ca62aa..5515b000a7 100644 --- a/src/mscorlib/Tools/BclRewriter/BclRewriter.targets +++ b/src/mscorlib/Tools/BclRewriter/BclRewriter.targets @@ -9,13 +9,14 @@ <BclRewriterWorkDir>$(IntermediateOutputPath)\BclRewriter</BclRewriterWorkDir> <BclRewriterSymbolOutput>$(IntermediateOutputPath)\BclRewriter\$(TargetName).pdb</BclRewriterSymbolOutput> <BclRewriterOutput>$(IntermediateOutputPath)\BclRewriter\$(TargetName)$(TargetExt)</BclRewriterOutput> + <TargetPath>$(BclRewriterOutput)</TargetPath> </PropertyGroup> - + <ItemGroup> <RewrittenAssembly Include="$(BclRewriterOutput)" /> </ItemGroup> - - <Target Name="RewriteWithBclRewriter" + + <Target Name="RewriteWithBclRewriter" Inputs="$(BclRewriterModelFile);@(AnnotatedAssembly)" Outputs="@(RewrittenAssembly)" DependsOnTargets="$(BclRewriterDependencyTargets)"> <PropertyGroup> @@ -23,7 +24,7 @@ <OSPlatform Condition="'$(TargetsWindows)' != 'true'">unix</OSPlatform> <BclRewriterCommand Condition="'$(BclRewriterCommand)'==''">"$(ToolRuntimePath)dotnetcli/$(ToolHost)" "$(ToolsDir)BclRewriter.exe"</BclRewriterCommand> </PropertyGroup> - + <Exec Command="$(BclRewriterCommand) -in:"@(AnnotatedAssembly)" -out:"$(BclRewriterOutput)" -include:"$(BclRewriterModelFile)" -platform:$(OSPlatform) -architecture:$(Platform) -flavor:$(_BuildType) -removeSerializable- -define:"$(DefineConstants)" -keepTempFiles+" StandardOutputImportance="Normal" /> <!-- Update the location of the symbol file--> |