Skip to content

Commit

Permalink
update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@babaq
babaq committed Nov 22, 2023
1 parent 8405394 commit 58156ca
Show file tree
Hide file tree
Showing 9 changed files with 303 additions and 303 deletions.
42 changes: 21 additions & 21 deletions Imager/Imager.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Import Project="..\packages\zeroc.ice.net.3.7.10\build\zeroc.ice.net.props" Condition="Exists('..\packages\zeroc.ice.net.3.7.10\build\zeroc.ice.net.props')" />
<Import Project="..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props')" />
<Import Project="..\packages\zeroc.ice.net.3.7.9\build\zeroc.ice.net.props" Condition="Exists('..\packages\zeroc.ice.net.3.7.9\build\zeroc.ice.net.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand Down Expand Up @@ -67,32 +67,32 @@
<ApplicationIcon>Imager.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="Glacier2, Version=3.7.9.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.9\lib\net45\Glacier2.dll</HintPath>
<Reference Include="Glacier2, Version=3.7.10.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.10\lib\net45\Glacier2.dll</HintPath>
</Reference>
<Reference Include="Ice, Version=3.7.9.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.9\lib\net45\Ice.dll</HintPath>
<Reference Include="Ice, Version=3.7.10.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.10\lib\net45\Ice.dll</HintPath>
</Reference>
<Reference Include="IceBox, Version=3.7.9.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.9\lib\net45\IceBox.dll</HintPath>
<Reference Include="IceBox, Version=3.7.10.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.10\lib\net45\IceBox.dll</HintPath>
</Reference>
<Reference Include="IceDiscovery, Version=3.7.9.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.9\lib\net45\IceDiscovery.dll</HintPath>
<Reference Include="IceDiscovery, Version=3.7.10.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.10\lib\net45\IceDiscovery.dll</HintPath>
</Reference>
<Reference Include="IceGrid, Version=3.7.9.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.9\lib\net45\IceGrid.dll</HintPath>
<Reference Include="IceGrid, Version=3.7.10.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.10\lib\net45\IceGrid.dll</HintPath>
</Reference>
<Reference Include="IceLocatorDiscovery, Version=3.7.9.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.9\lib\net45\IceLocatorDiscovery.dll</HintPath>
<Reference Include="IceLocatorDiscovery, Version=3.7.10.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.10\lib\net45\IceLocatorDiscovery.dll</HintPath>
</Reference>
<Reference Include="IcePatch2, Version=3.7.9.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.9\lib\net45\IcePatch2.dll</HintPath>
<Reference Include="IcePatch2, Version=3.7.10.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.10\lib\net45\IcePatch2.dll</HintPath>
</Reference>
<Reference Include="IceSSL, Version=3.7.9.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.9\lib\net45\IceSSL.dll</HintPath>
<Reference Include="IceSSL, Version=3.7.10.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.10\lib\net45\IceSSL.dll</HintPath>
</Reference>
<Reference Include="IceStorm, Version=3.7.9.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.9\lib\net45\IceStorm.dll</HintPath>
<Reference Include="IceStorm, Version=3.7.10.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL">
<HintPath>..\packages\zeroc.ice.net.3.7.10\lib\net45\IceStorm.dll</HintPath>
</Reference>
<Reference Include="PvGUIDotNet" />
<Reference Include="PvDotNet" />
Expand All @@ -103,7 +103,7 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="YamlDotNet, Version=13.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
<HintPath>..\packages\YamlDotNet.13.1.1\lib\net47\YamlDotNet.dll</HintPath>
<HintPath>..\packages\YamlDotNet.13.7.1\lib\net47\YamlDotNet.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -195,9 +195,9 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\zeroc.ice.net.3.7.9\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\zeroc.ice.net.3.7.9\build\zeroc.ice.net.props'))" />
<Error Condition="!Exists('..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props'))" />
<Error Condition="!Exists('..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets'))" />
<Error Condition="!Exists('..\packages\zeroc.ice.net.3.7.10\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\zeroc.ice.net.3.7.10\build\zeroc.ice.net.props'))" />
</Target>
<Import Project="..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
50 changes: 25 additions & 25 deletions Imager/generated/ImagerCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) ZeroC, Inc. All rights reserved.
//
//
// Ice version 3.7.9
// Ice version 3.7.10
//
// <auto-generated>
//
Expand Down Expand Up @@ -38,40 +38,40 @@ public partial interface Command : global::Ice.Object, CommandOperations_

namespace Imager
{
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public delegate void Callback_Command_getRecordPath(string ret);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public delegate void Callback_Command_setRecordPath(bool ret);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public delegate void Callback_Command_getDataFormat(string ret);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public delegate void Callback_Command_setDataFormat(bool ret);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public delegate void Callback_Command_getIsAcquisiting(bool ret);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public delegate void Callback_Command_setIsAcquisiting(bool ret);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public delegate void Callback_Command_getIsRecording(bool ret);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public delegate void Callback_Command_setIsRecording(bool ret);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public delegate void Callback_Command_StartRecordAndAcquisite(bool ret);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public delegate void Callback_Command_StopAcquisiteAndRecord(bool ret);
}

namespace Imager
{
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public interface CommandPrx : global::Ice.ObjectPrx
{
string getRecordPath(global::Ice.OptionalContext context = new global::Ice.OptionalContext());
Expand Down Expand Up @@ -198,45 +198,45 @@ public interface CommandPrx : global::Ice.ObjectPrx

namespace Imager
{
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public interface CommandOperations_
{
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
string getRecordPath(global::Ice.Current current = null);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
bool setRecordPath(string path, global::Ice.Current current = null);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
string getDataFormat(global::Ice.Current current = null);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
bool setDataFormat(string format, global::Ice.Current current = null);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
bool getIsAcquisiting(global::Ice.Current current = null);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
bool setIsAcquisiting(bool isacquisiting, global::Ice.Current current = null);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
bool getIsRecording(global::Ice.Current current = null);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
bool setIsRecording(bool isrecording, global::Ice.Current current = null);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
bool StartRecordAndAcquisite(global::Ice.Current current = null);

[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
bool StopAcquisiteAndRecord(global::Ice.Current current = null);
}
}

namespace Imager
{
[global::System.Runtime.InteropServices.ComVisible(false)]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
[global::System.Serializable]
public sealed class CommandPrxHelper : global::Ice.ObjectPrxHelperBase, CommandPrx
{
Expand Down Expand Up @@ -1241,7 +1241,7 @@ public static CommandPrx read(global::Ice.InputStream istr)
namespace Imager
{
[global::System.Runtime.InteropServices.ComVisible(false)]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.9")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.7.10")]
public abstract class CommandDisp_ : global::Ice.ObjectImpl, Command
{
#region Slice operations
Expand Down
4 changes: 2 additions & 2 deletions Imager/generated/SliceCompile.ImagerCommand.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<dependencies>
<source name="..\ImagerCommand.ice">
<options>
<IceHome>C:\Users\SNLC_2P\Imager\packages\zeroc.ice.net.3.7.9\build\..</IceHome>
<IceToolsPath>C:\Users\SNLC_2P\Imager\packages\zeroc.ice.net.3.7.9\build\..\tools</IceToolsPath>
<IceHome>C:\Users\SNLC_2P\Imager\packages\zeroc.ice.net.3.7.10\build\..</IceHome>
<IceToolsPath>C:\Users\SNLC_2P\Imager\packages\zeroc.ice.net.3.7.10\build\..\tools</IceToolsPath>
<OutputDir>C:\Users\SNLC_2P\Imager\Imager\generated</OutputDir>
</options>
</source>
Expand Down
4 changes: 2 additions & 2 deletions Imager/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="YamlDotNet" version="13.1.1" targetFramework="net472" />
<package id="zeroc.ice.net" version="3.7.9" targetFramework="net472" />
<package id="YamlDotNet" version="13.7.1" targetFramework="net472" />
<package id="zeroc.ice.net" version="3.7.10" targetFramework="net472" />
<package id="zeroc.icebuilder.msbuild" version="5.0.9" targetFramework="net472" />
</packages>
Loading

0 comments on commit 58156ca

Please sign in to comment.