[mono/gtk-sharp] [7 commits] 5600b2cb: gio: update MSBuild csproj file to account for recent changes

"Bertrand Lorentz ([email protected])" <[email protected]>
Newsgroups gmane.comp.gnome.mono.patches
Message-ID <00000141e1cbade9-53c0eb16-eb24-4cb8-9edc-8b64911b726f-000000@email.amazonses.com> 
   Branch: refs/heads/master
     Home: https://github.com/mono/gtk-sharp
  Compare: https://github.com/mono/gtk-sharp/compare/bd9cde5e61bb...21ef50ec48c8

   Commit: 5600b2cb29268a92fe5b4f7b3d5289dfd9f57269
   Author: Andrés G. Aragoneses <[email protected]> (knocte)
     Date: 2013-10-22 10:17:38 GMT
      URL: https://github.com/mono/gtk-sharp/commit/5600b2cb29268a92fe5b4f7b3d5289dfd9f57269

gio: update MSBuild csproj file to account for recent changes

Changed paths:
  M gio/gio.csproj

Modified: gio/gio.csproj
===================================================================
@@ -221,12 +221,10 @@
     <Compile Include="generated\IOStream.cs" />
     <Compile Include="generated\IOStreamAdapter.cs" />
     <Compile Include="generated\IOStreamSpliceFlags.cs" />
-    <Compile Include="generated\Icon.cs" />
     <Compile Include="generated\IconAdapter.cs" />
     <Compile Include="generated\IncomingHandler.cs" />
     <Compile Include="generated\InetAddress.cs" />
     <Compile Include="generated\InetSocketAddress.cs" />
-    <Compile Include="generated\Initable.cs" />
     <Compile Include="generated\InitableAdapter.cs" />
     <Compile Include="generated\InputStream.cs" />
     <Compile Include="generated\InputVector.cs" />
@@ -360,6 +358,14 @@
     <Compile Include="generated\ITlsClientConnection.cs" />
     <Compile Include="generated\ITlsServerConnection.cs" />
     <Compile Include="generated\IVolume.cs" />
+    <Compile Include="generated\IConverter.cs" />
+    <Compile Include="generated\IDrive.cs" />
+    <Compile Include="generated\IFile.cs" />
+    <Compile Include="generated\IFileDescriptorBased.cs" />
+    <Compile Include="generated\IIcon.cs" />
+    <Compile Include="generated\IInitable.cs" />
+    <Compile Include="generated\ILoadableIcon.cs" />
+    <Compile Include="generated\IMount.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\glib\glib.csproj">

   Commit: 077836a227c3a91b4842f930fca2a91b9c3d179c
   Author: Andrés G. Aragoneses <[email protected]> (knocte)
     Date: 2013-10-22 10:17:44 GMT
      URL: https://github.com/mono/gtk-sharp/commit/077836a227c3a91b4842f930fca2a91b9c3d179c

generator: fix AssemblyName in MSBuild csproj

To be the same as what is generated via Makefiles.

Changed paths:
  M generator/generator.csproj

Modified: generator/generator.csproj
===================================================================
@@ -8,7 +8,7 @@
     <ProjectGuid>{80E73555-2284-40DC-9068-9A40B7359B0C}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>generator</RootNamespace>
-    <AssemblyName>generator</AssemblyName>
+    <AssemblyName>gapi_codegen</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

   Commit: f9f654a06a9e893c6451c0fffdcee28734308d6b
   Author: Andrés G. Aragoneses <[email protected]> (knocte)
     Date: 2013-10-22 10:17:50 GMT
      URL: https://github.com/mono/gtk-sharp/commit/f9f654a06a9e893c6451c0fffdcee28734308d6b

generator: add reference to System.Core in the MSBuild csproj

Extension methods (such as the one we have in XmlElementExtensions.cs)
need to link to System.Runtime.CompilerServices.ExtensionAttribute
class in order to compile. In .NET 3.5, this was part of System.Core
(not mscorlib like in .NET 4.5) [1], so we need to link to it in order
to compile via MSBuild.

[1] http://msdn.microsoft.com/en-us/library/system.runtime.compilerservices.extensionattribute%28v=vs.90%29.aspx

Changed paths:
  M generator/generator.csproj

Modified: generator/generator.csproj
===================================================================
@@ -105,5 +105,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
   </ItemGroup>
 </Project>

   Commit: 6f2d80eab0ce66688f6f419d17f0cc185ef36a00
   Author: Andrés G. Aragoneses <[email protected]> (knocte)
     Date: 2013-10-22 10:33:06 GMT
      URL: https://github.com/mono/gtk-sharp/commit/6f2d80eab0ce66688f6f419d17f0cc185ef36a00

gdk: enable Unsafe in MSBuild

Changed paths:
  M gdk/gdk.csproj

Modified: gdk/gdk.csproj
===================================================================
@@ -21,6 +21,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>none</DebugType>
@@ -30,6 +31,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

   Commit: 5ce4e63bd9e6d053d5d45a37e140d1d24ec20449
   Author: Andrés G. Aragoneses <[email protected]> (knocte)
     Date: 2013-10-22 10:33:24 GMT
      URL: https://github.com/mono/gtk-sharp/commit/5ce4e63bd9e6d053d5d45a37e140d1d24ec20449

gtk: reference Cairo in MSBuild csproj

Changed paths:
  M gtk/gtk.csproj

Modified: gtk/gtk.csproj
===================================================================
@@ -943,5 +943,9 @@
       <Project>{42FE871A-D8CF-4B29-9AFF-B02454E6C976}</Project>
       <Name>atk</Name>
     </ProjectReference>
+    <ProjectReference Include="..\cairo\cairo.csproj">
+      <Project>{364577DB-9728-4951-AC2C-EDF7A6FCC09D}</Project>
+      <Name>cairo</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>

   Commit: 3a45406665a4ec961e94b23ba2934cdaae1fc7db
   Author: Andrés G. Aragoneses <[email protected]> (knocte)
     Date: 2013-10-22 10:34:08 GMT
      URL: https://github.com/mono/gtk-sharp/commit/3a45406665a4ec961e94b23ba2934cdaae1fc7db

glib: include recent files committed in master to the MSBuild csproj

Changed paths:
  M glib/glib.csproj

Modified: glib/glib.csproj
===================================================================
@@ -94,6 +94,13 @@
     <Compile Include="DateTime.cs" />
     <Compile Include="TimeVal.cs" />
     <Compile Include="TimeZone.cs" />
+    <Compile Include="PollFD.cs" />
+    <Compile Include="SourceCallbackFuncs.cs" />
+    <Compile Include="SourceDummyMarshal.cs" />
+    <Compile Include="SourceFunc.cs" />
+    <Compile Include="SourceFuncs.cs" />
+    <Compile Include="GLibSharp.SourceDummyMarshalNative.cs" />
+    <Compile Include="GLibSharp.SourceFuncNative.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Core" />

   Commit: 21ef50ec48c80d0a4fce011d03c62e405cdefdef
   Author: Bertrand Lorentz <[email protected]> (bl8)
     Date: 2013-10-22 19:55:30 GMT
      URL: https://github.com/mono/gtk-sharp/commit/21ef50ec48c80d0a4fce011d03c62e405cdefdef

Merge pull request #83 from knocte/msbuild_tweaks

Various tweaks and updates to the .csproj files

Changed paths:
  M gdk/gdk.csproj
  M generator/generator.csproj
  M gio/gio.csproj
  M glib/glib.csproj
  M gtk/gtk.csproj

Modified: gdk/gdk.csproj
===================================================================
@@ -21,6 +21,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>none</DebugType>
@@ -30,6 +31,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

Modified: generator/generator.csproj
===================================================================
@@ -8,7 +8,7 @@
     <ProjectGuid>{80E73555-2284-40DC-9068-9A40B7359B0C}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>generator</RootNamespace>
-    <AssemblyName>generator</AssemblyName>
+    <AssemblyName>gapi_codegen</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -105,5 +105,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
   </ItemGroup>
 </Project>

Modified: gio/gio.csproj
===================================================================
@@ -221,12 +221,10 @@
     <Compile Include="generated\IOStream.cs" />
     <Compile Include="generated\IOStreamAdapter.cs" />
     <Compile Include="generated\IOStreamSpliceFlags.cs" />
-    <Compile Include="generated\Icon.cs" />
     <Compile Include="generated\IconAdapter.cs" />
     <Compile Include="generated\IncomingHandler.cs" />
     <Compile Include="generated\InetAddress.cs" />
     <Compile Include="generated\InetSocketAddress.cs" />
-    <Compile Include="generated\Initable.cs" />
     <Compile Include="generated\InitableAdapter.cs" />
     <Compile Include="generated\InputStream.cs" />
     <Compile Include="generated\InputVector.cs" />
@@ -360,6 +358,14 @@
     <Compile Include="generated\ITlsClientConnection.cs" />
     <Compile Include="generated\ITlsServerConnection.cs" />
     <Compile Include="generated\IVolume.cs" />
+    <Compile Include="generated\IConverter.cs" />
+    <Compile Include="generated\IDrive.cs" />
+    <Compile Include="generated\IFile.cs" />
+    <Compile Include="generated\IFileDescriptorBased.cs" />
+    <Compile Include="generated\IIcon.cs" />
+    <Compile Include="generated\IInitable.cs" />
+    <Compile Include="generated\ILoadableIcon.cs" />
+    <Compile Include="generated\IMount.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\glib\glib.csproj">

Modified: glib/glib.csproj
===================================================================
@@ -94,6 +94,13 @@
     <Compile Include="DateTime.cs" />
     <Compile Include="TimeVal.cs" />
     <Compile Include="TimeZone.cs" />
+    <Compile Include="PollFD.cs" />
+    <Compile Include="SourceCallbackFuncs.cs" />
+    <Compile Include="SourceDummyMarshal.cs" />
+    <Compile Include="SourceFunc.cs" />
+    <Compile Include="SourceFuncs.cs" />
+    <Compile Include="GLibSharp.SourceDummyMarshalNative.cs" />
+    <Compile Include="GLibSharp.SourceFuncNative.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Core" />

Modified: gtk/gtk.csproj
===================================================================
@@ -943,5 +943,9 @@
       <Project>{42FE871A-D8CF-4B29-9AFF-B02454E6C976}</Project>
       <Name>atk</Name>
     </ProjectReference>
+    <ProjectReference Include="..\cairo\cairo.csproj">
+      <Project>{364577DB-9728-4951-AC2C-EDF7A6FCC09D}</Project>
+      <Name>cairo</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.