| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<000001425b1342c2-86eb3611-f5a6-47e0-9e0d-521a7bcde24c-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/707392b048a1...bf5b9dce91a3
Commit: b50c82b637a66ae0d23e37141f2d79308f71d669
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-15 02:46:42 GMT
URL: https://github.com/mono/monodevelop/commit/b50c82b637a66ae0d23e37141f2d79308f71d669
[VersionControl] Embed resources for VCS
Use them as Embedded Resources instead of Content.
This way, we have no issue when we run tests and cannot find the files.
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
M main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
M main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
===================================================================
@@ -20,9 +20,9 @@
<Execution>
<Execution clr-version="Net_2_0" />
</Execution>
- <GenerateDocumentation>true</GenerateDocumentation>
<DefineConstants>DEBUG</DefineConstants>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\MonoDevelop.VersionControl.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -34,8 +34,8 @@
<Execution clr-version="Net_2_0" />
</Execution>
<DebugSymbols>true</DebugSymbols>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\MonoDevelop.VersionControl.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -158,6 +158,39 @@
<EmbeddedResource Include="version-control-16.png">
<LogicalName>version-control-16.png</LogicalName>
</EmbeddedResource>
+ <EmbeddedResource Include="menu_log.png">
+ <LogicalName>menu_log.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_diff.png">
+ <LogicalName>menu_diff.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_update.png">
+ <LogicalName>menu_update.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_status.png">
+ <LogicalName>menu_status.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_commit.png">
+ <LogicalName>menu_commit.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_remote_status.png">
+ <LogicalName>menu_remote_status.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_add.png">
+ <LogicalName>menu_add.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_remove.png">
+ <LogicalName>menu_remove.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_resolve.png">
+ <LogicalName>menu_resolve.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="comment.png">
+ <LogicalName>comment.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_revert.png">
+ <LogicalName>menu_revert.png</LogicalName>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Compile Include="gtk-gui\generated.cs" />
@@ -247,39 +280,4 @@
<None Include="Makefile.am" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Content Include="menu_log.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_diff.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_update.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_status.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_commit.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_remote_status.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_add.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_remove.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_resolve.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="comment.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_revert.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
</Project>
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
===================================================================
@@ -8,20 +8,6 @@
category = "Version Control"
flags = "Hidden"
version = "4.2">
-
- <Runtime>
- <Import file="comment.png" />
- <Import file="menu_add.png" />
- <Import file="menu_commit.png" />
- <Import file="menu_diff.png" />
- <Import file="menu_log.png" />
- <Import file="menu_remote_status.png" />
- <Import file="menu_remove.png" />
- <Import file="menu_resolve.png" />
- <Import file="menu_revert.png" />
- <Import file="menu_status.png" />
- <Import file="menu_update.png" />
- </Runtime>
<Dependencies>
<Addin id="Core" version="4.2"/>
@@ -105,17 +91,17 @@
</Extension>
<Extension path = "/MonoDevelop/Core/StockIcons">
- <StockIcon stockid = "vc-add-command" file = "menu_add.png" size="Menu" />
- <StockIcon stockid = "vc-remove-command" file = "menu_remove.png" size="Menu" />
- <StockIcon stockid = "vc-resolve-command" file = "menu_resolve.png" size="Menu" />
- <StockIcon stockid = "vc-revert-command" file = "menu_revert.png" size="Menu" />
- <StockIcon stockid = "vc-diff" file = "menu_diff.png" size="Menu" />
- <StockIcon stockid = "vc-log" file = "menu_log.png" size="Menu" />
- <StockIcon stockid = "vc-status" file = "menu_status.png" size="Menu" />
- <StockIcon stockid = "vc-update" file = "menu_update.png" size="Menu" />
- <StockIcon stockid = "vc-commit" file = "menu_commit.png" size="Menu" />
- <StockIcon stockid = "vc-remote-status" file = "menu_remote_status.png" size="Menu" />
- <StockIcon stockid = "vc-comment" file = "comment.png" size="Menu" />
+ <StockIcon stockid = "vc-add-command" resource = "menu_add.png" size="Menu" />
+ <StockIcon stockid = "vc-remove-command" resource = "menu_remove.png" size="Menu" />
+ <StockIcon stockid = "vc-resolve-command" resource = "menu_resolve.png" size="Menu" />
+ <StockIcon stockid = "vc-revert-command" resource = "menu_revert.png" size="Menu" />
+ <StockIcon stockid = "vc-diff" resource = "menu_diff.png" size="Menu" />
+ <StockIcon stockid = "vc-log" resource = "menu_log.png" size="Menu" />
+ <StockIcon stockid = "vc-status" resource = "menu_status.png" size="Menu" />
+ <StockIcon stockid = "vc-update" resource = "menu_update.png" size="Menu" />
+ <StockIcon stockid = "vc-commit" resource = "menu_commit.png" size="Menu" />
+ <StockIcon stockid = "vc-remote-status" resource = "menu_remote_status.png" size="Menu" />
+ <StockIcon stockid = "vc-comment" resource = "comment.png" size="Menu" />
<StockIcon stockid = "md-version-control" resource = "version-control-16.png" size="Menu" />
</Extension>
Modified: main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj
===================================================================
@@ -42,8 +42,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\SubversionAddinWindows.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -54,8 +54,8 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DebugSymbols>true</DebugSymbols>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\SubversionAddinWindows.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -69,15 +69,15 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Manifest.addin.xml" />
+ <EmbeddedResource Include="subversion-logo.png">
+ <LogicalName>subversion-logo.png</LogicalName>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="..\SharpSvn\SharpPlink-Win32.svnExe">
<Link>SharpPlink-Win32.svnExe</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <Content Include="subversion-logo.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="..\SharpSvn\SharpSvn-DB44-20-win32.dll">
<Link>SharpSvn-DB44-20-win32.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Commit: bf5b9dce91a386c1a20d57d843148655982b8b88
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-11-15 09:22:14 GMT
URL: https://github.com/mono/monodevelop/commit/bf5b9dce91a386c1a20d57d843148655982b8b88
Merge pull request #435 from mono/vcsResources
[VersionControl] Embed resources for VCS
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
M main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
M main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
===================================================================
@@ -20,9 +20,9 @@
<Execution>
<Execution clr-version="Net_2_0" />
</Execution>
- <GenerateDocumentation>true</GenerateDocumentation>
<DefineConstants>DEBUG</DefineConstants>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\MonoDevelop.VersionControl.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -34,8 +34,8 @@
<Execution clr-version="Net_2_0" />
</Execution>
<DebugSymbols>true</DebugSymbols>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\MonoDevelop.VersionControl.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -158,6 +158,39 @@
<EmbeddedResource Include="version-control-16.png">
<LogicalName>version-control-16.png</LogicalName>
</EmbeddedResource>
+ <EmbeddedResource Include="menu_log.png">
+ <LogicalName>menu_log.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_diff.png">
+ <LogicalName>menu_diff.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_update.png">
+ <LogicalName>menu_update.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_status.png">
+ <LogicalName>menu_status.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_commit.png">
+ <LogicalName>menu_commit.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_remote_status.png">
+ <LogicalName>menu_remote_status.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_add.png">
+ <LogicalName>menu_add.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_remove.png">
+ <LogicalName>menu_remove.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_resolve.png">
+ <LogicalName>menu_resolve.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="comment.png">
+ <LogicalName>comment.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="menu_revert.png">
+ <LogicalName>menu_revert.png</LogicalName>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Compile Include="gtk-gui\generated.cs" />
@@ -247,39 +280,4 @@
<None Include="Makefile.am" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Content Include="menu_log.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_diff.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_update.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_status.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_commit.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_remote_status.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_add.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_remove.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_resolve.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="comment.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="menu_revert.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
</Project>
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
===================================================================
@@ -8,20 +8,6 @@
category = "Version Control"
flags = "Hidden"
version = "4.2">
-
- <Runtime>
- <Import file="comment.png" />
- <Import file="menu_add.png" />
- <Import file="menu_commit.png" />
- <Import file="menu_diff.png" />
- <Import file="menu_log.png" />
- <Import file="menu_remote_status.png" />
- <Import file="menu_remove.png" />
- <Import file="menu_resolve.png" />
- <Import file="menu_revert.png" />
- <Import file="menu_status.png" />
- <Import file="menu_update.png" />
- </Runtime>
<Dependencies>
<Addin id="Core" version="4.2"/>
@@ -105,17 +91,17 @@
</Extension>
<Extension path = "/MonoDevelop/Core/StockIcons">
- <StockIcon stockid = "vc-add-command" file = "menu_add.png" size="Menu" />
- <StockIcon stockid = "vc-remove-command" file = "menu_remove.png" size="Menu" />
- <StockIcon stockid = "vc-resolve-command" file = "menu_resolve.png" size="Menu" />
- <StockIcon stockid = "vc-revert-command" file = "menu_revert.png" size="Menu" />
- <StockIcon stockid = "vc-diff" file = "menu_diff.png" size="Menu" />
- <StockIcon stockid = "vc-log" file = "menu_log.png" size="Menu" />
- <StockIcon stockid = "vc-status" file = "menu_status.png" size="Menu" />
- <StockIcon stockid = "vc-update" file = "menu_update.png" size="Menu" />
- <StockIcon stockid = "vc-commit" file = "menu_commit.png" size="Menu" />
- <StockIcon stockid = "vc-remote-status" file = "menu_remote_status.png" size="Menu" />
- <StockIcon stockid = "vc-comment" file = "comment.png" size="Menu" />
+ <StockIcon stockid = "vc-add-command" resource = "menu_add.png" size="Menu" />
+ <StockIcon stockid = "vc-remove-command" resource = "menu_remove.png" size="Menu" />
+ <StockIcon stockid = "vc-resolve-command" resource = "menu_resolve.png" size="Menu" />
+ <StockIcon stockid = "vc-revert-command" resource = "menu_revert.png" size="Menu" />
+ <StockIcon stockid = "vc-diff" resource = "menu_diff.png" size="Menu" />
+ <StockIcon stockid = "vc-log" resource = "menu_log.png" size="Menu" />
+ <StockIcon stockid = "vc-status" resource = "menu_status.png" size="Menu" />
+ <StockIcon stockid = "vc-update" resource = "menu_update.png" size="Menu" />
+ <StockIcon stockid = "vc-commit" resource = "menu_commit.png" size="Menu" />
+ <StockIcon stockid = "vc-remote-status" resource = "menu_remote_status.png" size="Menu" />
+ <StockIcon stockid = "vc-comment" resource = "comment.png" size="Menu" />
<StockIcon stockid = "md-version-control" resource = "version-control-16.png" size="Menu" />
</Extension>
Modified: main/src/addins/VersionControl/Subversion.Win32/VersionControl.Subversion.Win32.csproj
===================================================================
@@ -42,8 +42,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\SubversionAddinWindows.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -54,8 +54,8 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DebugSymbols>true</DebugSymbols>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\SubversionAddinWindows.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -69,15 +69,15 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Manifest.addin.xml" />
+ <EmbeddedResource Include="subversion-logo.png">
+ <LogicalName>subversion-logo.png</LogicalName>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="..\SharpSvn\SharpPlink-Win32.svnExe">
<Link>SharpPlink-Win32.svnExe</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <Content Include="subversion-logo.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="..\SharpSvn\SharpSvn-DB44-20-win32.dll">
<Link>SharpSvn-DB44-20-win32.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches