diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2016-11-01 20:28:38 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2016-11-01 20:28:38 +0300 |
| commit | 9c889d2bdb5e49e36e1b5d8ba8aafd87ebab6d09 (patch) | |
| tree | f3e4cf0d20ac15d3503764f92fa8253743e342e6 /main/tests/UnitTests/UnitTests.csproj | |
| parent | 00b9f9c3cef8f56bf70bd277c141c37e7b262046 (diff) | |
| parent | af32272e8ed0a3529d2069d8089bf689c5f90b27 (diff) | |
Merge branch 'master' into dotnetcore
Conflicts:
main/external/nuget-binary
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopBuildIntegratedRestorer.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionItemExtension.cs
Diffstat (limited to 'main/tests/UnitTests/UnitTests.csproj')
| -rw-r--r-- | main/tests/UnitTests/UnitTests.csproj | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/tests/UnitTests/UnitTests.csproj b/main/tests/UnitTests/UnitTests.csproj index b1f256a953..73a3bf52fb 100644 --- a/main/tests/UnitTests/UnitTests.csproj +++ b/main/tests/UnitTests/UnitTests.csproj @@ -60,27 +60,27 @@ </Reference> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath> + <HintPath>..\..\build\bin\System.Reflection.Metadata.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath> + <HintPath>..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.Workspaces"> - <HintPath>..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> + <HintPath>..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath> + <HintPath>..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"> - <HintPath>..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> + <HintPath>..\..\build\bin\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Microsoft.CodeAnalysis.CSharp"> - <HintPath>..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath> + <HintPath>..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> |