diff --git a/Mono.Addins.CecilReflector/AssemblyInfo.cs b/Mono.Addins.CecilReflector/AssemblyInfo.cs
deleted file mode 100644
index cf2c0fba..00000000
--- a/Mono.Addins.CecilReflector/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("Mono.Addins.CecilReflector")]
-[assembly: AssemblyCopyright("Copyright (C) 2007 Novell, Inc (http://www.novell.com)")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.0.0")]
diff --git a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj
index f72813d5..d9201a9f 100644
--- a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj
+++ b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj
@@ -1,20 +1,19 @@
-
-
+
- Debug
- AnyCPU
{42D1CE65-A14B-4218-B787-58AD7AA68513}
Library
Mono.Addins.CecilReflector
Mono.Addins.CecilReflector
- True
- ..\mono-addins.snk
+ netstandard2.0
Mono.Addins.CecilReflector
Mono.Addins is a framework for creating extensible applications, and for creating add-ins which extend applications. Mono.Addins.Setup provides an API for managing add-ins, creating add-in packages and publishing add-ins in on-line repositories.
8.0.30703
- 2.0
+ True
+ ..\mono-addins.snk
+ 1.0.0.0
+ false
True
@@ -40,18 +39,8 @@
True
-
-
-
- {91DD5A2D-9FE3-4C3C-9253-876141874DAD}
- Mono.Addins
-
-
-
-
-
+
-
diff --git a/Mono.Addins.Gui/Mono.Addins.Gui.csproj b/Mono.Addins.Gui/Mono.Addins.Gui.csproj
index d5681ea0..a1194200 100644
--- a/Mono.Addins.Gui/Mono.Addins.Gui.csproj
+++ b/Mono.Addins.Gui/Mono.Addins.Gui.csproj
@@ -13,6 +13,7 @@
True
..\mono-addins.snk
PackageReference
+ v4.7.2
True
@@ -39,11 +40,11 @@
1574;1591
-
-
-
-
-
+
+
+
+
+
diff --git a/Mono.Addins.MSBuild/AssemblyInfo.cs b/Mono.Addins.MSBuild/AssemblyInfo.cs
deleted file mode 100644
index ab7d14de..00000000
--- a/Mono.Addins.MSBuild/AssemblyInfo.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// AssemblyInfo.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("Mono.Addins")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
index c0836b15..7d3c8e64 100644
--- a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
+++ b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
@@ -1,9 +1,6 @@
-
-
+
- Debug
- AnyCPU
8.0.30703
2.0
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}
@@ -12,6 +9,9 @@
Mono.Addins.MSBuild
True
..\mono-addins.snk
+ netstandard2.0
+ 1.0.0.0
+ false
True
@@ -33,29 +33,12 @@
true
-
-
-
-
-
-
-
-
-
-
-
-
- {A85C9721-C054-4BD8-A1F3-0227615F0A36}
- Mono.Addins.Setup
- False
-
+
+
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}
Mono.Addins
False
-
-
-
\ No newline at end of file
diff --git a/Mono.Addins.Setup/AssemblyInfo.cs b/Mono.Addins.Setup/AssemblyInfo.cs
deleted file mode 100644
index 715e8bd7..00000000
--- a/Mono.Addins.Setup/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("Mono.Addins.Setup")]
-[assembly: AssemblyCopyright("Copyright (C) 2007 Novell, Inc (http://www.novell.com)")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.0.0")]
diff --git a/Mono.Addins.Setup/Mono.Addins.Setup.csproj b/Mono.Addins.Setup/Mono.Addins.Setup.csproj
index c63b7470..fd8abe6b 100644
--- a/Mono.Addins.Setup/Mono.Addins.Setup.csproj
+++ b/Mono.Addins.Setup/Mono.Addins.Setup.csproj
@@ -1,10 +1,8 @@
-
+
- Debug
- AnyCPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}
Library
Mono.Addins.Setup
@@ -16,6 +14,9 @@
8.0.30703
2.0
true
+ 1.0.0.0
+ netstandard2.0
+ false
True
@@ -43,55 +44,10 @@
True
-
-
-
-
- {91DD5A2D-9FE3-4C3C-9253-876141874DAD}
- Mono.Addins
False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Mono.Addins.SetupProcess/Mono.Addins.SetupProcess.csproj b/Mono.Addins.SetupProcess/Mono.Addins.SetupProcess.csproj
new file mode 100644
index 00000000..9d1b59f2
--- /dev/null
+++ b/Mono.Addins.SetupProcess/Mono.Addins.SetupProcess.csproj
@@ -0,0 +1,38 @@
+
+
+
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {303D2716-94AA-4067-8111-F478D26DFAFE}
+ Exe
+ Mono.Addins.SetupProcess
+ Mono.Addins.SetupProcess
+ True
+ ..\mono-addins.snk
+ false
+
+
+ true
+ full
+ false
+ ..\bin
+ DEBUG;
+ prompt
+ 4
+ true
+
+
+ true
+ ..\bin
+ prompt
+ 4
+ true
+
+
+
+
+
\ No newline at end of file
diff --git a/Mono.Addins.SetupProcess/SetupProcessTool.cs b/Mono.Addins.SetupProcess/SetupProcessTool.cs
new file mode 100644
index 00000000..65f00324
--- /dev/null
+++ b/Mono.Addins.SetupProcess/SetupProcessTool.cs
@@ -0,0 +1,75 @@
+//
+// SetupProcessTool.cs
+//
+// Author:
+// Marius Ungureanu
+//
+// Copyright (c) 2019 Microsoft Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.Addins.Database;
+
+namespace Mono.Addins.SetupProcess
+{
+ class SetupProcessTool
+ {
+ public static int Main (string [] args)
+ {
+ ProcessProgressStatus monitor = new ProcessProgressStatus (int.Parse (args [0]));
+
+ try {
+ string registryPath = Console.In.ReadLine ();
+ string startupDir = Console.In.ReadLine ();
+ string addinsDir = Console.In.ReadLine ();
+ string databaseDir = Console.In.ReadLine ();
+
+ AddinDatabase.RunningSetupProcess = true;
+ AddinRegistry reg = new AddinRegistry (registryPath, startupDir, addinsDir, databaseDir);
+
+ switch (args [1]) {
+ case "scan": {
+ string folder = args.Length > 2 ? args [2] : null;
+ if (folder.Length == 0) folder = null;
+
+ var context = new ScanOptions ();
+ context.Read (Console.In);
+ reg.ScanFolders (monitor, folder, context);
+ break;
+ }
+ case "pre-scan": {
+ string folder = args.Length > 2 ? args [2] : null;
+ if (folder.Length == 0) folder = null;
+ var recursive = bool.Parse (Console.In.ReadLine ());
+ reg.GenerateScanDataFilesInProcess (monitor, folder, recursive);
+ break;
+ }
+ case "get-desc":
+ var outFile = Console.In.ReadLine ();
+ reg.ParseAddin (monitor, args [2], outFile);
+ break;
+ }
+ } catch (Exception ex) {
+ monitor.ReportError ("Unexpected error in setup process", ex);
+ return 1;
+ }
+ return 0;
+ }
+ }
+}
diff --git a/Mono.Addins.sln b/Mono.Addins.sln
index e33045ba..ad51470d 100644
--- a/Mono.Addins.sln
+++ b/Mono.Addins.sln
@@ -41,6 +41,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.MSBuild", "Mono
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.GuiGtk3", "Mono.Addins.GuiGtk3\Mono.Addins.GuiGtk3.csproj", "{410A7DC9-E7DA-43E6-B592-93E2A344B660}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.SetupProcess", "Mono.Addins.SetupProcess\Mono.Addins.SetupProcess.csproj", "{303D2716-94AA-4067-8111-F478D26DFAFE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DebugWin32|Any CPU = DebugWin32|Any CPU
@@ -163,7 +165,6 @@ Global
{B051C84E-48CC-448D-B00C-1525EB64E4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B051C84E-48CC-448D-B00C-1525EB64E4BE}.Release|Any CPU.Build.0 = Release|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugGtk3|Any CPU.ActiveCfg = Debug|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugGtk3|Any CPU.Build.0 = Debug|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
@@ -172,6 +173,7 @@ Global
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.DebugGtk3|Any CPU.ActiveCfg = Debug|Any CPU
@@ -201,7 +203,6 @@ Global
{F109148D-849E-4044-8700-5E8EA0AB2476}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{F109148D-849E-4044-8700-5E8EA0AB2476}.Release|Any CPU.Build.0 = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGtk3|Any CPU.ActiveCfg = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGtk3|Any CPU.Build.0 = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
@@ -209,6 +210,16 @@ Global
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {303D2716-94AA-4067-8111-F478D26DFAFE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {303D2716-94AA-4067-8111-F478D26DFAFE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+ {303D2716-94AA-4067-8111-F478D26DFAFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {303D2716-94AA-4067-8111-F478D26DFAFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {303D2716-94AA-4067-8111-F478D26DFAFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {303D2716-94AA-4067-8111-F478D26DFAFE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {303D2716-94AA-4067-8111-F478D26DFAFE}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {303D2716-94AA-4067-8111-F478D26DFAFE}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
+ {303D2716-94AA-4067-8111-F478D26DFAFE}.DebugGtk3|Any CPU.ActiveCfg = Debug|Any CPU
+ {303D2716-94AA-4067-8111-F478D26DFAFE}.DebugGtk3|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F109148D-849E-4044-8700-5E8EA0AB2476} = {7EFC0684-310E-417D-B8BD-5584C3F34BD5}
diff --git a/Mono.Addins/AssemblyInfo.cs b/Mono.Addins/AssemblyInfo.cs
deleted file mode 100644
index 7b050f17..00000000
--- a/Mono.Addins/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("Mono.Addins")]
-[assembly: AssemblyCopyright("Copyright (C) 2007 Novell, Inc (http://www.novell.com)")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.0.0")]
-
-[assembly: InternalsVisibleTo ("Mono.Addins.Setup, PublicKey=00240000048000009400000006020000002400005253413100" +
- "0400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c" +
- "3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4" +
- "f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")]
-[assembly: InternalsVisibleTo("UnitTests, PublicKey=00240000048000009400000006020000002400005253413100" +
- "0400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c" +
- "3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4" +
- "f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")]
diff --git a/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs b/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
index 714f2431..fb7f7213 100644
--- a/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
+++ b/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
@@ -1823,11 +1823,8 @@ bool AddinIdExists (string id)
ISetupHandler GetSetupHandler ()
{
-// if (Util.IsMono)
-// return new SetupProcess ();
-// else
if (fs.RequiresIsolation)
- return new SetupDomain ();
+ return new SetupProcess ();
else
return new SetupLocal ();
}
diff --git a/Mono.Addins/Mono.Addins.Database/SetupProcess.cs b/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
index 0ae3a337..6b0255fa 100644
--- a/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
+++ b/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
@@ -68,16 +68,9 @@ internal static void ExecuteCommand (IProgressStatus monitor, string registryPat
sb.Append (" \"").Append (arg1).Append ("\"");
Process process = new Process ();
-
- string asm = null;
+
try {
- asm = CreateHostExe ();
- if (!Util.IsMono)
- process.StartInfo = new ProcessStartInfo (asm, sb.ToString ());
- else {
- asm = asm.Replace(" ", @"\ ");
- process.StartInfo = new ProcessStartInfo ("mono", "--debug " + asm + " " + sb.ToString ());
- }
+ process.StartInfo = CreateProcessStartInfo (sb.ToString ());
process.StartInfo.WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory;
process.StartInfo.UseShellExecute = false;
process.StartInfo.CreateNoWindow = true;
@@ -107,90 +100,33 @@ internal static void ExecuteCommand (IProgressStatus monitor, string registryPat
} catch (Exception ex) {
Console.WriteLine (ex);
throw;
- } finally {
- if (asm != null) {
- try {
- File.Delete (asm);
- } catch { }
- }
}
}
- public static int Main (string [] args)
+ static ProcessStartInfo CreateProcessStartInfo (string arguments)
{
- ProcessProgressStatus monitor = new ProcessProgressStatus (int.Parse (args [0]));
+ string thisAsmDir = Path.GetDirectoryName (typeof (SetupProcess).Assembly.Location);
+ string asm = Path.Combine (thisAsmDir, "Mono.Addins.SetupProcess.exe");
- try {
- string registryPath = Console.In.ReadLine ();
- string startupDir = Console.In.ReadLine ();
- string addinsDir = Console.In.ReadLine ();
- string databaseDir = Console.In.ReadLine ();
-
- AddinDatabase.RunningSetupProcess = true;
- AddinRegistry reg = new AddinRegistry (registryPath, startupDir, addinsDir, databaseDir);
+ if (File.Exists (asm)) {
+ if (Util.IsMono) {
+ asm = asm.Replace (" ", @"\ ");
+ return new ProcessStartInfo ("mono", "--debug " + asm + " " + arguments);
+ }
+ return new ProcessStartInfo (asm, arguments);
+ }
- switch (args [1]) {
- case "scan": {
- string folder = args.Length > 2 ? args [2] : null;
- if (folder.Length == 0) folder = null;
+ asm = Path.Combine(thisAsmDir, "Mono.Addins.SetupProcess");
+ if (File.Exists (asm))
+ return new ProcessStartInfo (asm, arguments);
- var context = new ScanOptions ();
- context.Read (Console.In);
- reg.ScanFolders (monitor, folder, context);
- break;
- }
- case "pre-scan": {
- string folder = args.Length > 2 ? args [2] : null;
- if (folder.Length == 0) folder = null;
- var recursive = bool.Parse (Console.In.ReadLine ());
- reg.GenerateScanDataFilesInProcess (monitor, folder, recursive);
- break;
- }
- case "get-desc":
- var outFile = Console.In.ReadLine ();
- reg.ParseAddin (monitor, args [2], args [3]);
- break;
- }
- } catch (Exception ex) {
- monitor.ReportError ("Unexpected error in setup process", ex);
- return 1;
+ asm = Path.Combine (thisAsmDir, "Mono.Addins.SetupProcess.dll");
+ if (File.Exists (asm)) {
+ asm = asm.Replace (" ", @"\ ");
+ return new ProcessStartInfo ("dotnet", asm + " " + arguments);
}
- return 0;
- }
-
- static string CreateHostExe ()
- {
- string file;
- string id;
- string fullFile;
- do {
- id = Guid.NewGuid ().ToString ().Replace ('-','_');
- file = id + ".exe";
- fullFile = Path.Combine (Path.GetTempPath (), file);
- } while (File.Exists (fullFile));
- AssemblyName aname = new AssemblyName ();
- aname.Name = id;
- AssemblyBuilder ab = AppDomain.CurrentDomain.DefineDynamicAssembly (aname, AssemblyBuilderAccess.Save, Path.GetTempPath ());
- ModuleBuilder mb = ab.DefineDynamicModule (aname.Name, file);
- TypeBuilder tb = mb.DefineType ("App", TypeAttributes.Public|TypeAttributes.Class);
-
- MethodBuilder fb = tb.DefineMethod("Main",
- MethodAttributes.Public |
- MethodAttributes.Static,
- typeof(int), new Type[] { typeof(string[]) });
-
- MethodInfo mi = typeof(SetupProcess).GetMethod ("Main", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
-
- ILGenerator ilg = fb.GetILGenerator();
- ilg.Emit (OpCodes.Ldarg_0);
- ilg.EmitCall (OpCodes.Call, mi, null);
- ilg.Emit (OpCodes.Ret);
-
- tb.CreateType();
- ab.SetEntryPoint (fb, PEFileKinds.WindowApplication);
- ab.Save (file);
- return fullFile;
+ throw new InvalidOperationException ("Mono.Addins.SetupProcess not found");
}
}
diff --git a/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs b/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
index 233167dd..dfbd1694 100644
--- a/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
+++ b/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
@@ -147,7 +147,7 @@ public StringCollection Assemblies {
}
}
- internal StringCollection AssemblyNames {
+ public StringCollection AssemblyNames {
get {
if (assemblyNames == null) {
assemblyNames = new StringCollection ();
diff --git a/Mono.Addins/Mono.Addins.csproj b/Mono.Addins/Mono.Addins.csproj
index 025be72e..2d2c6147 100644
--- a/Mono.Addins/Mono.Addins.csproj
+++ b/Mono.Addins/Mono.Addins.csproj
@@ -1,21 +1,19 @@
-
-
+
- Debug
- AnyCPU
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}
Library
Mono.Addins
Mono.Addins
True
..\mono-addins.snk
+ 8.0.30703
+ netstandard2.0
Mono.Addins
Mono.Addins is a framework for creating extensible applications, and for creating add-ins which extend applications.
- 8.0.30703
- 2.0
- true
+ 1.0.0.0
+ false
True
@@ -43,125 +41,20 @@
True
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ <_Parameter1>Mono.Addins.Setup, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df
+
+
+ <_Parameter1>Mono.Addins.SetupProcess, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df
+
+
+ <_Parameter1>UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df
+
-
diff --git a/Mono.Addins/Mono.Addins/AddinEngine.cs b/Mono.Addins/Mono.Addins/AddinEngine.cs
index d73a4648..3e4122d9 100755
--- a/Mono.Addins/Mono.Addins/AddinEngine.cs
+++ b/Mono.Addins/Mono.Addins/AddinEngine.cs
@@ -626,8 +626,8 @@ void RegisterAssemblyResolvePaths (RuntimeAddin addin, ModuleDescription descrip
{
lock (LocalLock) {
foreach (var asm in description.AssemblyNames) {
- Debug.Assert(assemblyResolvePaths[asm] == addin);
- assemblyResolvePaths[asm] = addin;
+ //Debug.Assert(assemblyResolvePaths[asm] == addin); This does not look right. Not called in old project since DEBUG symbol is not defined.
+ assemblyResolvePaths [asm] = addin;
}
}
}
diff --git a/TargetFrameworks.props b/TargetFrameworks.props
index 4eda1b74..60fb3a76 100644
--- a/TargetFrameworks.props
+++ b/TargetFrameworks.props
@@ -2,7 +2,7 @@
true
- v4.5
- v4.6.1
+ net461
+ net461
diff --git a/Test/CommandExtension/CommandExtension.csproj b/Test/CommandExtension/CommandExtension.csproj
index c0407273..744505c1 100644
--- a/Test/CommandExtension/CommandExtension.csproj
+++ b/Test/CommandExtension/CommandExtension.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -10,6 +10,8 @@
CommandExtension
2.0
CommandExtension
+ false
+ 0.0.0.0
True
@@ -40,9 +42,4 @@
Always
-
-
-
-
-
\ No newline at end of file
diff --git a/Test/FileContentExtension/FileContentExtension.csproj b/Test/FileContentExtension/FileContentExtension.csproj
index e8009440..e3a563d3 100644
--- a/Test/FileContentExtension/FileContentExtension.csproj
+++ b/Test/FileContentExtension/FileContentExtension.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -10,6 +10,8 @@
FileContentExtension
2.0
FileContentExtension
+ false
+ 0.0.0.0
True
@@ -40,10 +42,4 @@
Always
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Test/FileExtender/FileExtender.csproj b/Test/FileExtender/FileExtender.csproj
index c63d17ab..66ae3892 100644
--- a/Test/FileExtender/FileExtender.csproj
+++ b/Test/FileExtender/FileExtender.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -10,6 +10,8 @@
FileExtender
2.0
FileExtender
+ false
+ 0.0.0.0
True
@@ -47,9 +49,6 @@
False
-
-
-
FileExtender.addin.xml
@@ -63,5 +62,4 @@
Always
-
diff --git a/Test/GuiTester/GuiTester.csproj b/Test/GuiTester/GuiTester.csproj
index b7d3f35a..046904bb 100644
--- a/Test/GuiTester/GuiTester.csproj
+++ b/Test/GuiTester/GuiTester.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -10,6 +10,7 @@
WinExe
GuiTester
GuiTester
+ false
true
@@ -33,23 +34,13 @@
-
-
-
-
-
+
gui.stetic
-
-
-
-
-
-
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}
diff --git a/Test/HelloWorldExtension/HelloWorldExtension.csproj b/Test/HelloWorldExtension/HelloWorldExtension.csproj
index 89f178d5..ca744c81 100644
--- a/Test/HelloWorldExtension/HelloWorldExtension.csproj
+++ b/Test/HelloWorldExtension/HelloWorldExtension.csproj
@@ -1,6 +1,5 @@
-
-
+
Debug
AnyCPU
@@ -10,6 +9,8 @@
HelloWorldExtension
2.0
HelloWorldExtension
+ false
+ 0.0.0.0
True
@@ -40,12 +41,4 @@
Mono.Addins
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj b/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj
index a4767c03..9e9fee7a 100644
--- a/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj
+++ b/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -10,6 +10,8 @@
Library
MultiAssemblyAddin
MultiAssemblyAddin
+ false
+ 0.0.0.0
True
@@ -34,7 +36,10 @@
-
+
+
+
+
@@ -52,5 +57,4 @@
SecondAssembly
-
\ No newline at end of file
diff --git a/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj b/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj
index 99cf86f7..5b3fb0bd 100644
--- a/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj
+++ b/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -10,6 +10,8 @@
Library
OptionalModule
OptionalModule
+ false
+ 0.0.0.0
True
@@ -45,8 +47,4 @@
False
-
-
-
-
\ No newline at end of file
diff --git a/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj b/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj
index d99d3cfd..bd56ae4e 100644
--- a/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj
+++ b/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -10,6 +10,8 @@
Library
SecondAssembly
SecondAssembly
+ false
+ 0.0.0.0
True
@@ -45,9 +47,4 @@
False
-
-
-
-
-
\ No newline at end of file
diff --git a/Test/SystemInfoExtension/SystemInfoExtension.csproj b/Test/SystemInfoExtension/SystemInfoExtension.csproj
index 9b1b764a..186544dc 100644
--- a/Test/SystemInfoExtension/SystemInfoExtension.csproj
+++ b/Test/SystemInfoExtension/SystemInfoExtension.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -10,6 +10,8 @@
SystemInfoExtension
2.0
SystemInfoExtension
+ false
+ 0.0.0.0
True
@@ -40,22 +42,16 @@
-
-
-
-
-
-
+
Always
-
+
-
-
+
Resources.resources
-
-
+
+
Resources.ca.resources
-
+
\ No newline at end of file
diff --git a/Test/UnitTests/UnitTests.csproj b/Test/UnitTests/UnitTests.csproj
index c0329a32..30d2358a 100644
--- a/Test/UnitTests/UnitTests.csproj
+++ b/Test/UnitTests/UnitTests.csproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -12,6 +12,7 @@
UnitTests
True
..\..\mono-addins.snk
+ false
True
@@ -28,53 +29,16 @@
-
- 3.11.1
-
-
- {91DD5A2D-9FE3-4C3C-9253-876141874DAD}
- Mono.Addins
+
+
+
+
+ false
+
+ true
-
- {42D1CE65-A14B-4218-B787-58AD7AA68513}
- Mono.Addins.CecilReflector
-
-
- {A85C9721-C054-4BD8-A1F3-0227615F0A36}
- Mono.Addins.Setup
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -98,7 +62,6 @@
PreserveNewest
-
TestManifest2.xml
@@ -110,7 +73,17 @@
TestManifest2-bis.xml
-
-
-
+
+
+
+
+
+
+ ..\..\bin\
+
+
+
+
+
+
diff --git a/mautil/mautil.csproj b/mautil/mautil.csproj
index 49d2ee01..08efd7f8 100644
--- a/mautil/mautil.csproj
+++ b/mautil/mautil.csproj
@@ -1,6 +1,5 @@
-
Debug
AnyCPU
@@ -10,6 +9,8 @@
mautil
2.0
mautil
+ v4.6.2
+ true
True
@@ -31,9 +32,6 @@
true
rb /home/lluis/work/monodevelop/main/build/AddIns/NUnit
-
-
-
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}
@@ -48,5 +46,11 @@
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
\ No newline at end of file