diff --git a/dir.targets b/dir.targets index 73c674caa3df..ee40a09a91c1 100644 --- a/dir.targets +++ b/dir.targets @@ -49,7 +49,6 @@ - $(NetFxPackageRefPath) $(NetFxPackageRuntimePath) diff --git a/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.pkgproj b/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.pkgproj index 564362b36086..eff03b95a7f7 100644 --- a/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.pkgproj +++ b/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.pkgproj @@ -12,6 +12,7 @@ $(NetFxPackageRuntimePath) true + false true - <_netFxReference Include="@(NetFxReference)" Exclude="@(_refFileNames);@(_libFileNames)" /> + <_netFxReference Include="@(NetFxReference)" Exclude="@(_libFileNames)" /> - <_excludeShimsRef Include="@(_netFxReference);@(_refFileNames)"/> <_excludeShimsLib Include="@(_netFxReference);@(_libFileNames)"/> - - $(TargetFramework) - $(TargetFramework) @@ -98,21 +94,12 @@ - - reference-net461 - runtime-net461 - - reference-net462 - runtime-net462 - - reference-net47 - runtime-net47 @@ -163,10 +150,6 @@ - - - build/%(RefFile.TargetFramework)/ref%(RefFile.SubFolder) - diff --git a/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.targets b/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.targets index 385544bb652b..bde8d6a9792e 100644 --- a/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.targets +++ b/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.targets @@ -44,17 +44,9 @@ consider a project with an Reference Include="System", and some NuGet package is providing System.dll. Simple references can also come from NuGet framework assemblies, hence this statement should occur after including all computed references. --> - - - - - false - NETStandard.Library.NETFramework - $(NETStandardLibraryNETFrameworkPackageVersion) - + - false NETStandard.Library.NETFramework $(NETStandardLibraryPackageVersion) diff --git a/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.targets b/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.targets index a01175375eed..aea9b8bef98a 100644 --- a/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.targets +++ b/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.targets @@ -1,8 +1,5 @@ - <_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll" - Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> - <_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll" Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> diff --git a/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.targets b/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.targets index 2d0419841b1c..5192b805f8c1 100644 --- a/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.targets +++ b/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.targets @@ -1,8 +1,5 @@ - <_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll" - Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> - <_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll" Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> diff --git a/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.targets b/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.targets index a27d071d79c0..599141185df7 100644 --- a/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.targets +++ b/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.targets @@ -1,8 +1,5 @@ - <_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll" - Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> - <_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll" Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> diff --git a/src/netfx.force.conflict/dir.props b/src/netfx.force.conflict/dir.props index e3457a3688cd..4d605acb10a2 100644 --- a/src/netfx.force.conflict/dir.props +++ b/src/netfx.force.conflict/dir.props @@ -5,8 +5,6 @@ 0.0.0.0 Open - - false - true + true diff --git a/src/netfx.force.conflict/ref/Configurations.props b/src/netfx.force.conflict/src/Configurations.props similarity index 100% rename from src/netfx.force.conflict/ref/Configurations.props rename to src/netfx.force.conflict/src/Configurations.props diff --git a/src/netfx.force.conflict/ref/TypeForwards.cs b/src/netfx.force.conflict/src/TypeForwards.cs similarity index 100% rename from src/netfx.force.conflict/ref/TypeForwards.cs rename to src/netfx.force.conflict/src/TypeForwards.cs diff --git a/src/netfx.force.conflict/ref/netfx.force.conflicts.csproj b/src/netfx.force.conflict/src/netfx.force.conflicts.csproj similarity index 100% rename from src/netfx.force.conflict/ref/netfx.force.conflicts.csproj rename to src/netfx.force.conflict/src/netfx.force.conflicts.csproj diff --git a/src/packages.builds b/src/packages.builds index 2adce7749bef..2d4a663a097c 100644 --- a/src/packages.builds +++ b/src/packages.builds @@ -24,6 +24,9 @@ $(AdditionalProperties) + + $(AdditionalProperties) + $(AdditionalProperties)