summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Ivy/Ivy.csproj32
-rw-r--r--IvyControl/IvyControl.csproj2
-rw-r--r--IvyControl_OLD/IvyDomain.Designer.cs75
-rw-r--r--IvyControl_OLD/IvyDomain.cs61
-rw-r--r--IvyControl_OLD/IvyDomain.resx120
-rw-r--r--IvyDaemon/IvyDaemon.csproj30
-rw-r--r--IvyPerf/IvyPerf.cs49
-rw-r--r--IvyPerf/IvyPerf.csproj9
-rw-r--r--IvyPerf/IvyPerf_TemporaryKey.pfxbin1676 -> 0 bytes
-rw-r--r--IvyProbe/IvyProbe.csproj41
-rw-r--r--IvyProbe/IvyProbe_TemporaryKey.pfxbin1676 -> 0 bytes
-rw-r--r--IvyProbeConsole/IvyProbeConsole.csproj2
-rw-r--r--IvyProbeConsole/IvyProbe_TemporaryKey.pfxbin1676 -> 0 bytes
13 files changed, 138 insertions, 283 deletions
diff --git a/Ivy/Ivy.csproj b/Ivy/Ivy.csproj
index ae993ae..1d4e64a 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.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F2F03CF7-0087-4EDB-AD15-80C9E8DA2617}</ProjectGuid>
<SccProjectName>SAK</SccProjectName>
@@ -102,23 +102,41 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<WarningLevel>1</WarningLevel>
+ <FileAlignment>4096</FileAlignment>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
- <DefineConstants>
- </DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
<BaseAddress>285212672</BaseAddress>
<WarningLevel>1</WarningLevel>
- <DebugType>
- </DebugType>
+ <FileAlignment>4096</FileAlignment>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x64\Debug\</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <BaseAddress>285212672</BaseAddress>
+ <WarningLevel>1</WarningLevel>
+ <FileAlignment>4096</FileAlignment>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+ <OutputPath>bin\x64\Release\</OutputPath>
+ <BaseAddress>285212672</BaseAddress>
+ <WarningLevel>1</WarningLevel>
+ <FileAlignment>4096</FileAlignment>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib">
<Name>mscorlib</Name>
@@ -208,7 +226,7 @@
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
- <PostBuildEvent>copy /b /y "$(TargetPath)" "\\samba.tls.cena.fr\projet\www-sites\www2\products\ivy\download\packages"
-</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/IvyControl/IvyControl.csproj b/IvyControl/IvyControl.csproj
index 55ff36a..ff99f72 100644
--- a/IvyControl/IvyControl.csproj
+++ b/IvyControl/IvyControl.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{9E7098F5-F4CA-4CAE-B517-C584691DBDB4}</ProjectGuid>
<OutputType>Library</OutputType>
diff --git a/IvyControl_OLD/IvyDomain.Designer.cs b/IvyControl_OLD/IvyDomain.Designer.cs
deleted file mode 100644
index 3f89b6a..0000000
--- a/IvyControl_OLD/IvyDomain.Designer.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-namespace IvyBus
-{
- partial class IvyDomain
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- this.label1 = new System.Windows.Forms.Label();
- this.ivybus = new System.Windows.Forms.TextBox();
- this.SuspendLayout();
- //
- // label1
- //
- this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)));
- this.label1.Location = new System.Drawing.Point(0, 5);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(24, 13);
- this.label1.Text = "Ivy:";
- //
- // ivybus
- //
- this.ivybus.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.ivybus.Location = new System.Drawing.Point(30, 0);
- this.ivybus.Name = "ivybus";
- this.ivybus.Size = new System.Drawing.Size(129, 20);
- this.ivybus.TabIndex = 2;
- this.ivybus.Validated += new System.EventHandler(this.ivybus_Validated);
- this.ivybus.Validating += new System.ComponentModel.CancelEventHandler(this.ivybus_Validating);
- //
- // IvyDomain
- //
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
- this.Controls.Add(this.label1);
- this.Controls.Add(this.ivybus);
- this.Name = "IvyDomain";
- this.Size = new System.Drawing.Size(159, 22);
- this.ResumeLayout(false);
-#if (!PocketPC)
- this.PerformLayout();
-#endif
-
- }
-
- #endregion
-
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.TextBox ivybus;
- }
-}
diff --git a/IvyControl_OLD/IvyDomain.cs b/IvyControl_OLD/IvyDomain.cs
deleted file mode 100644
index 7099db7..0000000
--- a/IvyControl_OLD/IvyDomain.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
-using System.Windows.Forms;
-
-namespace IvyBus
-{
- public partial class IvyDomain : UserControl
- {
- private string domain = "";
- public event EventHandler DomainChanged;
-#if (!PocketPC)
- [Category("Ivy")]
- [DefaultValue("")]
- [Bindable(true)]
-#endif
- public string Domain
- {
- get { return domain; }
- set {
- if (domain != value)
- {
- domain = value;
- ivybus.Text = domain;
- if (DomainChanged != null) DomainChanged(this, EventArgs.Empty);
- }
- }
- }
-
- public IvyDomain()
- {
- InitializeComponent();
- SetDefault();
- }
- public void SetDefault()
- {
- if (IsEmpty())
- {
- domain = Ivy.GetDomain(domain);
- ivybus.Text = domain;
- }
- }
- public bool IsEmpty()
- {
- return String.IsNullOrEmpty( domain );
- }
-
- private void ivybus_Validating(object sender, CancelEventArgs e)
- {
- e.Cancel = !Ivy.ValidatingDomain(ivybus.Text);
- }
-
- private void ivybus_Validated(object sender, EventArgs e)
- {
- if ( domain != ivybus.Text )
- Domain = ivybus.Text;
- }
-
- }
-}
diff --git a/IvyControl_OLD/IvyDomain.resx b/IvyControl_OLD/IvyDomain.resx
deleted file mode 100644
index ff31a6d..0000000
--- a/IvyControl_OLD/IvyDomain.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : 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
diff --git a/IvyDaemon/IvyDaemon.csproj b/IvyDaemon/IvyDaemon.csproj
index 903b5e9..1ecde29 100644
--- a/IvyDaemon/IvyDaemon.csproj
+++ b/IvyDaemon/IvyDaemon.csproj
@@ -32,8 +32,9 @@
<ManifestCertificateThumbprint>A4751EEE69A15B9F42D2EF22930B195D367E5103</ManifestCertificateThumbprint>
<ManifestKeyFile>IvyDaemon_TemporaryKey.pfx</ManifestKeyFile>
<GenerateManifests>true</GenerateManifests>
- <SignManifests>true</SignManifests>
+ <SignManifests>false</SignManifests>
<IsWebBootstrapper>true</IsWebBootstrapper>
+ <OldToolsVersion>2.0</OldToolsVersion>
<PublishUrl>\\samba\fcolin\public_html\ClickOnce\IvyDaemon\</PublishUrl>
<Install>true</Install>
<InstallFrom>Web</InstallFrom>
@@ -47,10 +48,11 @@
<InstallUrl>http://www.tls.cena.fr/~fcolin/ClickOnce/IvyDaemon/</InstallUrl>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
+ <ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <OldToolsVersion>2.0</OldToolsVersion>
- <ApplicationRevision>2</ApplicationRevision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -133,9 +135,29 @@
</None>
</ItemGroup>
<ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
<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>false</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>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
diff --git a/IvyPerf/IvyPerf.cs b/IvyPerf/IvyPerf.cs
index 25afd6a..794ffd8 100644
--- a/IvyPerf/IvyPerf.cs
+++ b/IvyPerf/IvyPerf.cs
@@ -14,7 +14,15 @@ namespace IvyPerf
{
static Ivy bus;
static double origin = 0;
-
+ static int nbMsgReceive = 0;
+ static int nbMsgEmit = 0;
+ static int nbMsg = 10;
+
+
+ static double minRoundTrip = 1e12;
+ static double maxRoundTrip = 0;
+ static double averageRoundTrip = 0;
+
static double currentTime() // en ms
{
double time;
@@ -30,13 +38,33 @@ namespace IvyPerf
[IvyBinding("^pong ts=(.*) tr=(.*)")]
static void Pong(object sender, IvyMessageEventArgs args)
{
+ nbMsgReceive++;
+
double current = currentTime() - origin;
double ts = double.Parse(args[0], bus.Culture );
double tr = double.Parse(args[1], bus.Culture );
double roundtrip1 = tr - ts;
double roundtrip2 = current - tr;
double roundtrip3 = current - ts;
- Console.WriteLine("round trip {0} {1} {2}", roundtrip1, roundtrip2, roundtrip3);
+
+ if (roundtrip3 > 50)
+ Console.WriteLine("slow roundtrip[{0}] min {1} av {2} max {3} ms slow={4}", nbMsgReceive, minRoundTrip, averageRoundTrip, maxRoundTrip, roundtrip3);
+
+ if (roundtrip3 > maxRoundTrip)
+ {
+ maxRoundTrip = roundtrip3;
+ }
+ if ( roundtrip3 < minRoundTrip )
+ {
+ minRoundTrip = roundtrip3;
+ }
+ averageRoundTrip = (averageRoundTrip * ( nbMsgReceive - 1 ) + roundtrip3) /nbMsgReceive;
+
+ if ( nbMsg == nbMsgReceive )
+ {
+ Console.WriteLine("roundtrip[{0}] min {1} av {2} max {3} ms\n", nbMsgReceive, minRoundTrip, averageRoundTrip, maxRoundTrip);
+ //bus->Stop();
+ }
}
/// <summary>
/// Point d'entrée principal de l'application.
@@ -44,9 +72,12 @@ namespace IvyPerf
[STAThread]
static void Main(string[] args)
{
- int timeout = 1000;
+ int timeout = 200;
if (args.Length > 0)
timeout = int.Parse(args[0]);
+ if (args.Length > 1)
+ nbMsg = int.Parse(args[1]);
+
bus = new Ivy("IvyPerf", "IvyPref ready");
bus.SentMessageFilter.Add("ping");
bus.SentMessageFilter.Add("pong");
@@ -56,11 +87,19 @@ namespace IvyPerf
//bus.BindMsg("test", testtarget);
bus.Start(null);
origin = currentTime();
- while( true )
+ Console.WriteLine("Start Sending {0} messages...", nbMsg);
+ while( true )
{
Thread.Sleep( timeout );
int count = bus.SendMsg("ping ts={0}", currentTime() - origin );
- if ( count == 0 ) Console.Write( "." );
+ if (count != 0) nbMsgEmit++;
+ if (nbMsg == nbMsgEmit)
+ {
+ Console.WriteLine("... {0} messages sent ", nbMsg);
+ Thread.Sleep(timeout);
+ break;
+ }
+
}
}
diff --git a/IvyPerf/IvyPerf.csproj b/IvyPerf/IvyPerf.csproj
index 6ff143f..feaa087 100644
--- a/IvyPerf/IvyPerf.csproj
+++ b/IvyPerf/IvyPerf.csproj
@@ -31,8 +31,8 @@
<SccProvider>SAK</SccProvider>
<ManifestCertificateThumbprint>51C861139B0DCA6D2FAD5BDB1D5280AAE1E59696</ManifestCertificateThumbprint>
<ManifestKeyFile>IvyPerf_TemporaryKey.pfx</ManifestKeyFile>
- <GenerateManifests>true</GenerateManifests>
- <SignManifests>true</SignManifests>
+ <GenerateManifests>false</GenerateManifests>
+ <SignManifests>false</SignManifests>
<IsWebBootstrapper>true</IsWebBootstrapper>
<OldToolsVersion>2.0</OldToolsVersion>
<PublishUrl>\\samba\fcolin\public_html\ClickOnce\IvyPerf\</PublishUrl>
@@ -50,6 +50,8 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetZone>LocalIntranet</TargetZone>
+ <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -140,6 +142,9 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <None Include="Properties\app.manifest" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
diff --git a/IvyPerf/IvyPerf_TemporaryKey.pfx b/IvyPerf/IvyPerf_TemporaryKey.pfx
deleted file mode 100644
index db02b60..0000000
--- a/IvyPerf/IvyPerf_TemporaryKey.pfx
+++ /dev/null
Binary files differ
diff --git a/IvyProbe/IvyProbe.csproj b/IvyProbe/IvyProbe.csproj
index 60a4df2..86dcf9b 100644
--- a/IvyProbe/IvyProbe.csproj
+++ b/IvyProbe/IvyProbe.csproj
@@ -30,10 +30,13 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<IsWebBootstrapper>true</IsWebBootstrapper>
- <ManifestCertificateThumbprint>B0F2EC88A4EE5408BAC0B7041F239A7265AA2FAA</ManifestCertificateThumbprint>
- <ManifestKeyFile>IvyProbe_TemporaryKey.pfx</ManifestKeyFile>
+ <ManifestCertificateThumbprint>24FF4FDFFB19B8FC833CEB033D0B297CE2370CB0</ManifestCertificateThumbprint>
+ <ManifestKeyFile>
+ </ManifestKeyFile>
<GenerateManifests>true</GenerateManifests>
- <SignManifests>true</SignManifests>
+ <SignManifests>false</SignManifests>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<PublishUrl>\\samba\fcolin\public_html\ClickOnce\IvyProbe\</PublishUrl>
<Install>true</Install>
<InstallFrom>Web</InstallFrom>
@@ -44,11 +47,12 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
- <InstallUrl>http://www.tls.cena.fr/~fcolin/ClickOnce/IvyProbe/</InstallUrl>
+ <InstallUrl>http://perso.tls.cena.fr/fcolin/ClickOnce/IvyProbe/</InstallUrl>
+ <ApplicationRevision>10</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <OldToolsVersion>2.0</OldToolsVersion>
- <ApplicationRevision>3</ApplicationRevision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -100,6 +104,9 @@
<Reference Include="System">
<Name>System</Name>
</Reference>
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
@@ -136,11 +143,31 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
<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>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
diff --git a/IvyProbe/IvyProbe_TemporaryKey.pfx b/IvyProbe/IvyProbe_TemporaryKey.pfx
deleted file mode 100644
index 0a205ff..0000000
--- a/IvyProbe/IvyProbe_TemporaryKey.pfx
+++ /dev/null
Binary files differ
diff --git a/IvyProbeConsole/IvyProbeConsole.csproj b/IvyProbeConsole/IvyProbeConsole.csproj
index 590e9e8..33a7b5b 100644
--- a/IvyProbeConsole/IvyProbeConsole.csproj
+++ b/IvyProbeConsole/IvyProbeConsole.csproj
@@ -33,7 +33,7 @@
<ManifestCertificateThumbprint>85867DC3A6B10DFCF74BB49E782A1BC517B0086D</ManifestCertificateThumbprint>
<ManifestKeyFile>IvyProbe_TemporaryKey.pfx</ManifestKeyFile>
<GenerateManifests>true</GenerateManifests>
- <SignManifests>true</SignManifests>
+ <SignManifests>false</SignManifests>
<TargetZone>LocalIntranet</TargetZone>
<PublishUrl>\\samba\fcolin\public_html\ClickOnce\IvyProbeConsole\</PublishUrl>
<Install>true</Install>
diff --git a/IvyProbeConsole/IvyProbe_TemporaryKey.pfx b/IvyProbeConsole/IvyProbe_TemporaryKey.pfx
deleted file mode 100644
index 0aaa160..0000000
--- a/IvyProbeConsole/IvyProbe_TemporaryKey.pfx
+++ /dev/null
Binary files differ
generated by cgit v1.1 at 2024-07-06 01:05:45 +0000