diff options
| -rw-r--r-- | main/Main.sln | 2 | ||||
| -rw-r--r-- | main/Makefile.am | 4 | ||||
| m--------- | main/external/RefactoringEssentials | 0 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj | 2 | ||||
| -rw-r--r-- | main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj | 2 | ||||
| -rw-r--r-- | main/winbuild.bat | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/main/Main.sln b/main/Main.sln index b940d84c64..bbdb452ae9 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -259,7 +259,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Ide.Tests", "te EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPlatform.Tests", "tests\WindowsPlatform.Tests\WindowsPlatform.Tests.csproj", "{865100E2-A29C-4FCD-B803-1A0B9A0A6EF7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RefactoringEssentials", "external\RefactoringEssentials\RefactoringEssentials.2017\RefactoringEssentials.csproj", "{C465A5DC-AD28-49A2-89C0-F81838814A7E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RefactoringEssentials", "external\RefactoringEssentials\RefactoringEssentials\RefactoringEssentials.csproj", "{C465A5DC-AD28-49A2-89C0-F81838814A7E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.CSharpBinding.Tests", "tests\MonoDevelop.CSharpBinding.Tests\MonoDevelop.CSharpBinding.Tests.csproj", "{84E22F5F-0562-4B51-8B9A-FD79FF33A8B5}"
EndProject
diff --git a/main/Makefile.am b/main/Makefile.am index 26f87bad8a..82634e8d54 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -28,7 +28,7 @@ NUGET_RESTORE = mono external/nuget-binary/nuget.exe restore -DisableParallelPro # see: https://github.com/kzu/NuGet.Restore restore-packages: @$(NUGET_RESTORE) - msbuild /t:Restore /p:RestoreDisableParallel=true external/RefactoringEssentials/RefactoringEssentials.2017/RefactoringEssentials.csproj + msbuild /t:Restore /p:RestoreDisableParallel=true external/RefactoringEssentials/RefactoringEssentials/RefactoringEssentials.csproj vcrevision: touch vcrevision @@ -206,7 +206,7 @@ EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) $(appdata_DATA) $(pixmap_DATA) \ md.targets DISTCLEANFILES = monodevelop intltool-extract intltool-merge intltool-update \ - $(pkgconfig_DATA) + $(pkgconfig_DATA) include $(top_srcdir)/Makefile.include diff --git a/main/external/RefactoringEssentials b/main/external/RefactoringEssentials -Subproject a24c05260ce2cf3bed141b2da4888ee174ef632 +Subproject 49049f1c2294fbf71c7f942e9b602315041a081 diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index d77a9fc1f8..3e6566edae 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -329,7 +329,7 @@ <Name>MonoDevelop.SourceEditor</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\..\external\RefactoringEssentials\RefactoringEssentials.2017\RefactoringEssentials.csproj"> + <ProjectReference Include="..\..\..\external\RefactoringEssentials\RefactoringEssentials\RefactoringEssentials.csproj"> <Project>{C465A5DC-AD28-49A2-89C0-F81838814A7E}</Project> <Name>RefactoringEssentials</Name> <Private>True</Private> diff --git a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj index 85aa82043f..8cffbb10b4 100644 --- a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj +++ b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj @@ -147,7 +147,7 @@ <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project> <Name>MonoDevelop.Core</Name> </ProjectReference> - <ProjectReference Include="..\..\external\RefactoringEssentials\RefactoringEssentials.2017\RefactoringEssentials.csproj"> + <ProjectReference Include="..\..\external\RefactoringEssentials\RefactoringEssentials\RefactoringEssentials.csproj"> <Project>{C465A5DC-AD28-49A2-89C0-F81838814A7E}</Project> <Name>RefactoringEssentials</Name> </ProjectReference> diff --git a/main/winbuild.bat b/main/winbuild.bat index 5b7ea9e1b8..47826cda5d 100644 --- a/main/winbuild.bat +++ b/main/winbuild.bat @@ -35,7 +35,7 @@ set "CONFIG=DebugWin32" set "PLATFORM=Any CPU"
rem only perform integrated restore on RefactoringEssentials, it fails on the whole solution
-"%MSBUILD_EXE%" external\RefactoringEssentials\RefactoringEssentials.2017.sln /target:Restore %* || goto :error
+"%MSBUILD_EXE%" external\RefactoringEssentials\RefactoringEssentials.sln /target:Restore %* || goto :error "%MSBUILD_EXE%" Main.sln /bl:MonoDevelop.binlog /m "/p:Configuration=%CONFIG%" "/p:Platform=%PLATFORM%" %* || goto :error
goto :eof
|