diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-07-14 04:34:32 +0300 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-07-14 19:17:07 +0300 |
| commit | 3c1eac23716f27182e35562d613aef1d80a99147 (patch) | |
| tree | 6e81d6d855ffb66d1266ff0181ac6605e443f23a /pkg/frameworkPackage.targets | |
| parent | 78db832b8aa934207c9655a9321d416185c35e60 (diff) | |
Add net47 configuration to System.Security.Cryptography.Algorithms
Fix NETStandard.Library.NETFramework package targets
Update the VerifyDuplicateTypes target to include framework assemblies
to ensure we don't have any conflicting types between the framework and our OOBs.
Diffstat (limited to 'pkg/frameworkPackage.targets')
| -rw-r--r-- | pkg/frameworkPackage.targets | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/pkg/frameworkPackage.targets b/pkg/frameworkPackage.targets index 9c45b37ea6..c2df42f615 100644 --- a/pkg/frameworkPackage.targets +++ b/pkg/frameworkPackage.targets @@ -54,7 +54,7 @@ <!-- force a missing file if native build is absent --> <NativeFile Include="$(NativeBinDir)/MISSING_NATIVE_BUILD" Condition="'@(NativeFile)' == ''" /> </ItemGroup> - + <Target Name="_CheckForFiles"> <Error Condition="'$(IncludeReferenceFiles)' == 'true' AND '@(RefFile)' == ''" Text="IncludeReferenceFiles was specified but no file props were found in '$(RefBinDir)'" /> @@ -63,7 +63,7 @@ <Error Condition="'$(IncludeNativeFiles)' == 'true' AND '@(NativeFile)' == ''" Text="IncludeNativeFiles was specified but no files were found in '$(NativeBinDir)'" /> </Target> - + <Target Name="IncludeFiles"> <PropertyGroup> <_projectDirLength>$(ProjectDir.Length)</_projectDirLength> @@ -74,7 +74,7 @@ <File Include="@(RefFile)"> <TargetPath Condition="'%(RefFile.TargetPath)' == ''">$(RefFileTargetPath)%(RefFile.SubFolder)</TargetPath> </File> - + <!-- Include lib --> <File Include="@(LibFile)"> <TargetPath Condition="'%(LibFile.TargetPath)' == '' ">$(LibFileTargetPath)%(LibFile.SubFolder)</TargetPath> @@ -107,8 +107,8 @@ </ItemGroup> </Target> - <Target Name="VerifyClosure" - DependsOnTargets="GetClosureFiles" + <Target Name="VerifyClosure" + DependsOnTargets="GetClosureFiles" AfterTargets="Build" Inputs="%(ClosureFile.FileSet)" Outputs="batching-on-FileSet-metadata"> @@ -127,15 +127,21 @@ </Target> - <Target Name="VerifyDuplicateTypes" - DependsOnTargets="GetClosureFiles" + <Target Name="VerifyDuplicateTypes" + DependsOnTargets="GetClosureFiles" AfterTargets="Build" Inputs="%(ClosureFile.FileSet)" Outputs="batching-on-FileSet-metadata"> + <PropertyGroup> + <_fileSet>%(ClosureFile.FileSet)</_fileSet> + </PropertyGroup> <ItemGroup> <_dupTypeFileName Include="@(ClosureFile->'%(FileName)')"> <Original>%(Identity)</Original> </_dupTypeFileName> + <_dupTypeFileName Include="@(FrameworkClosureFile->'%(FileName)')" Exclude="@(_dupTypeFileName)" Condition="'$(_fileSet)' == '%(FrameworkClosureFile.FileSet)'"> + <Original>%(Identity)</Original> + </_dupTypeFileName> <_dupTypeFileNamesFiltered Include="@(_dupTypeFileName)" Exclude="@(ExcludeFromDuplicateTypes)"/> <_dupTypeFileFiltered Include="@(_dupTypeFileNamesFiltered->'%(Original)')"/> </ItemGroup> @@ -146,8 +152,8 @@ </Target> - <Target Name="VerifyNETStandard" - DependsOnTargets="GetClosureFiles" + <Target Name="VerifyNETStandard" + DependsOnTargets="GetClosureFiles" AfterTargets="Build" Inputs="%(ClosureFile.FileSet)" Outputs="batching-on-FileSet-metadata"> |