diff options
29 files changed, 386 insertions, 232 deletions
@@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IvyDaemon", "IvyDaemon\IvyDaemon.csproj", "{B10AB29F-D678-4472-9BA3-D627262E14E1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IvyPerf", "IvyPerf\IvyPerf.csproj", "{839C9A55-7EFD-4326-95C3-2960DF390FF2}"
@@ -19,9 +19,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "getopt", "getopt\getopt.csp EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IvyControl", "IvyControl\IvyControl.csproj", "{9E7098F5-F4CA-4CAE-B517-C584691DBDB4}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IvyThroughput", "IvyThroughput\IvyThroughput\IvyThroughput.csproj", "{58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}"
+EndProject
Global
GlobalSection(SourceCodeControl) = preSolution
- SccNumberOfProjects = 9
+ SccNumberOfProjects = 10
SccLocalPath0 = .
CanCheckoutShared = false
SccProjectUniqueName1 = IvyDaemon\\IvyDaemon.csproj
@@ -56,6 +58,10 @@ Global SccLocalPath8 = .
CanCheckoutShared = false
SccProjectFilePathRelativizedFromConnection8 = IvyControl\\
+ SccProjectUniqueName9 = IvyThroughput\\IvyThroughput\\IvyThroughput.csproj
+ SccLocalPath9 = .
+ CanCheckoutShared = false
+ SccProjectFilePathRelativizedFromConnection9 = IvyThroughput\\IvyThroughput\\
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -114,6 +120,12 @@ Global {9E7098F5-F4CA-4CAE-B517-C584691DBDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E7098F5-F4CA-4CAE-B517-C584691DBDB4}.Release|Any CPU.Build.0 = Release|Any CPU
{9E7098F5-F4CA-4CAE-B517-C584691DBDB4}.Release|x86.ActiveCfg = Release|Any CPU
+ {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {58BA0A9C-0655-4E65-BCA1-B5DD3FF62C0D}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -30,17 +30,46 @@ namespace IvyBus public class Ivy
{
/* Event */
+ /// <summary>
+ /// raise when an new IvyClient is connected
+ /// </summary>
public event EventHandler<IvyEventArgs> ClientConnected;
+ /// <summary>
+ /// raise when an new IvyClient is disconnected
+ /// </summary>
public event EventHandler<IvyEventArgs> ClientDisconnected;
+ /// <summary>
+ /// raise when a direct message is received
+ /// </summary>
public event EventHandler<IvyEventArgs> DirectMessageReceived;
+ /// <summary>
+ /// raise when some IvyClient ask me to die
+ /// </summary>
public event EventHandler<IvyDieEventArgs> DieReceived;
+ /// <summary>
+ /// raise when an IvyClient register a binding
+ /// </summary>
public event EventHandler<IvyEventArgs> BindingAdd;
+ /// <summary>
+ /// raise when an IvyClient unregister a binding
+ /// </summary>
public event EventHandler<IvyEventArgs> BindingRemove;
+ /// <summary>
+ /// raise when an IvyClient binding is filteredout
+ /// </summary>
public event EventHandler<IvyEventArgs> BindingFilter;
+ /// <summary>
+ /// raise when an IvyClient changer a binding
+ /// </summary>
public event EventHandler<IvyEventArgs> BindingChange;
+ /// <summary>
+ /// raise when an error message is received
+ /// </summary>
public event EventHandler<IvyEventArgs> ErrorMessage;
-
+ /// <summary>
+ /// Flag for displaying internal debug message of the protocol intrinsics
+ /// </summary>
public static bool DebugProtocol
{
get
@@ -53,7 +82,10 @@ namespace IvyBus }
}
-
+ /// <summary>
+ /// Language for the Ivy SendMsg formating default en-US
+ /// ie: send point on float value sent
+ /// </summary>
public CultureInfo Culture
{
get
@@ -92,7 +124,9 @@ namespace IvyBus }
}
- /// <summary>AppId the Application Unique ID</summary>
+ /// <summary>
+ /// AppId the Application Unique ID
+ /// </summary>
public string AppId
{
@@ -103,7 +137,9 @@ namespace IvyBus }
-
+ /// <summary>
+ /// the Ivy Protocol version
+ /// </summary>
public int ProtocolVersion
{
get
@@ -113,8 +149,9 @@ namespace IvyBus }
- /// <summary>IsRunning is the bus Started and connected ?</summary>
-
+ /// <summary>
+ /// IsRunning is the bus Started and connected ?
+ /// </summary>
public bool IsRunning
{
get
@@ -167,6 +204,9 @@ namespace IvyBus private Thread serverThread; // to ensure quick communication of the end
private AutoResetEvent tcplistener_running;
+ /// <summary>
+ /// the Ivy Assembly version
+ /// </summary>
static public Version Version
{
get { return Assembly.GetExecutingAssembly().GetName().Version; }
@@ -200,7 +240,8 @@ namespace IvyBus /// <summary>
- /// Initializes a new instance of the <see cref="T:Ivy"/> class.
+ /// Initializes a new instance of the Ivy Bus.
+ /// Readies the structures for the software bus connexion.
/// </summary>
public Ivy()
{
@@ -351,7 +392,10 @@ namespace IvyBus OnClientRemoveBinding(new IvyEventArgs(clnt, id, clientbind.binding.Expression));
}
- // Autobinding on static method
+ /// <summary>
+ /// Automatic binding on static method of a Type
+ /// </summary>
+ /// <param name="type"></param>
public void BindAttribute(Type type)
{
if (type == null) return;
@@ -374,7 +418,12 @@ namespace IvyBus }
}
}
- // Autobinding on instance method
+
+
+ /// <summary>
+ /// Autobinding on instance method
+ /// </summary>
+ /// <param name="target"></param>
public void BindAttribute(object target)
{
if (target == null) return;
@@ -398,6 +447,10 @@ namespace IvyBus }
// Autobinding on IvyBindingAttribute method
+ /// <summary>
+ /// Automatic binding of IvyBindAttribute in an assembly
+ /// </summary>
+ /// <param name="target"></param>
public void BindAttribute(Assembly target)
{
if (target != null)
@@ -477,22 +530,7 @@ namespace IvyBus clients.Sort();
}
}
- /* a small private method for debbugging purposes */
-
- public static string Domains(string toParse)
- {
- string domainbus = GetDomain(toParse);
- StringBuilder s = new StringBuilder("broadcasting on ");
- Ivy.Domain[] d = parseDomains(domainbus);
- for (int index = 0; index < d.Length; index++)
- {
- s.Append(d[index].Domainaddr);
- s.Append(":");
- s.Append(d[index].Port);
- s.Append(" ");
- }
- return s.ToString();
- }
+
internal static Domain[] parseDomains(string domainbus)
{
@@ -584,6 +622,7 @@ namespace IvyBus {
this.Join(Timeout.Infinite);
}
+
/// <summary>
/// Send a formated message to someone on the bus
/// </summary>
@@ -673,7 +712,11 @@ namespace IvyBus return count;
}
- //
+ /// <summary>
+ /// Make a binding to a message using regular expresssion
+ /// </summary>
+ /// <param name="newBinding"></param>
+ /// <returns></returns>
public int BindMsg(IvyApplicationBinding newBinding)
{
newBinding.Key = Interlocked.Increment(ref serial);
@@ -729,7 +772,8 @@ namespace IvyBus {
try
{
- c.stream.TokenDelBinding(id);
+ if ( c.stream != null )
+ c.stream.TokenDelBinding(id);
}
catch (IOException)
{
@@ -739,6 +783,12 @@ namespace IvyBus }
lock (bindings) bindings.Remove(id);
}
+ /// <summary>
+ /// Change a binding already registred
+ /// </summary>
+ /// <param name="id"></param>
+ /// <param name="expression"></param>
+ /// <returns></returns>
public int ChangeMsg(int id, string expression)
{
IvyApplicationBinding newbind;
@@ -1048,7 +1098,10 @@ namespace IvyBus }
-
+ /// <summary>
+ /// return the first non loopback adress
+ /// on a one network interface machine it will be my IP adresse
+ /// </summary>
public static IPAddress LocalIP
{
get
@@ -1065,7 +1118,11 @@ namespace IvyBus return returnaddr;
}
}
-
+ /// <summary>
+ /// Get the FDQN Domain from a string
+ /// </summary>
+ /// <param name="domainBus"></param>
+ /// <returns></returns>
public static string GetDomain(string domainBus)
{
#if (PocketPC) // TODO integrate in normal version
@@ -1264,7 +1321,11 @@ namespace IvyBus }
}
-
+ /// <summary>
+ /// check Validity of Ivy Bus Domain
+ /// </summary>
+ /// <param name="domain"></param>
+ /// <returns></returns>
public static bool ValidatingDomain(string domain)
{
// domain if of the form ip1[:port][,ip2[:port]] with ip of the form n1.n2.n3.n4
diff --git a/Ivy/Ivy.csproj b/Ivy/Ivy.csproj index 5076a47..38af05b 100644 --- a/Ivy/Ivy.csproj +++ b/Ivy/Ivy.csproj @@ -1,7 +1,7 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F2F03CF7-0087-4EDB-AD15-80C9E8DA2617}</ProjectGuid>
<SccProjectName>SAK</SccProjectName>
@@ -171,6 +171,7 @@ </ItemGroup>
<ItemGroup>
<None Include="app.config" />
+ <None Include="ClassDiagram1.cd" />
<None Include="Ivy.snippet" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Ivy/IvyClient.cs b/Ivy/IvyClient.cs index 7f29e91..8421443 100644 --- a/Ivy/IvyClient.cs +++ b/Ivy/IvyClient.cs @@ -37,6 +37,9 @@ namespace IvyBus return (other.clientPriority - clientPriority);
}
+ /// <summary>
+ /// the client application Name
+ /// </summary>
public String ApplicationName
{
get
@@ -68,6 +71,9 @@ namespace IvyBus }
}
+ /// <summary>
+ /// adress of the client
+ /// </summary>
public IPAddress RemoteAddress
{
get
@@ -76,6 +82,9 @@ namespace IvyBus }
}
+ /// <summary>
+ /// port of the client
+ /// </summary>
public int RemotePort
{
get
@@ -250,11 +259,19 @@ namespace IvyBus {
}
catch (IOException ioe)
- {
- if (!(ioe.InnerException is SocketException))
- throw new IvyException(ioe.Message);
- if (((SocketException)ioe.InnerException).SocketErrorCode != SocketError.ConnectionReset)
+ {
+ SocketException se = ioe.InnerException as SocketException;
+ if (se != null)
+ {
+ if (!(se.SocketErrorCode == SocketError.ConnectionReset ||
+ se.SocketErrorCode == SocketError.ConnectionAborted))
+
+ throw new IvyException(ioe.Message);
+ }
+ else
+ {
throw new IvyException(ioe.Message);
+ }
}
// stop the thread and close the stream
@@ -558,9 +575,12 @@ namespace IvyBus {
Ivy.traceProtocol(Resources.IvyClient, Resources.PingReceive + appName + " : " + arg);
}
-
-
-
+
+
+
+ /// <summary>
+ /// return full Application name pair
+ /// </summary>
public override String ToString()
{
return Resources.IvyClient+ " " + bus.appName + ":" + appName;
@@ -587,6 +607,9 @@ namespace IvyBus }
Ivy.traceProtocol(Resources.IvyClient,Resources.PingerThreadStopped);
}
+ /// <summary>
+ /// stop the pinger Thread
+ /// </summary>
public virtual void StopPinging()
{
isPinging = false;
@@ -608,14 +631,15 @@ namespace IvyBus if (disposing)
{
// Free other state (managed objects).
+ if (stream != null)
+ {
+ stream.Close();
+ stream = null;
+ }
}
// Free your own state (unmanaged objects).
// Set large fields to null.
- if (stream != null)
- {
- stream.Close();
- stream = null;
- }
+
}
// Use C# destructor syntax for finalization code.
diff --git a/Ivy/IvyEventArgs.cs b/Ivy/IvyEventArgs.cs index a08f314..279f7c4 100644 --- a/Ivy/IvyEventArgs.cs +++ b/Ivy/IvyEventArgs.cs @@ -15,20 +15,32 @@ namespace IvyBus private int id;
private string arg;
+ /// <summary>
+ /// the client who raise the event
+ /// </summary>
public IvyClient Client
{
get { return client; }
}
+ /// <summary>
+ /// the id argument of the message
+ /// </summary>
public int Id
{
get { return id; }
}
+ /// <summary>
+ /// the general purpose argument of the event
+ /// </summary>
public string Argument
{
get { return arg; }
}
+ /// <summary>
+ /// Args of Ivy generated events
+ /// </summary>
public IvyEventArgs(IvyClient app, int id, string arg)
{
this.client = app;
@@ -41,46 +53,57 @@ namespace IvyBus /* return value for Die Event */
private bool forceExit;
+ /// <summary>
+ /// should we exit
+ /// </summary>
+ /// <remarks>
+ /// by default the Ivy bus will make a call to Exit
+ /// set this flags to false if you wan't your application to survive
+ /// </remarks>
+ /// <value>true</value>
public bool ForceExit
{
get { return forceExit; }
set { forceExit = value; }
}
+ /// <summary>
+ /// Arg of the Die Event
+ /// </summary>
public IvyDieEventArgs(IvyClient app, int id, string arg)
: base(app, id, arg)
{
forceExit = true;
}
}
- public class IvyMessageEventArgs : EventArgs
+ public class IvyMessageEventArgs : IvyEventArgs
{
- private IvyClient client;
- private int id;
- private string[] args;
-
- public IvyClient Client
- {
- get { return client; }
- }
-
- public int Id
- {
- get { return id; }
- }
+ private string[] arg_list;
+ /// <summary>
+ /// retreive all the arguments
+ /// </summary>
+ /// <returns></returns>
public string[] GetArguments()
{
- return (string[])args.Clone();
+ return (string[])arg_list.Clone();
}
+
+ /// <summary>
+ /// retreive the argument at specified index
+ /// </summary>
+ /// <param name="index"></param>
+ /// <returns></returns>
public string this[int index]
{
- get { return args[index]; }
+ get { return arg_list[index]; }
}
+ /// <summary>
+ /// Arg for the Normal Ivy Message received
+ /// </summary>
public IvyMessageEventArgs(IvyClient app, int id, string[] args)
+ : base( app, id, null)
{
- this.client = app;
- this.id = id;
- this.args = args;
+ this.arg_list = args;
}
}
}
diff --git a/Ivy/IvyUDPStream.cs b/Ivy/IvyUDPStream.cs index 986a550..0e64381 100644 --- a/Ivy/IvyUDPStream.cs +++ b/Ivy/IvyUDPStream.cs @@ -77,19 +77,20 @@ namespace IvyBus if (disposing)
{
// Free other state (managed objects).
+ if (out_stream != null)
+ {
+ out_stream.Close();
+ out_stream = null;
+ }
+ if (in_stream != null)
+ {
+ in_stream.Close();
+ in_stream = null;
+ }
}
// Free your own state (unmanaged objects).
// Set large fields to null.
- if (out_stream != null)
- {
- out_stream.Close();
- out_stream = null;
- }
- if (in_stream != null)
- {
- in_stream.Close();
- in_stream = null;
- }
+
}
#endregion
}
diff --git a/Ivy/IvyWatcher.cs b/Ivy/IvyWatcher.cs index b985ada..cc3fab1 100644 --- a/Ivy/IvyWatcher.cs +++ b/Ivy/IvyWatcher.cs @@ -81,9 +81,10 @@ namespace IvyBus }
}
- /// <summary> the behaviour of each thread watching the UDP socket.
+ /// <summary>
+ /// the behaviour of each thread watching the UDP socket.
/// </summary>
- public void Run()
+ private void Run()
{
Ivy.traceProtocol(Resources.IvyWatcher, "beginning of a watcher Thread");
@@ -172,7 +173,9 @@ namespace IvyBus Ivy.traceProtocol(Resources.IvyWatcher, "ending stopping an IvyWatcher");
}
}
-
+ /// <summary>
+ /// send the boradcst message on all domains
+ /// </summary>
internal virtual void start()
{
lock (stream)
@@ -197,14 +200,15 @@ namespace IvyBus if (disposing)
{
// Free other state (managed objects).
+ if (stream != null)
+ {
+ stream.Close();
+ stream = null;
+ }
}
// Free your own state (unmanaged objects).
// Set large fields to null.
- if (stream != null)
- {
- stream.Close();
- stream = null;
- }
+
}
#endregion
diff --git a/IvyControl/IvyApplicationBindingControl.cs b/IvyControl/IvyApplicationBindingControl.cs index c4c236f..5772295 100644 --- a/IvyControl/IvyApplicationBindingControl.cs +++ b/IvyControl/IvyApplicationBindingControl.cs @@ -4,6 +4,7 @@ using System.Collections.Specialized; using System.Text;
using System.ComponentModel;
using System.Threading;
+using System.Collections.ObjectModel;
namespace IvyBus
{
@@ -34,21 +35,12 @@ namespace IvyBus [Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
#endif
- public ushort Key
+ public int Key
{
get { return binding.Key; }
set { binding.Key = value; }
}
-#if (!PocketPC)
- [Browsable(false)]
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-#endif
- public object[] Args
- {
- get { return binding.Args; }
- set { binding.Args = value; }
- }
#if (!PocketPC)
[Category("Ivy")]
@@ -63,7 +55,7 @@ namespace IvyBus {
get
{
- return binding.FormatedExpression;
+ return binding.FormattedExpression;
}
}
@@ -83,7 +75,7 @@ namespace IvyBus [Description("Arguments used when formating the expression")]
#endif
- public List<string> Arguments
+ public Collection<string> Arguments
{
get
{
@@ -116,6 +108,7 @@ namespace IvyBus {
container.Add(this);
}
+
}
}
diff --git a/IvyControl/IvyControl.cs b/IvyControl/IvyControl.cs index a432914..20b43be 100644 --- a/IvyControl/IvyControl.cs +++ b/IvyControl/IvyControl.cs @@ -25,6 +25,7 @@ namespace IvyBus #if (!PocketPC)
using System.ComponentModel.Design;
+ using System.Collections.ObjectModel;
#endif
// using System.Drawing.Design;
@@ -202,24 +203,6 @@ namespace IvyBus }
}
-
- /// <summary>AppPriority the Application Priority: the clients list is sorted against priority</summary>
-#if (!PocketPC)
- [Category("Ivy")]
-#endif
- [DefaultValue(Ivy.DEFAULT_PRIORITY)]
- public ushort AppPriority
- {
- set
- {
- ivy.AppPriority = value;
- }
- get
- {
- return ivy.AppPriority;
- }
-
- }
///<summary>SentMessageClasses the first word token of sent messages
///<remarks> optimise the parsing process when sending messages </remarks>
@@ -231,7 +214,7 @@ namespace IvyBus // sinon bug System.String constructor not found !
[Editor("System.Windows.Forms.Design.StringCollectionEditor, System.Design", "System.Drawing.Design.UITypeEditor, System.Drawing")]
#endif
- public List<string> SentMessageFilter
+ public Collection<string> SentMessageFilter
{
get
{
@@ -293,7 +276,7 @@ namespace IvyBus #endif
Assembly assembly = Assembly.GetCallingAssembly();
if ( assembly != this.GetType().Assembly )
- ivy.BindAttibute(assembly);
+ ivy.BindAttribute(assembly);
}
public IvyControl(IContainer container)
: this()
@@ -303,7 +286,7 @@ namespace IvyBus //TODO Autobinding attribute
Assembly assembly = Assembly.GetCallingAssembly();
if (assembly != this.GetType().Assembly)
- ivy.BindAttibute(assembly);
+ ivy.BindAttribute(assembly);
}
/// <summary>
/// Readies the structures for the software bus connexion.
@@ -337,7 +320,7 @@ namespace IvyBus //TODO Autobinding attribute
Assembly assembly = Assembly.GetCallingAssembly();
if (assembly != this.GetType().Assembly)
- ivy.BindAttibute(assembly);
+ ivy.BindAttribute(assembly);
}
protected override void Dispose(bool disposing)
@@ -375,7 +358,7 @@ namespace IvyBus return ivy.SendMsg(format, args);
}
//
- public ushort BindMsg(IvyApplicationBinding newbind)
+ public int BindMsg(IvyApplicationBinding newbind)
{
return ivy.BindMsg(newbind);
}
@@ -392,7 +375,7 @@ namespace IvyBus /// by another agent. A program doesn't receive its own messages.
/// </remarks>
//
- public ushort BindMsg(string regexp, EventHandler<IvyMessageEventArgs> callback, params object[] args)
+ public int BindMsg(string regexp, EventHandler<IvyMessageEventArgs> callback, params object[] args)
{
return ivy.BindMsg(regexp, callback,args);
}
@@ -401,7 +384,7 @@ namespace IvyBus /// unsubscribes a regular expression
/// </summary>
/// <param name="id">the id of the regular expression, returned when it was bound</param>
- public void UnbindMsg(ushort id)
+ public void UnbindMsg(int id)
{
ivy.UnbindMsg(id);
}
@@ -444,7 +427,7 @@ namespace IvyBus /// </summary>
/// <param name="name">The name of the Ivy agent you're looking for</param>
/// <returns></returns>
- public List<IvyClient> GetClientsByName(string name)
+ public ReadOnlyCollection<IvyClient> GetClientsByName(string name)
{
return ivy.GetClientsByName( name );
diff --git a/IvyControl/IvyControl.csproj b/IvyControl/IvyControl.csproj index 786dc02..55ff36a 100644 --- a/IvyControl/IvyControl.csproj +++ b/IvyControl/IvyControl.csproj @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,6 +13,11 @@ <SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -31,6 +36,26 @@ <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
diff --git a/IvyControl/IvyDomain.cs b/IvyControl/IvyDomain.cs index 7099db7..36e749a 100644 --- a/IvyControl/IvyDomain.cs +++ b/IvyControl/IvyDomain.cs @@ -8,7 +8,7 @@ namespace IvyBus {
public partial class IvyDomain : UserControl
{
- private string domain = "";
+ private string domain = string.Empty;
public event EventHandler DomainChanged;
#if (!PocketPC)
[Category("Ivy")]
diff --git a/IvyDaemon/IvyDaemon.cs b/IvyDaemon/IvyDaemon.cs index 8c0b069..3924df2 100644 --- a/IvyDaemon/IvyDaemon.cs +++ b/IvyDaemon/IvyDaemon.cs @@ -87,7 +87,7 @@ namespace IvyDaemon */
bus = new Ivy(name, name + " ready");
if (!quiet)
- System.Console.Out.WriteLine("broadcasting on " + Ivy.Domains(domain));
+ System.Console.Out.WriteLine("broadcasting on " + Ivy.GetDomain(domain));
bus.Start(domain);
if (!quiet)
System.Console.Out.WriteLine("listening on " + servicePort);
diff --git a/IvyDaemon/IvyDaemon.csproj b/IvyDaemon/IvyDaemon.csproj index 1dc6409..903b5e9 100644 --- a/IvyDaemon/IvyDaemon.csproj +++ b/IvyDaemon/IvyDaemon.csproj @@ -1,7 +1,7 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{B10AB29F-D678-4472-9BA3-D627262E14E1}</ProjectGuid>
<SccProjectName>SAK</SccProjectName>
@@ -49,6 +49,8 @@ <WebPage>publish.htm</WebPage>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <ApplicationRevision>2</ApplicationRevision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -125,7 +127,6 @@ </ItemGroup>
<ItemGroup>
<None Include="app.config" />
- <None Include="IvyDaemon_TemporaryKey.pfx" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/IvyDaemon/Properties/Settings.Designer.cs b/IvyDaemon/Properties/Settings.Designer.cs index 7555e19..afa5d91 100644 --- a/IvyDaemon/Properties/Settings.Designer.cs +++ b/IvyDaemon/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------
// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
+// Ce code a été généré par un outil.
+// Version du runtime :2.0.50727.1433
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+// le code est régénéré.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -12,7 +12,7 @@ namespace IvyDaemon.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/IvyFilter/Filter.cs b/IvyFilter/Filter.cs index 03e2435..31ed364 100644 --- a/IvyFilter/Filter.cs +++ b/IvyFilter/Filter.cs @@ -55,7 +55,12 @@ namespace IvyFilter nbmsg = n;
bus = new Ivy("Filter", "Filter ready");
if (f)
- bus.SentMessageFilter.AddRange(filter);
+ {
+ foreach (string str in filter)
+ {
+ bus.SentMessageFilter.Add(str);
+ }
+ }
bus.BindingAdd += new EventHandler<IvyEventArgs>(bus_BindingAdd);
bus.BindingRemove += new EventHandler<IvyEventArgs>(bus_BindingRemove);
bus.BindingFilter += new EventHandler<IvyEventArgs>(bus_BindingFilter);
diff --git a/IvyFilter/IvyFilter.csproj b/IvyFilter/IvyFilter.csproj index 5dbc3cb..55deff5 100644 --- a/IvyFilter/IvyFilter.csproj +++ b/IvyFilter/IvyFilter.csproj @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,6 +13,11 @@ <SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
diff --git a/IvyPPC/IvyDomain.resx b/IvyPPC/IvyDomain.resx index ff31a6d..20181d0 100644 --- a/IvyPPC/IvyDomain.resx +++ b/IvyPPC/IvyDomain.resx @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<root>
- <!--
+ <!--
Microsoft ResX Schema
Version 2.0
@@ -59,62 +59,50 @@ : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="type" type="xsd:string"/>
+ <xsd:attribute name="mimetype" type="xsd:string"/>
+ <xsd:attribute ref="xml:space"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string"/>
+ <xsd:attribute name="name" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+ <xsd:attribute ref="xml:space"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype"><value>text/microsoft-resx</value></resheader><resheader name="version"><value>2.0</value></resheader><resheader name="reader"><value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader><resheader name="writer"><value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader></root>
diff --git a/IvyPPC/IvyPPC.csproj b/IvyPPC/IvyPPC.csproj index c1c8af8..6de81b6 100644 --- a/IvyPPC/IvyPPC.csproj +++ b/IvyPPC/IvyPPC.csproj @@ -1,8 +1,8 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7E5552BD-0262-4C02-B0CE-E96305CFCD6D}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -21,6 +21,12 @@ <SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <NativePlatformName>Pocket PC 2003</NativePlatformName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -107,4 +113,5 @@ <Target Name="AfterBuild">
</Target>
-->
+ <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
</Project>
\ No newline at end of file diff --git a/IvyPerf/IvyPerf.csproj b/IvyPerf/IvyPerf.csproj index c3742e6..6ff143f 100644 --- a/IvyPerf/IvyPerf.csproj +++ b/IvyPerf/IvyPerf.csproj @@ -1,7 +1,7 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{839C9A55-7EFD-4326-95C3-2960DF390FF2}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -33,6 +33,8 @@ <ManifestKeyFile>IvyPerf_TemporaryKey.pfx</ManifestKeyFile>
<GenerateManifests>true</GenerateManifests>
<SignManifests>true</SignManifests>
+ <IsWebBootstrapper>true</IsWebBootstrapper>
+ <OldToolsVersion>2.0</OldToolsVersion>
<PublishUrl>\\samba\fcolin\public_html\ClickOnce\IvyPerf\</PublishUrl>
<Install>true</Install>
<InstallFrom>Web</InstallFrom>
@@ -44,8 +46,9 @@ <UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<InstallUrl>http://www.tls.cena.fr/~fcolin/ClickOnce/IvyPerf/</InstallUrl>
+ <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>true</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -121,14 +124,21 @@ </ProjectReference>
</ItemGroup>
<ItemGroup>
- <None Include="IvyPerf_TemporaryKey.pfx" />
- </ItemGroup>
- <ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
<Visible>False</Visible>
- <ProductName>.NET Framework 2.0</ProductName>
+ <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
diff --git a/IvyProbe/IvyProbe.Designer.cs b/IvyProbe/IvyProbe.Designer.cs index e0109e3..af5222a 100644 --- a/IvyProbe/IvyProbe.Designer.cs +++ b/IvyProbe/IvyProbe.Designer.cs @@ -161,8 +161,8 @@ namespace IvyProbe // ivyApplicationBinding1
//
this.ivyApplicationBinding1.Arguments.Add("Name");
- this.ivyApplicationBinding1.Binding = IvyBus.BindingType.Regexp;
- this.ivyApplicationBinding1.Expression = "^{0}(.*)";
+ this.ivyApplicationBinding1.Binding = IvyBus.BindingType.RegularExpression;
+ this.ivyApplicationBinding1.Expression = "^%0%(.*)";
this.ivyApplicationBinding1.Callback += new System.EventHandler<IvyBus.IvyMessageEventArgs>(this.ivyprobe);
//
// IvyProbe
@@ -179,7 +179,7 @@ namespace IvyProbe this.Controls.Add(this.tbRegexp);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
- this.DoubleBuffered = true;
+ //this.DoubleBuffered = true;
this.Name = "IvyProbe";
this.Text = "IvyProbe";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.IvyProbe_FormClosed);
diff --git a/IvyProbe/IvyProbe.cs b/IvyProbe/IvyProbe.cs index d6ef049..270dbd8 100644 --- a/IvyProbe/IvyProbe.cs +++ b/IvyProbe/IvyProbe.cs @@ -8,6 +8,7 @@ namespace IvyProbe using System.Runtime.Serialization.Formatters.Binary;
using System.Reflection;
using System.Net;
+ using System.Text;
partial class IvyProbe : System.Windows.Forms.Form
{
@@ -23,6 +24,7 @@ namespace IvyProbe private void append(string s)
{
// je mettrais bien la date, aussi.
+ if ( ! ta.IsDisposed )
ta.AppendText(s + "\r\n");
}
@@ -44,11 +46,16 @@ namespace IvyProbe }
private void receive(object sender, IvyMessageEventArgs e)
{
- string receive_str = "client " + e.Client.ApplicationName + " envoie: [";
- receive_str += string.Join(",", e.Arguments);
- receive_str += "]";
- receive_str += " for '" + ((IvyApplicationBinding)sender).FormatedExpression + "'";
- append(receive_str);
+ StringBuilder sb = new StringBuilder();
+ sb.Append("client ");
+ sb.Append(e.Client.ApplicationName);
+ sb.Append(" envoie: [");
+ sb.Append( string.Join(",", e.GetArguments()));
+ sb.Append("]");
+ sb.Append(" for '");
+ sb.Append(((IvyApplicationBinding)sender).FormattedExpression);
+ sb.Append("'");
+ append(sb.ToString());
}
public void RegexpCB(System.Object event_sender, System.EventArgs e)
{
diff --git a/IvyProbe/IvyProbe.csproj b/IvyProbe/IvyProbe.csproj index 8be9885..60a4df2 100644 --- a/IvyProbe/IvyProbe.csproj +++ b/IvyProbe/IvyProbe.csproj @@ -1,7 +1,7 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5EFDDE31-9A31-43EB-8E56-6C29F7EAAD48}</ProjectGuid>
<SccProjectName>SAK</SccProjectName>
@@ -47,6 +47,8 @@ <InstallUrl>http://www.tls.cena.fr/~fcolin/ClickOnce/IvyProbe/</InstallUrl>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <ApplicationRevision>3</ApplicationRevision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -142,7 +144,6 @@ </ItemGroup>
<ItemGroup>
<None Include="app.config" />
- <None Include="IvyProbe_TemporaryKey.pfx" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/IvyProbe/Properties/Settings.Designer.cs b/IvyProbe/Properties/Settings.Designer.cs index f2b2c1a..498601b 100644 --- a/IvyProbe/Properties/Settings.Designer.cs +++ b/IvyProbe/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------
// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
+// Ce code a été généré par un outil.
+// Version du runtime :2.0.50727.1433
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+// le code est régénéré.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -12,7 +12,7 @@ namespace IvyProbe.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/IvyProbeConsole/IvyProbeConsole.cs b/IvyProbeConsole/IvyProbeConsole.cs index 516d702..72d4434 100644 --- a/IvyProbeConsole/IvyProbeConsole.cs +++ b/IvyProbeConsole/IvyProbeConsole.cs @@ -15,6 +15,7 @@ namespace IvyProbeConsole using System.Diagnostics;
using IvyBus;
using Gnu;
+ using System.Collections.ObjectModel;
/// <summary> Console implementation of the ivyprobe test program.
/// </summary>
@@ -164,7 +165,7 @@ namespace IvyProbeConsole }
if (!quiet)
- System.Console.Out.WriteLine(Ivy.Domains(domain));
+ System.Console.Out.WriteLine("broadcasting on " + Ivy.GetDomain(domain));
bus.Start(domain);
@@ -273,7 +274,7 @@ namespace IvyProbeConsole target = result.Groups["target"].Value;
ushort id = ushort.Parse(result.Groups["id"].Value);
string message = result.Groups["message"].Value;
- List<IvyClient> v = bus.GetClientsByName(target);
+ ReadOnlyCollection<IvyClient> v = bus.GetClientsByName(target);
if (v.Count == 0)
println("no Ivy client with the name \"" + target + "\"");
for (int i = 0; i < v.Count; i++)
@@ -352,7 +353,7 @@ namespace IvyProbeConsole private void receive(object sender, IvyMessageEventArgs e)
{
String s = e.Client.ApplicationName + " sent ";
- s += string.Join(",", e.Arguments);
+ s += string.Join(",", e.GetArguments());
println(s);
}
[Conditional("DEBUG")]
diff --git a/IvyProbeConsole/IvyProbeConsole.csproj b/IvyProbeConsole/IvyProbeConsole.csproj index c45b9e8..590e9e8 100644 --- a/IvyProbeConsole/IvyProbeConsole.csproj +++ b/IvyProbeConsole/IvyProbeConsole.csproj @@ -1,7 +1,7 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{19023DE7-AAD8-4EC4-8FAF-D793868F8861}</ProjectGuid>
<SccProjectName>SAK</SccProjectName>
@@ -48,6 +48,8 @@ <InstallUrl>http://www.tls.cena.fr/~fcolin/ClickOnce/IvyProbeConsole/</InstallUrl>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <ApplicationRevision>3</ApplicationRevision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -131,7 +133,6 @@ </ItemGroup>
<ItemGroup>
<None Include="app.config" />
- <None Include="IvyProbe_TemporaryKey.pfx" />
<BaseApplicationManifest Include="Properties\app.manifest" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
diff --git a/IvyProbeConsole/Properties/Settings.Designer.cs b/IvyProbeConsole/Properties/Settings.Designer.cs index 4d05e34..11b290c 100644 --- a/IvyProbeConsole/Properties/Settings.Designer.cs +++ b/IvyProbeConsole/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------
// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
+// Ce code a été généré par un outil.
+// Version du runtime :2.0.50727.1433
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+// le code est régénéré.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -12,7 +12,7 @@ namespace IvyProbeConsole.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/getopt/Arg.cs b/getopt/Arg.cs index 0b86cad..30705ee 100644 --- a/getopt/Arg.cs +++ b/getopt/Arg.cs @@ -10,6 +10,6 @@ namespace Gnu public char Flag;
public bool TakesParameter = false;
- public string Parameter = "";
+ public string Parameter = string.Empty;
}
}
diff --git a/getopt/getopt.csproj b/getopt/getopt.csproj index 3cca427..5f312f0 100644 --- a/getopt/getopt.csproj +++ b/getopt/getopt.csproj @@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
@@ -30,6 +30,7 @@ <SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
+ <OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
diff --git a/getopt/vssver2.scc b/getopt/vssver2.scc Binary files differindex 66524fe..6ff394e 100644 --- a/getopt/vssver2.scc +++ b/getopt/vssver2.scc |