Merge pull request #3 from alexanderkell/main

Simplified cloud file name
ClimateCompatibleGrowth · Mar 25, 2022 · 3dd009d · 3dd009d
2 parents 3864103 + 14f96ca
commit 3dd009d
Show file tree

Hide file tree

Showing 90 changed files with 10,973 additions and 68 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/clicSANDMac/bin/Debug/net48/clicSANDMac.app
+
diff --git a/.vs/clicSANDMac/xs/project-cache/clicSANDLib-Debug.json b/.vs/clicSANDMac/xs/project-cache/clicSANDLib-Debug.json
diff --git a/.vs/clicSANDMac/xs/project-cache/clicSANDMac-Debug.json b/.vs/clicSANDMac/xs/project-cache/clicSANDMac-Debug.json
diff --git a/.vs/clicSANDMac/xs/project-cache/clicSANDMac.Gtk-Debug.json b/.vs/clicSANDMac/xs/project-cache/clicSANDMac.Gtk-Debug.json
diff --git a/.vs/clicSANDMac/xs/project-cache/clicSANDMac.Wpf-Debug.json b/.vs/clicSANDMac/xs/project-cache/clicSANDMac.Wpf-Debug.json
diff --git a/clicSANDLib/FormModelRunner.cs b/clicSANDLib/FormModelRunner.cs
@@ -35,7 +35,6 @@ private void buttonRun_Click(object sender, EventArgs e)
             textBoxOutput.Text += new string('-', 150) + "\r\n";
 
             //TODO Cursor.Current = Cursors.WaitCursor;
-
             try
             {
                 bool result = false;
@@ -53,6 +52,7 @@ private void buttonRun_Click(object sender, EventArgs e)
             {
                 textBoxOutput.Text += "Converting results for visualisation";
                 ConvertResults(resultsFileName, resultsFileName);
+                textBoxOutput.Text += "Converted results for visualisation";
             }
             catch (Exception exc)
             {
@@ -65,6 +65,7 @@ private void buttonRun_Click(object sender, EventArgs e)
                 try
                 {
                     SaveLog(logFileName, textBoxOutput.Text);
+
                 }
                 catch (Exception exc)
                 {
@@ -73,6 +74,31 @@ private void buttonRun_Click(object sender, EventArgs e)
             }
         }
 
+        private void buttonCloud_Click(object sender, EventArgs e)
+        {
+            string dataFileName = textBoxDataSource.Text;
+            string cloudFile = dataFileName.Remove(dataFileName.Length - 4) + ".cloud_data.txt";
+            logFileName = string.Format("{0}{1}.log.txt", textBoxDataSource.Text, DateTime.Now.ToString("yyyyMMddHHmmss"));
+
+            textBoxOutput.Text = "";
+
+            textBoxOutput.Text += new string('-', 150) + "\r\n";
+            textBoxOutput.Text += "Data file: " + dataFileName + "\r\n";
+            textBoxOutput.Text += "Cloud data file: " + cloudFile + "\r\n";
+            textBoxOutput.Text += new string('-', 150) + "\r\n";
+
+            // TODO Cursor.Current = Cursors.WaitCursor;
+            try
+            {
+                textBoxOutput.Text += "Converting files for OSeMOSYS Cloud data input \r\n";
+                CreateCloudInput(dataFileName, cloudFile);
+            }
+            catch (Exception exc)
+            {
+                textBoxOutput.Text += "Unable to generate OSeMOSYS Cloud input data: " + exc.Message + "\r\n";
+            }
+        }
+
 
 
         //private bool ExtractDataFromXLS(string xlsFileName, string dataFileName)
@@ -106,7 +132,7 @@ private void ConvertResults(string input, string output_dir)
             startInfo.FileName = path;
             startInfo.WindowStyle = ProcessWindowStyle.Hidden;
             string input_path = Path.GetDirectoryName(input);
-            startInfo.Arguments = input + " " + input_path;
+            startInfo.Arguments = "\"" + input + "\"" + " " + "\"" + input_path + "\"";
 
             try
             {
@@ -121,6 +147,32 @@ private void ConvertResults(string input, string output_dir)
             }
         }
 
+        private void CreateCloudInput(string input, string output_dir)
+        {
+            // Use ProcessStartInfo class
+            ProcessStartInfo startInfo = new ProcessStartInfo();
+            // startInfo.CreateNoWindow = false;
+            startInfo.RedirectStandardOutput = true;
+            startInfo.UseShellExecute = false;
+            string path = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), @"Cloud/sand_filter_v2");
+            startInfo.FileName = path;
+            startInfo.WindowStyle = ProcessWindowStyle.Hidden;
+            startInfo.Arguments = "\"" + input + "\"" + " " + "\"" + output_dir + "\"";
+
+            try
+            {
+                using (Process exeProcess = Process.Start(startInfo))
+                {
+                    exeProcess.WaitForExit();
+                }
+            }
+            catch (Exception exc)
+            {
+                textBoxOutput.Text += "Unable to create cloud input: " + exc.Message + "\r\n";
+            }
+        }
+
+
         private bool RunGLPSOL(string dataFileName, string modelFileName, string lpFileName)
         {
             return RunProcess(String.Format(@"{0}/glpsol", ConfigurationManager.AppSettings["glpsolLocation"]), string.Format("--check -m \"{0}\" -d \"{1}\" --wlp \"{2}\"", modelFileName, dataFileName, lpFileName));

diff --git a/clicSANDLib/FormModelRunner.eto.cs b/clicSANDLib/FormModelRunner.eto.cs
@@ -40,6 +40,7 @@ private void InitializeComponent()
             this.labelModel = new Label();
             this.textBoxModel = new TextBox();
             this.buttonRun = new Button();
+            this.buttonCloud = new Button();
             this.textBoxOutput = new TextArea();
             this.buttonOpenXLS = new Button();
             this.buttonOpenModel = new Button();
@@ -159,6 +160,16 @@ private void InitializeComponent()
             //this.buttonSaveTemplates.UseVisualStyleBackColor = true;
             this.buttonSaveTemplates.Click += new System.EventHandler<System.EventArgs>(this.buttonSaveTemplates_Click);
             // 
+            // buttonRun
+            // 
+            this.layout.Add(buttonCloud, 336, 95);
+            this.buttonCloud.ID = "buttonCloud";
+            this.buttonCloud.Size = new Size(250, 23);
+            this.buttonCloud.TabIndex = 16;
+            this.buttonCloud.Text = "Generate OSeMOSYS Cloud Input Data";
+            //this.buttonCloud.UseVisualStyleBackColor = true;
+            this.buttonCloud.Click += new System.EventHandler<System.EventArgs>(this.buttonCloud_Click);
+            // 
             // FormModelRunner
             // 
             //this.AutoScaleDimensions = new SizeF(6F, 13F);
@@ -206,6 +217,7 @@ private void InitializeComponent()
         private NumericUpDown numericRatio;
         private CheckBox checkCBCRatio;
         private Button buttonSaveTemplates;
+        private Button buttonCloud;
 
         private PixelLayout layout;
     }

diff --git a/clicSANDLib/bin/Debug/netstandard2.0/clicSANDLib.dll b/clicSANDLib/bin/Debug/netstandard2.0/clicSANDLib.dll
diff --git a/clicSANDLib/bin/Debug/netstandard2.0/clicSANDLib.pdb b/clicSANDLib/bin/Debug/netstandard2.0/clicSANDLib.pdb
diff --git a/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.GeneratedMSBuildEditorConfig.editorconfig b/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.GeneratedMSBuildEditorConfig.editorconfig
@@ -1,3 +1,3 @@
 is_global = true
 build_property.RootNamespace = clicSANDLib
-build_property.ProjectDir = /Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/
+build_property.ProjectDir = /Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/
diff --git a/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.assets.cache b/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.assets.cache
diff --git a/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.csproj.FileListAbsolute.txt b/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.csproj.FileListAbsolute.txt
@@ -8,6 +8,16 @@
 /Users/alexanderkell/GitHub/SGI/clicSANDMac/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.csproj.CoreCompileInputs.cache
 /Users/alexanderkell/GitHub/SGI/clicSANDMac/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.dll
 /Users/alexanderkell/GitHub/SGI/clicSANDMac/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.pdb
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/bin/Debug/netstandard2.0/clicSANDLib.deps.json
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/bin/Debug/netstandard2.0/clicSANDLib.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/bin/Debug/netstandard2.0/clicSANDLib.pdb
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.csproj.AssemblyReference.cache
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.GeneratedMSBuildEditorConfig.editorconfig
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.AssemblyInfoInputs.cache
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.AssemblyInfo.cs
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.csproj.CoreCompileInputs.cache
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.pdb
 /Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/bin/Debug/netstandard2.0/clicSANDLib.deps.json
 /Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/bin/Debug/netstandard2.0/clicSANDLib.dll
 /Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/bin/Debug/netstandard2.0/clicSANDLib.pdb

diff --git a/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.dll b/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.dll
diff --git a/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.pdb b/clicSANDLib/obj/Debug/netstandard2.0/clicSANDLib.pdb
diff --git a/clicSANDLib/obj/clicSANDLib.csproj.nuget.dgspec.json b/clicSANDLib/obj/clicSANDLib.csproj.nuget.dgspec.json
@@ -1,17 +1,17 @@
 {
   "format": 1,
   "restore": {
-    "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj": {}
+    "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj": {}
   },
   "projects": {
-    "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj": {
+    "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj",
+        "projectUniqueName": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj",
         "projectName": "clicSANDLib",
-        "projectPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj",
+        "projectPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj",
         "packagesPath": "/Users/alexanderkell/.nuget/packages/",
-        "outputPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/obj/",
+        "outputPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/obj/",
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "/Users/alexanderkell/.config/NuGet/NuGet.Config"
@@ -63,7 +63,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.404/RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.405/RuntimeIdentifierGraph.json"
         }
       }
     }

diff --git a/clicSANDLib/obj/project.assets.json b/clicSANDLib/obj/project.assets.json
@@ -767,11 +767,11 @@
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj",
+      "projectUniqueName": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj",
       "projectName": "clicSANDLib",
-      "projectPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj",
+      "projectPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj",
       "packagesPath": "/Users/alexanderkell/.nuget/packages/",
-      "outputPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/obj/",
+      "outputPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/obj/",
       "projectStyle": "PackageReference",
       "configFilePaths": [
         "/Users/alexanderkell/.config/NuGet/NuGet.Config"
@@ -823,7 +823,7 @@
         ],
         "assetTargetFallback": true,
         "warn": true,
-        "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.404/RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.405/RuntimeIdentifierGraph.json"
       }
     }
   }

diff --git a/clicSANDLib/obj/project.nuget.cache b/clicSANDLib/obj/project.nuget.cache
@@ -1,8 +1,8 @@
 {
   "version": 2,
-  "dgSpecHash": "wgAotISTEg/YGpZBV8mwloqtoRDYOjnuT3J0PxaqnqwQ7KsVqxa2ucM8HvbneV/hZYWYyqEfejkn6/08MkqCuA==",
+  "dgSpecHash": "OjXv66ZIbjQn1T9MY05ZZGuVG4FEyoxvVAj+sByzDj9q2eKlZ9F8+TCbA7iH5/RdYGpRoGMhTRUs76UFuMLy6g==",
   "success": true,
-  "projectFilePath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj",
+  "projectFilePath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj",
   "expectedPackageFiles": [
     "/Users/alexanderkell/.nuget/packages/eto.forms/2.5.11/eto.forms.2.5.11.nupkg.sha512",
     "/Users/alexanderkell/.nuget/packages/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg.sha512",

diff --git a/clicSANDMac.Gtk/bin/Debug/net48/clicSANDLib.dll b/clicSANDMac.Gtk/bin/Debug/net48/clicSANDLib.dll
diff --git a/clicSANDMac.Gtk/bin/Debug/net48/clicSANDLib.pdb b/clicSANDMac.Gtk/bin/Debug/net48/clicSANDLib.pdb
diff --git a/clicSANDMac.Gtk/bin/Debug/net48/clicSANDMac.Gtk.exe b/clicSANDMac.Gtk/bin/Debug/net48/clicSANDMac.Gtk.exe
diff --git a/clicSANDMac.Gtk/bin/Debug/net48/clicSANDMac.Gtk.pdb b/clicSANDMac.Gtk/bin/Debug/net48/clicSANDMac.Gtk.pdb
diff --git a/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.assets.cache b/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.assets.cache
diff --git a/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.csproj.AssemblyReference.cache b/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.csproj.AssemblyReference.cache
diff --git a/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.csproj.FileListAbsolute.txt b/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.csproj.FileListAbsolute.txt
@@ -26,6 +26,34 @@
 /Users/alexanderkell/GitHub/SGI/clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.csproj.CopyComplete
 /Users/alexanderkell/GitHub/SGI/clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.exe
 /Users/alexanderkell/GitHub/SGI/clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.pdb
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/clicSANDMac.Gtk.exe.config
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/clicSANDMac.Gtk.exe
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/clicSANDMac.Gtk.pdb
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/AtkSharp.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/CairoSharp.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/Eto.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/Eto.Gtk.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/GdkSharp.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/GioSharp.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/GLibSharp.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/GtkSharp.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/PangoSharp.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/System.ComponentModel.Annotations.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/System.Configuration.ConfigurationManager.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/System.Security.AccessControl.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/System.Security.Permissions.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/System.Security.Principal.Windows.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/clicSANDLib.dll
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/bin/Debug/net48/clicSANDLib.pdb
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.csproj.AssemblyReference.cache
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.exe.config
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.GeneratedMSBuildEditorConfig.editorconfig
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.AssemblyInfoInputs.cache
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.AssemblyInfo.cs
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.csproj.CoreCompileInputs.cache
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.csproj.CopyComplete
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.exe
+/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.pdb
 /Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/bin/Debug/net48/clicSANDMac.Gtk.exe.config
 /Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/bin/Debug/net48/clicSANDMac.Gtk.exe
 /Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/bin/Debug/net48/clicSANDMac.Gtk.pdb

diff --git a/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.exe b/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.exe
diff --git a/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.pdb b/clicSANDMac.Gtk/obj/Debug/net48/clicSANDMac.Gtk.pdb
diff --git a/clicSANDMac.Gtk/obj/clicSANDMac.Gtk.csproj.nuget.dgspec.json b/clicSANDMac.Gtk/obj/clicSANDMac.Gtk.csproj.nuget.dgspec.json
@@ -1,17 +1,17 @@
 {
   "format": 1,
   "restore": {
-    "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj": {}
+    "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj": {}
   },
   "projects": {
-    "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj": {
+    "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj",
+        "projectUniqueName": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj",
         "projectName": "clicSANDLib",
-        "projectPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj",
+        "projectPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj",
         "packagesPath": "/Users/alexanderkell/.nuget/packages/",
-        "outputPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/obj/",
+        "outputPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/obj/",
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "/Users/alexanderkell/.config/NuGet/NuGet.Config"
@@ -63,18 +63,18 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.404/RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.405/RuntimeIdentifierGraph.json"
         }
       }
     },
-    "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj": {
+    "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj",
+        "projectUniqueName": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj",
         "projectName": "clicSANDMac.Gtk",
-        "projectPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj",
+        "projectPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj",
         "packagesPath": "/Users/alexanderkell/.nuget/packages/",
-        "outputPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/obj/",
+        "outputPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/",
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "/Users/alexanderkell/.config/NuGet/NuGet.Config"
@@ -89,8 +89,8 @@
           "net48": {
             "targetAlias": "net48",
             "projectReferences": {
-              "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj": {
-                "projectPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj"
+              "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj": {
+                "projectPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj"
               }
             }
           }
@@ -110,7 +110,7 @@
               "version": "[2.5.11, )"
             }
           },
-          "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.404/RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.405/RuntimeIdentifierGraph.json"
         }
       }
     }

diff --git a/clicSANDMac.Gtk/obj/project.assets.json b/clicSANDMac.Gtk/obj/project.assets.json
@@ -617,11 +617,11 @@
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj",
+      "projectUniqueName": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj",
       "projectName": "clicSANDMac.Gtk",
-      "projectPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj",
+      "projectPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/clicSANDMac.Gtk.csproj",
       "packagesPath": "/Users/alexanderkell/.nuget/packages/",
-      "outputPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDMac.Gtk/obj/",
+      "outputPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDMac.Gtk/obj/",
       "projectStyle": "PackageReference",
       "configFilePaths": [
         "/Users/alexanderkell/.config/NuGet/NuGet.Config"
@@ -636,8 +636,8 @@
         "net48": {
           "targetAlias": "net48",
           "projectReferences": {
-            "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj": {
-              "projectPath": "/Users/alexanderkell/GitHub/SGI/1-cliSANDMac/clicSANDLib/clicSANDLib.csproj"
+            "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj": {
+              "projectPath": "/Users/alexanderkell/GitHub/SGI/5-clicSANDMac/clicSANDLib/clicSANDLib.csproj"
             }
           }
         }
@@ -657,7 +657,7 @@
             "version": "[2.5.11, )"
           }
         },
-        "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.404/RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.405/RuntimeIdentifierGraph.json"
       }
     }
   }