From bc08418eb5ee1a671369ddeb77173f2de6cac77e Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@osg.samsung.com>
Date: Wed, 20 Sep 2017 12:15:34 -0300
Subject: [PATCH] Build the assembly data file as required

---
 Source/atk/meson.build   | 2 +-
 Source/cairo/meson.build | 2 +-
 Source/gdk/meson.build   | 2 +-
 Source/gio/meson.build   | 2 +-
 Source/glib/meson.build  | 2 +-
 Source/gtk/meson.build   | 2 +-
 Source/meson.build       | 4 ++--
 Source/pango/meson.build | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/atk/meson.build b/Source/atk/meson.build
index 5debaedf5..f8e44bd74 100644
--- a/Source/atk/meson.build
+++ b/Source/atk/meson.build
@@ -22,7 +22,7 @@ sources = [
     'Util.cs',
 ]
 
-atk_sharp = library(assembly_name, source_gen, sources,
+atk_sharp = library(assembly_name, source_gen, sources, assemblyinfo,
         cs_args: ['-unsafe', '-keyfile:' + snk],
         link_with: glib_sharp,
         install: install,
diff --git a/Source/cairo/meson.build b/Source/cairo/meson.build
index 656528e44..5c2c855b3 100644
--- a/Source/cairo/meson.build
+++ b/Source/cairo/meson.build
@@ -61,7 +61,7 @@ sources = [
     'XlibSurface.cs',
 ]
 
-cairo_sharp = library(assembly_name, sources,
+cairo_sharp = library(assembly_name, sources, assemblyinfo,
         cs_args: ['-keyfile:' + snk],
         install: install,
         install_dir: lib_install_dir
diff --git a/Source/gdk/meson.build b/Source/gdk/meson.build
index 5c5f0f78d..c78f423df 100644
--- a/Source/gdk/meson.build
+++ b/Source/gdk/meson.build
@@ -64,7 +64,7 @@ sources = [
 ]
 
 deps = [glib_sharp, pango_sharp, cairo_sharp, gio_sharp]
-gdk_sharp = library(assembly_name, source_gen, sources,
+gdk_sharp = library(assembly_name, source_gen, sources, assemblyinfo,
         cs_args: ['-unsafe', '-keyfile:' + snk],
         link_with: deps,
         install: install,
diff --git a/Source/gio/meson.build b/Source/gio/meson.build
index ade3ae3b4..1b858c80d 100644
--- a/Source/gio/meson.build
+++ b/Source/gio/meson.build
@@ -29,7 +29,7 @@ sources = [
     'IFile.cs'
 ]
 
-gio_sharp = library(assembly_name, source_gen, sources,
+gio_sharp = library(assembly_name, source_gen, sources, assemblyinfo,
         cs_args: ['-unsafe', '-keyfile:' + snk],
         link_with: glib_sharp,
         install: install,
diff --git a/Source/glib/meson.build b/Source/glib/meson.build
index 6c4e4f772..d436f67fd 100644
--- a/Source/glib/meson.build
+++ b/Source/glib/meson.build
@@ -92,7 +92,7 @@ sources = [
     'VariantType.cs' ]
 
 
-glib_sharp = library(assembly_name, sources,
+glib_sharp = library(assembly_name, sources, assemblyinfo,
         cs_args: ['-unsafe', '-keyfile:' + snk],
         install: install,
         install_dir: lib_install_dir
diff --git a/Source/gtk/meson.build b/Source/gtk/meson.build
index f0c114305..ec9eafede 100644
--- a/Source/gtk/meson.build
+++ b/Source/gtk/meson.build
@@ -134,7 +134,7 @@ sources = [
 ]
 
 deps = [glib_sharp, pango_sharp, cairo_sharp, gio_sharp, atk_sharp, gdk_sharp]
-gtk_sharp = library(assembly_name, source_gen, sources, 
+gtk_sharp = library(assembly_name, source_gen, sources, assemblyinfo,
         cs_args: ['-unsafe', '-keyfile:' + snk, '-nowarn:0618,0612,0169'],
         link_with: deps,
         install: install,
diff --git a/Source/meson.build b/Source/meson.build
index 140c8f680..d69b2804e 100644
--- a/Source/meson.build
+++ b/Source/meson.build
@@ -46,8 +46,8 @@ gio_dep = dependency('gio-2.0', version: glib_required_version,
 
 prefix = get_option('prefix')
 assembly_data = configuration_data()
-assembly_data.set_quoted('API_VERSION', apiversion)
-configure_file(input: 'AssemblyInfo.cs.in', output: 'AssemblyInfo.cs', configuration : assembly_data)
+assembly_data.set('API_VERSION', apiversion)
+assemblyinfo = configure_file(input: 'AssemblyInfo.cs.in', output: 'AssemblyInfo.cs', configuration : assembly_data)
 
 policy_config = files('policy.config.in')
 if host_machine.system() == 'osx'
diff --git a/Source/pango/meson.build b/Source/pango/meson.build
index bebaea4cd..36d0d9649 100644
--- a/Source/pango/meson.build
+++ b/Source/pango/meson.build
@@ -58,7 +58,7 @@ sources = [
 ]
 
 deps = [glib_sharp, cairo_sharp]
-pango_sharp = library(assembly_name, source_gen, sources,
+pango_sharp = library(assembly_name, source_gen, sources, assemblyinfo,
         cs_args: ['-unsafe', '-keyfile:' + snk],
         link_with: deps,
         install: install,