From 5600b2cb29268a92fe5b4f7b3d5289dfd9f57269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= <knocte@gmail.com>
Date: Tue, 22 Oct 2013 12:03:10 +0200
Subject: [PATCH 1/6] gio: update MSBuild csproj file to account for recent
 changes

---
 gio/gio.csproj | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gio/gio.csproj b/gio/gio.csproj
index 4c31a9328..0033325d7 100644
--- a/gio/gio.csproj
+++ b/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">

From 077836a227c3a91b4842f930fca2a91b9c3d179c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= <knocte@gmail.com>
Date: Tue, 22 Oct 2013 12:04:43 +0200
Subject: [PATCH 2/6] generator: fix AssemblyName in MSBuild csproj

To be the same as what is generated via Makefiles.
---
 generator/generator.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generator/generator.csproj b/generator/generator.csproj
index d5e852d46..e67c0f551 100644
--- a/generator/generator.csproj
+++ b/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' ">

From f9f654a06a9e893c6451c0fffdcee28734308d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= <knocte@gmail.com>
Date: Tue, 22 Oct 2013 12:08:56 +0200
Subject: [PATCH 3/6] 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
---
 generator/generator.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generator/generator.csproj b/generator/generator.csproj
index e67c0f551..fbab856bb 100644
--- a/generator/generator.csproj
+++ b/generator/generator.csproj
@@ -105,5 +105,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
   </ItemGroup>
 </Project>

From 6f2d80eab0ce66688f6f419d17f0cc185ef36a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= <knocte@gmail.com>
Date: Tue, 22 Oct 2013 12:33:06 +0200
Subject: [PATCH 4/6] gdk: enable Unsafe in MSBuild

---
 gdk/gdk.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdk/gdk.csproj b/gdk/gdk.csproj
index 10cbffb98..1576a459a 100644
--- a/gdk/gdk.csproj
+++ b/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>

From 5ce4e63bd9e6d053d5d45a37e140d1d24ec20449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= <knocte@gmail.com>
Date: Tue, 22 Oct 2013 12:33:24 +0200
Subject: [PATCH 5/6] gtk: reference Cairo in MSBuild csproj

---
 gtk/gtk.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gtk/gtk.csproj b/gtk/gtk.csproj
index b5279a883..0b3861d17 100644
--- a/gtk/gtk.csproj
+++ b/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>

From 3a45406665a4ec961e94b23ba2934cdaae1fc7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= <knocte@gmail.com>
Date: Tue, 22 Oct 2013 12:34:08 +0200
Subject: [PATCH 6/6] glib: include recent files committed in master to the
 MSBuild csproj

---
 glib/glib.csproj | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/glib/glib.csproj b/glib/glib.csproj
index 4a9612cd0..c5f10fc91 100644
--- a/glib/glib.csproj
+++ b/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" />