Skip to content
This repository was archived by the owner on Jul 30, 2019. It is now read-only.

Commit 30d2dad

Browse files
Laszlo HordosLaszlo Hordos
Laszlo Hordos
authored and
Laszlo Hordos
committed
OPENICF-393 Update the dependencies
1 parent fb6b8d8 commit 30d2dad

File tree

9 files changed

+45
-42
lines changed

9 files changed

+45
-42
lines changed

‎ConnectorServerService/ConnectorServerService.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@
7575
<Reference Include="System.IdentityModel" />
7676
<Reference Include="System.ServiceModel" />
7777
<Reference Include="System.Net.Http" />
78-
<Reference Include="vtortola.WebSockets, Version=2.1.8.1, Culture=neutral, PublicKeyToken=7f78616efb4a208d, processorArchitecture=MSIL">
78+
<Reference Include="vtortola.WebSockets, Version=2.1.9.0, Culture=neutral, PublicKeyToken=7f78616efb4a208d, processorArchitecture=MSIL">
7979
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\packages\vtortola.WebSocketListener.2.1.8.1\lib\net45\vtortola.WebSockets.dll</HintPath>
80+
<HintPath>..\packages\vtortola.WebSocketListener.2.1.9.0\lib\net45\vtortola.WebSockets.dll</HintPath>
8181
</Reference>
82-
<Reference Include="vtortola.WebSockets.Rfc6455, Version=2.1.8.1, Culture=neutral, PublicKeyToken=7f78616efb4a208d, processorArchitecture=MSIL">
82+
<Reference Include="vtortola.WebSockets.Rfc6455, Version=2.1.9.0, Culture=neutral, PublicKeyToken=7f78616efb4a208d, processorArchitecture=MSIL">
8383
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\packages\vtortola.WebSocketListener.2.1.8.1\lib\net45\vtortola.WebSockets.Rfc6455.dll</HintPath>
84+
<HintPath>..\packages\vtortola.WebSocketListener.2.1.9.0\lib\net45\vtortola.WebSockets.Rfc6455.dll</HintPath>
8585
</Reference>
8686
<Reference Include="System.Threading.Tasks.Dataflow, Version=4.5.24.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8787
<SpecificVersion>False</SpecificVersion>

‎ConnectorServerService/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net45" />
4-
<!--package id="vtortola.WebSocketListener" version="2.1.8.0" targetFramework="net45" /-->
4+
<package id="vtortola.WebSocketListener" version="2.1.9.0" targetFramework="net45" />
55
</packages>

‎FrameworkServerTests/FrameworkServerTests.csproj

+15-13
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,25 @@
6161
<Reference Include="nunit.framework" />
6262
<Reference Include="System" />
6363
<Reference Include="System.IdentityModel" />
64-
<Reference Include="System.ServiceModel" />
65-
<Reference Include="System.ServiceModel.Channels" />
66-
<Reference Include="System.ServiceProcess" />
67-
<Reference Include="System.Reactive.Core">
68-
<HintPath>..\packages\Rx-Core.2.2.5\lib\net40\System.Reactive.Core.dll</HintPath>
64+
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<SpecificVersion>False</SpecificVersion>
66+
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
6967
</Reference>
70-
<Reference Include="System.Reactive.Interfaces">
71-
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net40\System.Reactive.Interfaces.dll</HintPath>
68+
<Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<SpecificVersion>False</SpecificVersion>
70+
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
7271
</Reference>
73-
<Reference Include="System.Reactive.Linq">
74-
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net40\System.Reactive.Linq.dll</HintPath>
75-
<Private>True</Private>
72+
<Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73+
<SpecificVersion>False</SpecificVersion>
74+
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
7675
</Reference>
77-
<Reference Include="System.Reactive.PlatformServices">
78-
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net40\System.Reactive.PlatformServices.dll</HintPath>
79-
<Private>True</Private>
76+
<Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<SpecificVersion>False</SpecificVersion>
78+
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
8079
</Reference>
80+
<Reference Include="System.ServiceModel" />
81+
<Reference Include="System.ServiceModel.Channels" />
82+
<Reference Include="System.ServiceProcess" />
8183
</ItemGroup>
8284
<ItemGroup>
8385
<Compile Include="WcfServiceTests.cs" />

‎FrameworkServerTests/packages.config

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Rx-Core" version="2.2.5" targetFramework="net40" requireReinstallation="True" />
4-
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net40" requireReinstallation="True" />
5-
<package id="Rx-Linq" version="2.2.5" targetFramework="net40" requireReinstallation="True" />
6-
<package id="Rx-Main" version="2.2.5" targetFramework="net40" />
7-
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net40" requireReinstallation="True" />
3+
<package id="Rx-Core" version="2.2.5" targetFramework="net452" />
4+
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net452" />
5+
<package id="Rx-Linq" version="2.2.5" targetFramework="net452" />
6+
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
7+
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net452" />
88
</packages>

‎FrameworkTests/FrameworkTests.csproj

+12-10
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,21 @@
6464
<Reference Include="System.Data.DataSetExtensions">
6565
<RequiredTargetFramework>4.0</RequiredTargetFramework>
6666
</Reference>
67-
<Reference Include="System.Reactive.Core">
68-
<HintPath>..\packages\Rx-Core.2.2.5\lib\net40\System.Reactive.Core.dll</HintPath>
67+
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<SpecificVersion>False</SpecificVersion>
69+
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
6970
</Reference>
70-
<Reference Include="System.Reactive.Interfaces">
71-
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net40\System.Reactive.Interfaces.dll</HintPath>
71+
<Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<SpecificVersion>False</SpecificVersion>
73+
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
7274
</Reference>
73-
<Reference Include="System.Reactive.Linq">
74-
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net40\System.Reactive.Linq.dll</HintPath>
75-
<Private>True</Private>
75+
<Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76+
<SpecificVersion>False</SpecificVersion>
77+
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
7678
</Reference>
77-
<Reference Include="System.Reactive.PlatformServices">
78-
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net40\System.Reactive.PlatformServices.dll</HintPath>
79-
<Private>True</Private>
79+
<Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<SpecificVersion>False</SpecificVersion>
81+
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
8082
</Reference>
8183
<Reference Include="System.Xml" />
8284
<Reference Include="System.Xml.Linq">

‎FrameworkTests/packages.config

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Rx-Core" version="2.2.5" targetFramework="net40" requireReinstallation="True" />
4-
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net40" requireReinstallation="True" />
5-
<package id="Rx-Linq" version="2.2.5" targetFramework="net40" requireReinstallation="True" />
6-
<package id="Rx-Main" version="2.2.5" targetFramework="net40" />
7-
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net40" requireReinstallation="True" />
3+
<package id="Rx-Core" version="2.2.5" targetFramework="net452" />
4+
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net452" />
5+
<package id="Rx-Linq" version="2.2.5" targetFramework="net452" />
6+
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
7+
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net452" />
88
</packages>

‎ServiceInstall/ExtBuild.proj

+3-4
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
<Target Name="AfterBuild">
3131
<ItemGroup>
32-
<AllFiles Include="..\Service\bin\$(Configuration)\*.config" KeepDuplicates="false"/>
33-
<AllFiles Include="..\Service\bin\$(Configuration)\ConnectorServer.pdb" KeepDuplicates="false"/>
32+
<AllFiles Include="..\Service\bin\$(Configuration)\ConnectorServer.*" KeepDuplicates="false"/>
33+
<!--AllFiles Include="..\Service\bin\$(Configuration)\ConnectorServer.pdb;..\Service\bin\$(Configuration)\ConnectorServer.exe" KeepDuplicates="false"/-->
3434
<AllFiles Include="..\ConnectorServerService\bin\$(Configuration)\*.*" KeepDuplicates="false"/>
3535

3636
<PowerShellScriptExecutorFactoryFiles Include="..\PowerShellScriptExecutorFactory\bin\$(Configuration)\*.ScriptExecutorFactory.*"/>
@@ -47,8 +47,7 @@
4747
<Copy SourceFiles="@(AllFiles)" DestinationFolder="bin\$(Configuration)\target" />
4848
<Copy SourceFiles="@(PowerShellScriptExecutorFactoryFiles)" DestinationFolder="bin\$(Configuration)\target" />
4949
<Copy SourceFiles="@(ShellScriptExecutorFactoryFiles)" DestinationFolder="bin\$(Configuration)\target" />
50-
<Copy SourceFiles="@(LegacyEXEFiles)" DestinationFolder="bin\$(Configuration)\target" />
51-
<Copy SourceFiles="@(EXEFiles)" DestinationFolder="bin\$(Configuration)\target" />
50+
5251
<Copy SourceFiles="..\legal\CDDLv1.txt" DestinationFolder="bin\$(Configuration)\target\legal-notices" />
5352
<Copy SourceFiles="..\legal\ForgeRock_License.txt" DestinationFolder="bin\$(Configuration)\target\legal-notices" Condition=" '$(ForgeRockLegal)' == 'true' "/>
5453
<ItemGroup>

‎packages/vtortola.WebSocketListener.2.1.8.1/lib/net45/vtortola.WebSockets.Rfc6455.dll

-32 KB
Binary file not shown.

‎packages/vtortola.WebSocketListener.2.1.8.1/lib/net45/vtortola.WebSockets.dll

-50.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)