diff options
author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2014-03-19 16:52:13 +0400 |
---|---|---|
committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2014-03-19 16:52:13 +0400 |
commit | 9a965f53392ca43744548e130abeae8c6e2df4b7 (patch) | |
tree | 86539b689b5dfb939bb6dbd569809941efc943ae | |
parent | bf5c11cb9cbd13f2a52bb18fc4e3e3ddd7494b8a (diff) |
[WindowsPlatform] Move to a Solution Folder.
-rw-r--r-- | main/Main.sln | 10 | ||||
-rw-r--r-- | main/configure.in | 1 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/Makefile.am | 6 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/.gitignore (renamed from main/src/addins/WindowsPlatform/.gitignore) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/AddinInfo.cs (renamed from main/src/addins/WindowsPlatform/AddinInfo.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/AssemblyInfo.cs (renamed from main/src/addins/WindowsPlatform/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/ChangeLog (renamed from main/src/addins/WindowsPlatform/ChangeLog) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/AddFileDialogHandler.cs (renamed from main/src/addins/WindowsPlatform/Dialogs/AddFileDialogHandler.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs (renamed from main/src/addins/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs) | 4 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/SelectFileDialogHandler.cs (renamed from main/src/addins/WindowsPlatform/Dialogs/SelectFileDialogHandler.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/Enums.cs (renamed from main/src/addins/WindowsPlatform/Enums.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/GdkWin32.cs (renamed from main/src/addins/WindowsPlatform/GdkWin32.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs (renamed from main/src/addins/WindowsPlatform/JumpList.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/Makefile.am | 5 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/Microsoft.WindowsAPICodePack.Shell.dll (renamed from main/src/addins/WindowsPlatform/Microsoft.WindowsAPICodePack.Shell.dll) | bin | 542720 -> 542720 bytes | |||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/Microsoft.WindowsAPICodePack.dll (renamed from main/src/addins/WindowsPlatform/Microsoft.WindowsAPICodePack.dll) | bin | 105984 -> 105984 bytes | |||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/RecentFiles.cs (renamed from main/src/addins/WindowsPlatform/RecentFiles.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/Win32.cs (renamed from main/src/addins/WindowsPlatform/Win32.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.addin.xml (renamed from main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs (renamed from main/src/addins/WindowsPlatform/WindowsPlatform.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj (renamed from main/src/addins/WindowsPlatform/WindowsPlatform.csproj) | 8 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/WindowsProxyCredentialProvider.cs (renamed from main/src/addins/WindowsPlatform/WindowsProxyCredentialProvider.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs (renamed from main/src/addins/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs) | 0 | ||||
-rw-r--r-- | main/src/addins/WindowsPlatform/WindowsPlatform/structs.cs (renamed from main/src/addins/WindowsPlatform/structs.cs) | 0 |
24 files changed, 21 insertions, 13 deletions
diff --git a/main/Main.sln b/main/Main.sln index 718db8425a..2ca9b12ef4 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -115,8 +115,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.NUnit", "src\ad EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitRunner", "src\addins\NUnit\NUnitRunner\NUnitRunner.csproj", "{0AF16AF1-0876-413E-9803-08BD33C19E00}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPlatform", "src\addins\WindowsPlatform\WindowsPlatform.csproj", "{459868D2-54DC-415B-B1AB-BE39BDBD352F}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacPlatform", "src\addins\MacPlatform\MacPlatform.csproj", "{50D6768C-C072-4E79-AFC5-C1C40767EF45}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Refactoring", "src\addins\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj", "{100568FC-F4E8-439B-94AD-41D11724E45B}"
@@ -173,6 +171,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.PackageManageme EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.PackageManagement", "src\addins\MonoDevelop.PackageManagement\MonoDevelop.PackageManagement.csproj", "{F218643D-2E74-4309-820E-206A54B7133F}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsPlatform", "WindowsPlatform", "{EA393253-E9C8-422A-8CFD-4FDB529B3F8D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPlatform", "src\addins\WindowsPlatform\WindowsPlatform\WindowsPlatform.csproj", "{459868D2-54DC-415B-B1AB-BE39BDBD352F}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "external\debugger-libs\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj", "{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}"
@@ -586,6 +588,7 @@ Global {459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{459868D2-54DC-415B-B1AB-BE39BDBD352F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {459868D2-54DC-415B-B1AB-BE39BDBD352F}.Release|Any CPU.Build.0 = Release|Any CPU
{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Release|x86.ActiveCfg = Release|Any CPU
{459868D2-54DC-415B-B1AB-BE39BDBD352F}.Release|x86.Build.0 = Release|Any CPU
{495E53B3-F3AF-4C4F-BAAF-865EFAA2F4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1456,7 +1459,6 @@ Global {CC556C33-DB2D-4141-AFBF-A641EF9A1FA9} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{2A39DAE0-09B8-481E-950D-DF9DE0E87208} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{DE462010-393D-4655-A42C-2C78BB14D2FA} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
- {459868D2-54DC-415B-B1AB-BE39BDBD352F} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{50D6768C-C072-4E79-AFC5-C1C40767EF45} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{100568FC-F4E8-439B-94AD-41D11724E45B} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{0ADCD824-2506-4A61-9B88-ABF1D5267CE8} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
@@ -1466,6 +1468,7 @@ Global {776872D9-76FA-407B-BA69-08E25A24E5CE} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{8F47F5EC-2F57-4030-B658-7B1002DA90C2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{98F4461F-84D0-4C57-A11F-47E871BD04A0} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
+ {EA393253-E9C8-422A-8CFD-4FDB529B3F8D} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{19DE0F35-D204-4FD8-A553-A19ECE05E24D} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
{0413DB7D-8B35-423F-9752-D75C9225E7DE} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
@@ -1509,6 +1512,7 @@ Global {7E4B15FB-E8C4-419A-A31C-9310FD9062BD} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2}
{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B} = {98F4461F-84D0-4C57-A11F-47E871BD04A0}
{F218643D-2E74-4309-820E-206A54B7133F} = {98F4461F-84D0-4C57-A11F-47E871BD04A0}
+ {459868D2-54DC-415B-B1AB-BE39BDBD352F} = {EA393253-E9C8-422A-8CFD-4FDB529B3F8D}
{372E8E3E-29D5-4B4D-88A2-4711CD628C4E} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{984CC812-9470-4A13-AFF9-CC44068D666C} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
diff --git a/main/configure.in b/main/configure.in index 4d4d722bfb..d6e1606e35 100644 --- a/main/configure.in +++ b/main/configure.in @@ -325,6 +325,7 @@ src/addins/CBinding/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile src/addins/WindowsPlatform/Makefile +src/addins/WindowsPlatform/WindowsPlatform/Makefile src/addins/MonoDevelop.AssemblyBrowser/Makefile src/addins/MonoDevelop.SourceEditor2/Makefile src/addins/MonoDevelop.XmlEditor/Makefile diff --git a/main/src/addins/WindowsPlatform/Makefile.am b/main/src/addins/WindowsPlatform/Makefile.am index 24e07e9bf5..5ff492aeff 100644 --- a/main/src/addins/WindowsPlatform/Makefile.am +++ b/main/src/addins/WindowsPlatform/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/xbuild.include -if ! ENABLE_WINDOWSPLATFORM -SKIP=y -endif +SUBDIRS = \ + WindowsPlatform diff --git a/main/src/addins/WindowsPlatform/.gitignore b/main/src/addins/WindowsPlatform/WindowsPlatform/.gitignore index 454fe51708..454fe51708 100644 --- a/main/src/addins/WindowsPlatform/.gitignore +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/.gitignore diff --git a/main/src/addins/WindowsPlatform/AddinInfo.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/AddinInfo.cs index 5e380e8435..5e380e8435 100644 --- a/main/src/addins/WindowsPlatform/AddinInfo.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/AddinInfo.cs diff --git a/main/src/addins/WindowsPlatform/AssemblyInfo.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/AssemblyInfo.cs index ac26319c43..ac26319c43 100644 --- a/main/src/addins/WindowsPlatform/AssemblyInfo.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/AssemblyInfo.cs diff --git a/main/src/addins/WindowsPlatform/ChangeLog b/main/src/addins/WindowsPlatform/WindowsPlatform/ChangeLog index 909021cd2c..909021cd2c 100644 --- a/main/src/addins/WindowsPlatform/ChangeLog +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/ChangeLog diff --git a/main/src/addins/WindowsPlatform/Dialogs/AddFileDialogHandler.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/AddFileDialogHandler.cs index 65fa333bb1..65fa333bb1 100644 --- a/main/src/addins/WindowsPlatform/Dialogs/AddFileDialogHandler.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/AddFileDialogHandler.cs diff --git a/main/src/addins/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs index ef95745517..64310117cc 100644 --- a/main/src/addins/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs @@ -148,9 +148,9 @@ namespace MonoDevelop.Platform {
var combo = new CommonFileDialogComboBox ();
- var encodings = SeletedEncodings.ConversionEncodings;
+ var encodings = SelectedEncodings.ConversionEncodings;
if (encodings == null || encodings.Length == 0)
- encodings = SeletedEncodings.DefaultEncodings;
+ encodings = SelectedEncodings.DefaultEncodings;
if (showAutoDetected) {
combo.Items.Add (new EncodingComboItem (null, GettextCatalog.GetString ("Auto Detected")));
diff --git a/main/src/addins/WindowsPlatform/Dialogs/SelectFileDialogHandler.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/SelectFileDialogHandler.cs index 4f6bfd3249..4f6bfd3249 100644 --- a/main/src/addins/WindowsPlatform/Dialogs/SelectFileDialogHandler.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/SelectFileDialogHandler.cs diff --git a/main/src/addins/WindowsPlatform/Enums.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Enums.cs index 489c9def44..489c9def44 100644 --- a/main/src/addins/WindowsPlatform/Enums.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Enums.cs diff --git a/main/src/addins/WindowsPlatform/GdkWin32.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/GdkWin32.cs index 0f2719a014..0f2719a014 100644 --- a/main/src/addins/WindowsPlatform/GdkWin32.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/GdkWin32.cs diff --git a/main/src/addins/WindowsPlatform/JumpList.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs index 3a3a442a92..3a3a442a92 100644 --- a/main/src/addins/WindowsPlatform/JumpList.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Makefile.am b/main/src/addins/WindowsPlatform/WindowsPlatform/Makefile.am new file mode 100644 index 0000000000..24e07e9bf5 --- /dev/null +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Makefile.am @@ -0,0 +1,5 @@ +include $(top_srcdir)/xbuild.include + +if ! ENABLE_WINDOWSPLATFORM +SKIP=y +endif diff --git a/main/src/addins/WindowsPlatform/Microsoft.WindowsAPICodePack.Shell.dll b/main/src/addins/WindowsPlatform/WindowsPlatform/Microsoft.WindowsAPICodePack.Shell.dll Binary files differindex 4542663e1e..4542663e1e 100644 --- a/main/src/addins/WindowsPlatform/Microsoft.WindowsAPICodePack.Shell.dll +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Microsoft.WindowsAPICodePack.Shell.dll diff --git a/main/src/addins/WindowsPlatform/Microsoft.WindowsAPICodePack.dll b/main/src/addins/WindowsPlatform/WindowsPlatform/Microsoft.WindowsAPICodePack.dll Binary files differindex ac86949212..ac86949212 100644 --- a/main/src/addins/WindowsPlatform/Microsoft.WindowsAPICodePack.dll +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Microsoft.WindowsAPICodePack.dll diff --git a/main/src/addins/WindowsPlatform/RecentFiles.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/RecentFiles.cs index 907295feca..907295feca 100644 --- a/main/src/addins/WindowsPlatform/RecentFiles.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/RecentFiles.cs diff --git a/main/src/addins/WindowsPlatform/Win32.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Win32.cs index a60ea0ad4e..a60ea0ad4e 100644 --- a/main/src/addins/WindowsPlatform/Win32.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Win32.cs diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.addin.xml index eb5e33cc5f..eb5e33cc5f 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.addin.xml diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs index 0e6a9ece4d..0e6a9ece4d 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform.csproj b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj index 4b48932534..502b0ce5cb 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform.csproj +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj @@ -55,22 +55,22 @@ <Reference Include="WindowsBase" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> + <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project> <Name>MonoDevelop.Core</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> + <ProjectReference Include="..\..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> <Name>MonoDevelop.Ide</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj"> + <ProjectReference Include="..\..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj"> <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project> <Name>Mono.Addins</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\..\external\xwt\Xwt\Xwt.csproj"> + <ProjectReference Include="..\..\..\..\external\xwt\Xwt\Xwt.csproj"> <Project>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</Project> <Name>Xwt</Name> <Private>False</Private> diff --git a/main/src/addins/WindowsPlatform/WindowsProxyCredentialProvider.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsProxyCredentialProvider.cs index 825772b82e..825772b82e 100644 --- a/main/src/addins/WindowsPlatform/WindowsProxyCredentialProvider.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsProxyCredentialProvider.cs diff --git a/main/src/addins/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs index 34dafdab03..34dafdab03 100644 --- a/main/src/addins/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs diff --git a/main/src/addins/WindowsPlatform/structs.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/structs.cs index b39f00b566..b39f00b566 100644 --- a/main/src/addins/WindowsPlatform/structs.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/structs.cs |