diff options
| author | Jacek Blaszczynski <biosciencenow@outlook.com> | 2018-08-03 03:32:49 +0200 |
|---|---|---|
| committer | Jacek Blaszczynski <biosciencenow@outlook.com> | 2018-08-03 17:46:56 +0200 |
| commit | 91f40df549c8f100a8889ed7b37d5e0935f36d3b (patch) | |
| tree | edc72717a34ab269450fbd4f281add953d442c23 | |
| parent | 134b906abc87dbd78ddc49f7068ce5e6a06dc8e8 (diff) | |
| download | coreclr-91f40df549c8f100a8889ed7b37d5e0935f36d3b.tar.gz coreclr-91f40df549c8f100a8889ed7b37d5e0935f36d3b.tar.bz2 coreclr-91f40df549c8f100a8889ed7b37d5e0935f36d3b.zip | |
Fix MSBuild warnigs caused by double reference to different frameworks
11 files changed, 1 insertions, 34 deletions
diff --git a/tests/src/JIT/CheckProjects/CheckProjects.csproj b/tests/src/JIT/CheckProjects/CheckProjects.csproj index 02d073a3fb..0af92356a5 100644 --- a/tests/src/JIT/CheckProjects/CheckProjects.csproj +++ b/tests/src/JIT/CheckProjects/CheckProjects.csproj @@ -31,7 +31,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> </Project> diff --git a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj index 0ae44d99ef..ce4a3d120c 100644 --- a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj +++ b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj @@ -33,8 +33,5 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> + <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj index 1c73b49779..db5ec5fd8f 100644 --- a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj +++ b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj @@ -33,7 +33,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_15237/GitHub_15237.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_15237/GitHub_15237.csproj index 1b7f8a70b5..fe27f5370a 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_15237/GitHub_15237.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_15237/GitHub_15237.csproj @@ -35,7 +35,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> </Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_16254/GitHub_16254.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_16254/GitHub_16254.csproj index 1b7f8a70b5..fe27f5370a 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_16254/GitHub_16254.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_16254/GitHub_16254.csproj @@ -35,7 +35,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> </Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_16892/GitHub_16892.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_16892/GitHub_16892.csproj index 0ee4f4aaa2..77efe1d998 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_16892/GitHub_16892.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_16892/GitHub_16892.csproj @@ -35,7 +35,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> </Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj index 7fd889b430..7036ce909b 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj @@ -32,7 +32,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj index 1b7f8a70b5..fe27f5370a 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj @@ -35,7 +35,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> </Project> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj index 6e6b28ab92..6027078312 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj @@ -31,7 +31,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj index 6ca2f93f30..3d292a7ed7 100644 --- a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj +++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj @@ -33,7 +33,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/opt/Devirtualization/override.ilproj b/tests/src/JIT/opt/Devirtualization/override.ilproj index 289470879d..65682b38c7 100644 --- a/tests/src/JIT/opt/Devirtualization/override.ilproj +++ b/tests/src/JIT/opt/Devirtualization/override.ilproj @@ -33,7 +33,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> - <PropertyGroup> - <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile> - </PropertyGroup> </Project>
\ No newline at end of file |