summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcs/src/IceGrid/IceGrid.csproj17
-rw-r--r--cs/test/IceGrid/simple/AllTests.cs16
-rw-r--r--cs/test/IceGrid/simple/Server.cs2
-rwxr-xr-xcs/test/IceGrid/simple/icegridsimpleC.csproj105
-rwxr-xr-xcs/test/IceGrid/simple/icegridsimpleS.csproj105
5 files changed, 235 insertions, 10 deletions
diff --git a/cs/src/IceGrid/IceGrid.csproj b/cs/src/IceGrid/IceGrid.csproj
index 675ed4365bc..50711522ade 100755
--- a/cs/src/IceGrid/IceGrid.csproj
+++ b/cs/src/IceGrid/IceGrid.csproj
@@ -3,7 +3,7 @@
ProjectType = "Local"
ProductVersion = "7.10.3077"
SchemaVersion = "2.0"
- ProjectGuid = "{83E4E6CB-090C-44F9-A2D7-E4D6BC66EA89}"
+ ProjectGuid = "{08BA06BB-1803-4EF5-81A1-467DF5464A9E}"
>
<Build>
<Settings
@@ -74,6 +74,11 @@
Project = "{C3630502-8F67-42BF-B4CA-A21D2EA8049E}"
Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
/>
+ <Reference
+ Name = "Glacier2"
+ Project = "{F6EAFA67-FF43-4C8B-BF7F-86F79DCCDA1A}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+ />
</References>
</Build>
<Files>
@@ -89,11 +94,21 @@
BuildAction = "Compile"
/>
<File
+ RelPath = "generated\Descriptor.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "generated\Exception.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
+ RelPath = "generated\Observer.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "generated\Query.cs"
SubType = "Code"
BuildAction = "Compile"
diff --git a/cs/test/IceGrid/simple/AllTests.cs b/cs/test/IceGrid/simple/AllTests.cs
index f46d6210173..5cd6ea2fb23 100644
--- a/cs/test/IceGrid/simple/AllTests.cs
+++ b/cs/test/IceGrid/simple/AllTests.cs
@@ -108,11 +108,11 @@ public class AllTests
admin.setServerActivation("server", IceGrid.ServerActivation.Manual);
admin.stopServer("server");
}
- catch(IceGrid.ServerNotExistException ex)
+ catch(IceGrid.ServerNotExistException)
{
test(false);
}
- catch(IceGrid.NodeUnreachableException ex)
+ catch(IceGrid.NodeUnreachableException)
{
test(false);
}
@@ -124,7 +124,7 @@ public class AllTests
obj = TestIntfPrxHelper.checkedCast(@base);
test(false);
}
- catch(Ice.NoEndpointException ex)
+ catch(Ice.NoEndpointException)
{
}
try
@@ -132,7 +132,7 @@ public class AllTests
obj2 = TestIntfPrxHelper.checkedCast(@base2);
test(false);
}
- catch(Ice.NoEndpointException ex)
+ catch(Ice.NoEndpointException)
{
}
@@ -140,11 +140,11 @@ public class AllTests
{
admin.setServerActivation("server", IceGrid.ServerActivation.OnDemand);
}
- catch(IceGrid.ServerNotExistException ex)
+ catch(IceGrid.ServerNotExistException)
{
test(false);
}
- catch(IceGrid.NodeUnreachableException ex)
+ catch(IceGrid.NodeUnreachableException)
{
test(false);
}
@@ -153,7 +153,7 @@ public class AllTests
{
obj = TestIntfPrxHelper.checkedCast(@base);
}
- catch(Ice.NoEndpointException ex)
+ catch(Ice.NoEndpointException)
{
test(false);
}
@@ -161,7 +161,7 @@ public class AllTests
{
obj2 = TestIntfPrxHelper.checkedCast(@base2);
}
- catch(Ice.NoEndpointException ex)
+ catch(Ice.NoEndpointException)
{
test(false);
}
diff --git a/cs/test/IceGrid/simple/Server.cs b/cs/test/IceGrid/simple/Server.cs
index afe7f4badec..a8b489e3c0a 100644
--- a/cs/test/IceGrid/simple/Server.cs
+++ b/cs/test/IceGrid/simple/Server.cs
@@ -19,7 +19,7 @@ public class Server : Ice.Application
{
adapter.activate();
}
- catch(Ice.ObjectAdapterDeactivatedException ex)
+ catch(Ice.ObjectAdapterDeactivatedException)
{
}
communicator().waitForShutdown();
diff --git a/cs/test/IceGrid/simple/icegridsimpleC.csproj b/cs/test/IceGrid/simple/icegridsimpleC.csproj
new file mode 100755
index 00000000000..aada3a4a46a
--- /dev/null
+++ b/cs/test/IceGrid/simple/icegridsimpleC.csproj
@@ -0,0 +1,105 @@
+<VisualStudioProject>
+ <CSHARP
+ ProjectType = "Local"
+ ProductVersion = "7.10.3077"
+ SchemaVersion = "2.0"
+ ProjectGuid = "{7045EBC5-91CD-4EF2-8E1A-8475CBE47894}"
+ >
+ <Build>
+ <Settings
+ ApplicationIcon = ""
+ AssemblyKeyContainerName = ""
+ AssemblyName = "client"
+ AssemblyOriginatorKeyFile = ""
+ DefaultClientScript = "JScript"
+ DefaultHTMLPageLayout = "Grid"
+ DefaultTargetSchema = "IE50"
+ DelaySign = "false"
+ OutputType = "Exe"
+ PreBuildEvent = "$(SolutionDir)\bin\generatecs.exe $(SolutionDir) $(ProjectDir) $(ProjectName)"
+ PostBuildEvent = ""
+ RootNamespace = ""
+ RunPostBuildEvent = "OnBuildSuccess"
+ StartupObject = ""
+ >
+ <Config
+ Name = "Debug"
+ AllowUnsafeBlocks = "false"
+ BaseAddress = "285212672"
+ CheckForOverflowUnderflow = "false"
+ ConfigurationOverrideFile = ""
+ DefineConstants = "DEBUG;TRACE"
+ DocumentationFile = ""
+ DebugSymbols = "true"
+ FileAlignment = "4096"
+ IncrementalBuild = "true"
+ NoStdLib = "false"
+ NoWarn = ""
+ Optimize = "false"
+ OutputPath = ".\"
+ RegisterForComInterop = "false"
+ RemoveIntegerChecks = "false"
+ TreatWarningsAsErrors = "true"
+ WarningLevel = "4"
+ />
+ <Config
+ Name = "Release"
+ AllowUnsafeBlocks = "false"
+ BaseAddress = "285212672"
+ CheckForOverflowUnderflow = "false"
+ ConfigurationOverrideFile = ""
+ DefineConstants = "TRACE"
+ DocumentationFile = ""
+ DebugSymbols = "false"
+ FileAlignment = "4096"
+ IncrementalBuild = "true"
+ NoStdLib = "false"
+ NoWarn = ""
+ Optimize = "true"
+ OutputPath = ".\"
+ RegisterForComInterop = "false"
+ RemoveIntegerChecks = "false"
+ TreatWarningsAsErrors = "true"
+ WarningLevel = "4"
+ />
+ </Settings>
+ <References>
+ <Reference
+ Name = "System"
+ AssemblyName = "System"
+ HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+ />
+ <Reference
+ Name = "Ice"
+ Project = "{C3630502-8F67-42BF-B4CA-A21D2EA8049E}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+ />
+ <Reference
+ Name = "IceGrid"
+ Project = "{08BA06BB-1803-4EF5-81A1-467DF5464A9E}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+ />
+ </References>
+ </Build>
+ <Files>
+ <Include>
+ <File
+ RelPath = "AllTests.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Client.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "generated\Test.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ </Include>
+ </Files>
+ </CSHARP>
+</VisualStudioProject>
+
diff --git a/cs/test/IceGrid/simple/icegridsimpleS.csproj b/cs/test/IceGrid/simple/icegridsimpleS.csproj
new file mode 100755
index 00000000000..70b62adafc7
--- /dev/null
+++ b/cs/test/IceGrid/simple/icegridsimpleS.csproj
@@ -0,0 +1,105 @@
+<VisualStudioProject>
+ <CSHARP
+ ProjectType = "Local"
+ ProductVersion = "7.10.3077"
+ SchemaVersion = "2.0"
+ ProjectGuid = "{564808F1-A348-4E12-9F9B-D954CD19B089}"
+ >
+ <Build>
+ <Settings
+ ApplicationIcon = ""
+ AssemblyKeyContainerName = ""
+ AssemblyName = "server"
+ AssemblyOriginatorKeyFile = ""
+ DefaultClientScript = "JScript"
+ DefaultHTMLPageLayout = "Grid"
+ DefaultTargetSchema = "IE50"
+ DelaySign = "false"
+ OutputType = "Exe"
+ PreBuildEvent = "$(SolutionDir)\bin\generatecs.exe $(SolutionDir) $(ProjectDir) $(ProjectName)"
+ PostBuildEvent = ""
+ RootNamespace = ""
+ RunPostBuildEvent = "OnBuildSuccess"
+ StartupObject = ""
+ >
+ <Config
+ Name = "Debug"
+ AllowUnsafeBlocks = "false"
+ BaseAddress = "285212672"
+ CheckForOverflowUnderflow = "false"
+ ConfigurationOverrideFile = ""
+ DefineConstants = "DEBUG;TRACE"
+ DocumentationFile = ""
+ DebugSymbols = "true"
+ FileAlignment = "4096"
+ IncrementalBuild = "true"
+ NoStdLib = "false"
+ NoWarn = ""
+ Optimize = "false"
+ OutputPath = ".\"
+ RegisterForComInterop = "false"
+ RemoveIntegerChecks = "false"
+ TreatWarningsAsErrors = "true"
+ WarningLevel = "4"
+ />
+ <Config
+ Name = "Release"
+ AllowUnsafeBlocks = "false"
+ BaseAddress = "285212672"
+ CheckForOverflowUnderflow = "false"
+ ConfigurationOverrideFile = ""
+ DefineConstants = "TRACE"
+ DocumentationFile = ""
+ DebugSymbols = "false"
+ FileAlignment = "4096"
+ IncrementalBuild = "true"
+ NoStdLib = "false"
+ NoWarn = ""
+ Optimize = "true"
+ OutputPath = ".\"
+ RegisterForComInterop = "false"
+ RemoveIntegerChecks = "false"
+ TreatWarningsAsErrors = "true"
+ WarningLevel = "4"
+ />
+ </Settings>
+ <References>
+ <Reference
+ Name = "System"
+ AssemblyName = "System"
+ HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+ />
+ <Reference
+ Name = "Ice"
+ Project = "{C3630502-8F67-42BF-B4CA-A21D2EA8049E}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+ />
+ <Reference
+ Name = "IceGrid"
+ Project = "{08BA06BB-1803-4EF5-81A1-467DF5464A9E}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+ />
+ </References>
+ </Build>
+ <Files>
+ <Include>
+ <File
+ RelPath = "Server.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "TestI.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "generated\Test.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ </Include>
+ </Files>
+ </CSHARP>
+</VisualStudioProject>
+
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 18:35:20 +0000