Index: DamOverall/trunk/doc/DAM - Architecture Overall/DAM - Architecture Overall.tex
===================================================================
diff -u -r6712 -r6737
--- DamOverall/trunk/doc/DAM - Architecture Overall/DAM - Architecture Overall.tex	(.../DAM - Architecture Overall.tex)	(revision 6712)
+++ DamOverall/trunk/doc/DAM - Architecture Overall/DAM - Architecture Overall.tex	(.../DAM - Architecture Overall.tex)	(revision 6737)
@@ -439,7 +439,7 @@
 The steps that are needed to release this module can be found in \cite{StixFileWriter_ReleaseProcedure}
 
 \section{Dam Engine} 
-This module has the following dependencies (see \autoref{app:DamEngine}):
+This module has the following dependencies, which could need updating (see also \autoref{app:DamEngine}):
 \begin{itemize}
 	\item WTIPiping (dependency via nuget package)	
 	\item StixFileWriter (dependency via nuget package)
@@ -472,29 +472,30 @@
 \end{enumerate}
 
 \section{Dam UI}
-This application depends on the following components (see \autoref{app:DamUI}):
+This application depends on the following Deltares components, which could need updating (see also \autoref{app:DamUI}):
 \begin{itemize}
 	\item Deltares.DamEngine.Data (DamEngine)
-	\item Deltares.DamEngine.Io (DamEngine)
 	\item Deltares.DamEngine.Interface (DamEngine)
+	\item Deltares.DamEngine.Io (DamEngine)
 	\item Deltares.Geotechnics (DSL)
 	\item Deltares.Geotechnics.Forms (DSL)
-	\item Deltares.Geotechnics.Io (DSL)
 	\item Deltares.Standard (DSL)
 	\item Deltares.Standard.Maps (DSL)
 	\item Deltares.Standard.Forms.Maps (DSL)
 \end{itemize}
-\Note{Some other libraries will be implicitly referenced:
+\Note{Some other Deltares libraries will be implicitly referenced:
 \begin{itemize}
 	\item Deltares.DamEngine.Calculators (DamEngine)
-	\item Deltares.StixFileWriter
-	\item Deltares.WTIPiping
+	\item Deltares.Geo.Common.Standard
+	\item Deltares.Geographic (DSL)
 	\item Deltares.Geometry (DSL)
 	\item Deltares.Geometry.Forms (DSL)
 	\item Deltares.Mathematics.DSL (DSL)
 	\item Deltares.Probabilistic (DSL)
 	\item Deltares.Standard.Forms (DSL)
 	\item Deltares.Standard.Forms.DExpress (DSL)
+	\item Deltares.StixFileWriter
+	\item Deltares.WTIPiping
 \end{itemize}}
 
 \subsection{Step 1: Create branch}
@@ -563,7 +564,27 @@
 \end{enumerate}
 
 \section{DamLive}
-This application is dependent on the \ProgramName Engine (see \autoref{app:DamLive}).
+This application depends on the following Deltares components, which could need updating (see also \autoref{app:DamLive}):
+\begin{itemize}
+	\item Deltares.DamEngine.Data (DamEngine)
+	\item Deltares.DamEngine.Interface (DamEngine)
+	\item Deltares.DamEngine.Io (DamEngine)
+	\item Deltares.Geotechnics (DSL)
+	\item Deltares.Standard (DSL)
+	\item Deltares.Standard.Maps (DSL)
+\end{itemize}
+\Note{Some other Deltares libraries will be implicitly referenced:
+	\begin{itemize}
+		\item Deltares.DamEngine.Calculators (DamEngine)
+		\item Deltares.Geo.Common.Standard
+		\item Deltares.Geographic (DSL)
+		\item Deltares.Geometry (DSL)
+		\item Deltares.Geometry.Forms (DSL)
+		\item Deltares.Mathematics.DSL (DSL)
+		\item Deltares.Probabilistic (DSL)
+		\item Deltares.StixFileWriter
+		\item Deltares.WTIPiping
+\end{itemize}}
 
 The following steps are needed to release this application.
 \begin{enumerate}
@@ -633,14 +654,15 @@
 	Deltares.Statistics & & lib\textbackslash MacroStabilityReliability \\ \hline 
 	MathNet.Numerics & & lib\textbackslash MacroStabilityReliability \\ \hline 
 \end{tabularx}
-\Note{The CSharpWrapper (deterministic) is merged into one dll: Deltares.MacroStability.CSharpWrapper.dll}
+\Note{The CSharpWrapper dll and all the dll's that depend on it are merged into one dll with the tool ILMerge. The dll is called Deltares.MacroStability.CSharpWrapper.dll. This merge is done in the Teamcity pipeline.This was done to avoid dll version conflicts. The resulting dll only supports deterministic calculation.}
 
 \section{Deltares.StixFileWriter}
 git: Macrostability-StixFileWriter
 \renewcommand{\arraystretch}{1.2}
 \begin{tabularx}{\textwidth}{|X|p{1.5cm}|p{4.1cm}|} \hline
 	\textbf{dll} & \textbf{version} & \textbf{location} \\ \hline
 	Deltares.MacroStability.CSharpWrapper & & lib\textbackslash MacrostabilityCSharp \newline WrapperDeterministic \\ \hline 
+	Components.Persistence.Stability.Version1 & & nuget \\ \hline 
 	Components.Persistence.Stability.Version2 & & nuget \\ \hline 
 	DGeoSuite.Common & & nuget (implicit) \\ \hline 
 	DGeoSuite.Common.Persistence & & nuget (implicit) \\ \hline 
@@ -661,7 +683,7 @@
 \begin{tabularx}{\textwidth}{|X|p{1.5cm}|p{4.1cm}|} \hline
 	\textbf{dll} & \textbf{version} & \textbf{location} \\ \hline
 	Deltares.WTIPiping & & nuget \\ \hline 
-	Deltares.Geo.Common & & nuget (impicit via WTIPiping) \\ \hline 
+	Deltares.Geo.Common.Standard & & nuget (impicit via WTIPiping) \\ \hline 
 	Deltares.StixFileWriter & & nuget \\ \hline 
 	Components.Persistence.Stability.Version2 & & nuget (implicit via StixFileWriter) \\ \hline 
 	DGeoSuite.Common & & nuget (implicit via StixFileWriter)\\ \hline 
@@ -675,16 +697,30 @@
 \renewcommand{\arraystretch}{1.2}
 \begin{tabularx}{\textwidth}{|X|p{1.5cm}|p{4.1cm}|} \hline
 	\textbf{dll} & \textbf{version} & \textbf{location} \\ \hline
-	Deltares.Engine & & nuget \\ \hline 
+	Deltares.DamEngine.Data & & nuget \\ \hline 
+	Deltares.DamEngine.Interface & & nuget \\ \hline 
+	Deltares.DamEngine.Io & & nuget \\ \hline 
+	Deltares.DamEngine.Calculators & & nuget (implicit) \\ \hline 
 	Deltares.WTIPiping & & nuget (implicit) \\ \hline 
-	Deltares.Geo.Common & & nuget (implicit) \\ \hline 
+	Deltares.Geo.Common.Standard & & nuget (implicit) \\ \hline 
 	Deltares.StixFileWriter & & nuget (implicit) \\ \hline 
 	Deltares.MacroStability.CSharpWrapper & & nuget (implicit) \\ \hline 
+	Components.Persistence.Stability.Version1 & & nuget (implicit)\\ \hline 
 	Components.Persistence.Stability.Version2 & & nuget (implicit)\\ \hline 
 	DGeoSuite.Common & & nuget (implicit)\\ \hline 
-    DGeoSuite.Common.Persistence & & nuget (implicit) \\ \hline 
-	Components.Persistence.Stability.Version1 & & nuget (implicit) \\ \hline 
-	DSL libraries \footnote{This a group of libraries\label{footnote_libs}}& & nuget \\ \hline 
+    DGeoSuite.Components.Persistence & & nuget (implicit) \\ \hline 
+	Deltares.GeoTechnics & & nuget \\ \hline 
+	Deltares.GeoTechnics.Forms & & nuget \\ \hline 
+	Deltares.Standard & & nuget \\ \hline 
+	Deltares.Standard.Forms.Maps & & nuget \\ \hline 
+	Deltares.Standard.Maps & & nuget \\ \hline 
+	Deltares.Geographic & & nuget (implicit)\\ \hline 
+	Deltares.Geometry & & nuget (implicit)\\ \hline 
+	Deltares.Geometry.Forms & & nuget (implicit)\\ \hline 
+	Deltares.Mathematics.DSL & & nuget (implicit)\\ \hline 
+	Deltares.Probabilistic & & nuget (implicit)\\ \hline 
+	Deltares.Standard.Forms & & nuget (implicit)\\ \hline 
+	Deltares.Standard.Forms.DExpress & & nuget (implicit)\\ \hline 
 	Authorization\footnote{This a group of dll's\label{footnote_dlls}}& & lib\textbackslash Authorization \\ \hline 
 	DevExpress\textsuperscript{\ref{footnote_dlls}}& & lib\textbackslash DevExpress \\ \hline 
 	DotSpatial\textsuperscript{\ref{footnote_dlls}}& & lib\textbackslash DotSpatial \\ \hline 
@@ -701,12 +737,20 @@
 	Deltares.DamEngine.Io & & nuget \\ \hline 
 	Deltares.DamEngine.Calculators & & nuget (implicit) \\ \hline 
 	Deltares.WTIPiping & & nuget (implicit) \\ \hline 
+	Deltares.Geo.Common.Standard & & nuget (implicit) \\ \hline 
 	Deltares.StixFileWriter & & nuget (implicit) \\ \hline 
 	Deltares.MacroStability.CSharpWrapper & & nuget (implicit) \\ \hline 
+	Components.Persistence.Stability.Version1 & & nuget (implicit) \\ \hline 
 	Components.Persistence.Stability.Version2 & & nuget (implicit) \\ \hline 
 	DGeoSuite.Common & & nuget (implicit)\\ \hline 
-    DGeoSuite.Common.Persistence & & nuget (implicit) \\ \hline 
-	DSL libraries\textsuperscript{\ref{footnote_libs}} & & nuget \\ \hline 
+    DGeoSuite.Components.Persistence & & nuget (implicit) \\ \hline 
+	Deltares.GeoTechnics & & nuget \\ \hline 
+	Deltares.Standard & & nuget \\ \hline 
+	Deltares.Standard.Maps & & nuget \\ \hline 
+	Deltares.Geographic & & nuget (implicit)\\ \hline 
+	Deltares.Geometry & & nuget (implicit)\\ \hline 
+	Deltares.Mathematics.DSL & & nuget (implicit)\\ \hline 
+	Deltares.Probabilistic & & nuget (implicit)\\ \hline 
 	Authorization\textsuperscript{\ref{footnote_dlls}} & & lib\textbackslash Authorization \\ \hline 
 	DotSpatial\textsuperscript{\ref{footnote_dlls}} & & lib\textbackslash DotSpatial \\ \hline 
 \end{tabularx}