This is an automated email from the ASF dual-hosted git repository.
kpvdr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git
The following commit(s) were added to refs/heads/master by this push:
new 9a39c6b QPIDIT-138: Changed amqp.netlite shims to use dotnet rather
than mono
9a39c6b is described below
commit 9a39c6b10b3cadd70d80fc2be2c984bb73094bcc
Author: Kim van der Riet <k...@europa.lan>
AuthorDate: Wed Jan 15 16:07:49 2020 -0500
QPIDIT-138: Changed amqp.netlite shims to use dotnet rather than mono
---
shims/amqpnetlite/src/CMakeLists.txt | 161 +++++++++------------
.../amqp_large_content_test/Receiver/App.config | 24 ---
.../Receiver/Properties/AssemblyInfo.cs | 57 --------
.../amqp_large_content_test/Receiver/Receiver.cs | 2 -
.../Receiver/Receiver.csproj.in | 75 +---------
.../Receiver/packages.config | 21 ---
.../src/amqp_large_content_test/Sender/App.config | 24 ---
.../Sender/Properties/AssemblyInfo.cs | 57 --------
.../src/amqp_large_content_test/Sender/Sender.cs | 5 +-
.../Sender/Sender.csproj.in | 74 +---------
.../amqp_large_content_test/Sender/packages.config | 21 ---
.../src/amqp_types_test/Receiver/App.config | 24 ---
.../Receiver/Properties/AssemblyInfo.cs | 57 --------
.../src/amqp_types_test/Receiver/Receiver.cs | 2 -
.../amqp_types_test/Receiver/Receiver.csproj.in | 75 +---------
.../src/amqp_types_test/Receiver/packages.config | 21 ---
.../src/amqp_types_test/Sender/App.config | 24 ---
.../Sender/Properties/AssemblyInfo.cs | 57 --------
.../src/amqp_types_test/Sender/Sender.cs | 7 +-
.../src/amqp_types_test/Sender/Sender.csproj.in | 74 +---------
.../src/amqp_types_test/Sender/packages.config | 21 ---
shims/rhea-js/amqp_types_test/README | 2 +-
src/python/qpid_interop_test/qit_common.py | 4 +-
src/python/qpid_interop_test/qit_shim.py | 8 +-
24 files changed, 97 insertions(+), 800 deletions(-)
diff --git a/shims/amqpnetlite/src/CMakeLists.txt
b/shims/amqpnetlite/src/CMakeLists.txt
index 26bc2d5..58a2678 100644
--- a/shims/amqpnetlite/src/CMakeLists.txt
+++ b/shims/amqpnetlite/src/CMakeLists.txt
@@ -18,9 +18,7 @@
#
# Building AMQP.Net Lite shim requires
-# * Mono version 4.2.4 or later
-# * AMQPNETLITE_LIB_DIR names directory that holds Ampq.Net.dll
-# and optionally .pdb and .xml files.
+# * DotNet version 2.1
#
# Define -DBUILD_AMQPNETLITE=ON (or OFF) at the cmake command line
# to force a build or not.
@@ -29,55 +27,38 @@ project (qpid-interop-test-amqpnetlite-shims)
cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
-# Set BUILD_AMQPNETLITE control variable based on sensed environment
-set(lite_default ON)
-find_program(PROG_MONO mono)
+# Check for presence of dotnet assembly
+MACRO (check_dotnet_assembly
+ env_var # Environment variable name to be checked
containing path to directory
+ file_name # Name of file in directory to be checked
+ found_flag) # Variable which will contain ON or OFF if
successfully found
+ if ("${${env_var}}" STREQUAL "")
+ message(STATUS "AMQP.Net Lite shim requires '${file_name}' to be in folder
located in '${env_var}' environment variable, but '${env_var}' is not defined.")
+ set(${found_flag} OFF)
+ else()
+ if (NOT EXISTS ${${env_var}})
+ # Env var "env_var" is set, check if its value is a directory
+ message(STATUS "AMQP.Net Lite shim requires '${file_name}' to be in
folder located in '${env_var}' environment variable")
+ message(STATUS "AMQP.Net Lite library directory '${${env_var}}' does not
exist.")
+ set(${found_flag} OFF)
+ else()
+ # Check file "file_name" exists in directory contained in env var
"env_var"
+ if (EXISTS ${${env_var}}/${file_name})
+ message(STATUS "Required dll found: ${${env_var}}/${file_name}")
+ else()
+ message(STATUS "AMQP.Net Lite shim requires '${file_name}' to be in
folder located in '${env_var}' environment variable, but was not found")
+ set(${found_flag} OFF)
+ endif()
+ endif()
+ endif()
+ENDMACRO(check_dotnet_assembly)
-if (PROG_MONO STREQUAL "PROG_MONO-NOTFOUND")
- message(STATUS "Program 'mono' is not found. AMQP.Net Lite shim requires
mono.")
- set(lite_default OFF)
-else ()
- # mono found. Check version
- execute_process(COMMAND mono --version OUTPUT_VARIABLE ov)
- if("${ov}" STREQUAL "")
- message(STATUS "Mono appears to be installed but the version is not
detected. AMQP.Net Lite requires mono minimum version 4.2.4.")
- set(lite_default OFF)
- else ()
- string(REPLACE " " ";" ov_list ${ov})
- list(GET ov_list 4 mono_ver)
- if (mono_ver VERSION_LESS "4.2.4")
- message(STATUS "Mono version ${mono_ver} detected. AMQP.Net Lite
requires mono minimum version 4.2.4.")
- set(lite_default OFF)
- else ()
- # check for DLL source directory
- if ("${AMQPNETLITE_LIB_DIR}" STREQUAL "")
- message(STATUS "AMQP.Net Lite shim requires Amqp.Net.dll to be in
folder located with AMQPNETLITE_LIB_DIR environment variable and
AMQPNETLITE_LIB_DIR is not defined.")
- set(lite_default OFF)
- else ()
- if (NOT EXISTS ${AMQPNETLITE_LIB_DIR})
- message(STATUS "AMQP.Net Lite shim requires Amqp.Net.dll to be in
folder located with AMQPNETLITE_LIB_DIR environment variable")
- message(STATUS "AMQP.Net Lite library directory
'${AMQPNETLITE_LIB_DIR}' does not exist.")
- set(lite_default OFF)
- else ()
- if (NOT EXISTS ${AMQPNETLITE_LIB_DIR}/Amqp.Net.dll)
- message(STATUS "AMQP.Net Lite shim requires Amqp.Net.dll to be in
folder located with AMQPNETLITE_LIB_DIR environment variable")
- message(STATUS "AMQP.Net Lite DLL does not exist in library
directory '${AMQPNETLITE_LIB_DIR}'")
- set(lite_default OFF)
- endif ()
- endif ()
- endif ()
- endif ()
- endif ()
-endif ()
-
-# Set option that controls the build process
-option(BUILD_AMQPNETLITE "Build AMQP.Net Lite shim under mono" ${lite_default})
-
-message(STATUS "BUILD_AMQPNETLITE = ${BUILD_AMQPNETLITE}")
# Configure/build/install a single test
-MACRO (define_lite_test testname)
+MACRO (define_lite_test
+ testname) # Name of test
+
# Configure the csproj files
configure_file( ${testname}/Receiver/Receiver.csproj.in
${CMAKE_CURRENT_BINARY_DIR}/${testname}/Receiver/Receiver.csproj
@@ -90,13 +71,13 @@ MACRO (define_lite_test testname)
add_custom_target(
amqpnetlite_${testname}_Sender
ALL
- COMMAND xbuild Sender.csproj > xbuild.log
+ COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${testname}/Sender/Sender.cs
${CMAKE_BINARY_DIR}/shims/amqpnetlite/src/${testname}/Sender/
+ COMMAND dotnet add package AMQPNetLite
+ COMMAND dotnet add package Newtonsoft.Json
+ COMMAND dotnet publish --output ${LITE_INSTALL_ROOT}/${testname}/Sender/
--verbosity minimal
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${testname}/Sender/Sender.csproj
${CMAKE_CURRENT_SOURCE_DIR}/${testname}/Sender/Sender.cs
- ${CMAKE_CURRENT_SOURCE_DIR}/${testname}/Sender/Properties/AssemblyInfo.cs
- ${CMAKE_CURRENT_SOURCE_DIR}/${testname}/Sender/App.config
- ${CMAKE_CURRENT_SOURCE_DIR}/${testname}/Sender/packages.config
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${testname}/Sender
COMMENT Cross compiling amqpnetlite ${testname}/Sender
)
@@ -104,53 +85,55 @@ MACRO (define_lite_test testname)
add_custom_target(
amqpnetlite_${testname}_Receiver
ALL
- COMMAND xbuild Receiver.csproj > xbuild.log
+ COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${testname}/Receiver/Receiver.cs
${CMAKE_BINARY_DIR}/shims/amqpnetlite/src/${testname}/Receiver/
+ COMMAND dotnet add package AMQPNetLite
+ COMMAND dotnet publish --output ${LITE_INSTALL_ROOT}/${testname}/Receiver/
--verbosity minimal
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${testname}/Receiver/Receiver.csproj
${CMAKE_CURRENT_SOURCE_DIR}/${testname}/Receiver/Receiver.cs
-
${CMAKE_CURRENT_SOURCE_DIR}/${testname}/Receiver/Properties/AssemblyInfo.cs
- ${CMAKE_CURRENT_SOURCE_DIR}/${testname}/Receiver/App.config
- ${CMAKE_CURRENT_SOURCE_DIR}/${testname}/Receiver/packages.config
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${testname}/Receiver
COMMENT Cross compiling amqpnetlite ${testname}/Receiver
)
- # Install
-
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${testname}/Receiver/bin/Amqp.Net.dll
- DESTINATION ${LITE_INSTALL_ROOT}/${testname}/)
-
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${testname}/Receiver/bin/Receiver.exe
- DESTINATION ${LITE_INSTALL_ROOT}/${testname}/)
-
- install(
- FILES
${CMAKE_CURRENT_BINARY_DIR}/${testname}/Receiver/bin/Receiver.exe.config
- DESTINATION ${LITE_INSTALL_ROOT}/${testname}/)
-
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${testname}/Receiver/bin/Receiver.exe.mdb
- DESTINATION ${LITE_INSTALL_ROOT}/${testname}/)
-
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${testname}/Sender/bin/Sender.exe
- DESTINATION ${LITE_INSTALL_ROOT}/${testname}/)
-
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${testname}/Sender/bin/Sender.exe.config
- DESTINATION ${LITE_INSTALL_ROOT}/${testname}/)
-
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${testname}/Sender/bin/Sender.exe.mdb
- DESTINATION ${LITE_INSTALL_ROOT}/${testname}/)
ENDMACRO (define_lite_test)
-# Stage the build
+
+
+
+set(build_amqpnetlite_default ON) # Set BUILD_AMQPNETLITE control variable
based on prerequisites being present
+set(REQUIRED_DOTNET_VERSION 3.1)
+set(BUILD_CONFIG Release) # Debug or Release
+
+# --- Check prerequisites ---
+# 1. Find dotnet
+find_program(DOTNET dotnet)
+if (DOTNET STREQUAL "DOTNET-NOTFOUND")
+ message(STATUS "Program 'dotnet' not found.")
+ set(build_amqpnetlite_default OFF)
+else()
+ # 2. dotnet found. Check required version exists
+ execute_process(COMMAND dotnet --version OUTPUT_VARIABLE ov)
+ if("${ov}" STREQUAL "")
+ message(STATUS "'dotnet' appears to be installed but version is not
detected. 'dotnet' version ${REQUIRED_DOTNET_VERSION} required.")
+ set(build_amqpnetlite_default OFF)
+ else()
+ # 3. dotnet version string obtained, isolate version number as string,
check version requirement
+ string(REGEX MATCH "[0-9]+(\\.[0-9]+)" dotnet_ver "${ov}")
+ if (${dotnet_ver} VERSION_EQUAL "${REQUIRED_DOTNET_VERSION}")
+ message(STATUS "'dotnet' version ${dotnet_ver} found.")
+ else()
+ message(STATUS "'dotnet' version ${dotnet_ver} found. 'dotnet' version
${REQUIRED_DOTNET_VERSION} required.")
+ set(build_amqpnetlite_default OFF)
+ endif()
+ endif()
+endif()
+
+# Set option that controls the build process
+option(BUILD_AMQPNETLITE "Build AMQP.Net Lite shim under dotnet
v.${REQUIRED_DOTNET_VERSION}" ${build_amqpnetlite_default})
+message(STATUS "BUILD_AMQPNETLITE = ${BUILD_AMQPNETLITE}")
+
+# --- Stage the build ---
if (BUILD_AMQPNETLITE)
- # Drop lite dll into build/packages
- file(GLOB LITE_LIBS "${AMQPNETLITE_LIB_DIR}/Amqp.Net.*")
- file(COPY ${LITE_LIBS} DESTINATION
${CMAKE_BINARY_DIR}/shims/amqpnetlite/packages/amqpnetlite/lib/net45/)
# define lite install root
set(LITE_INSTALL_ROOT
${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/shims/amqpnetlite)
diff --git a/shims/amqpnetlite/src/amqp_large_content_test/Receiver/App.config
b/shims/amqpnetlite/src/amqp_large_content_test/Receiver/App.config
deleted file mode 100644
index c60d743..0000000
--- a/shims/amqpnetlite/src/amqp_large_content_test/Receiver/App.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<configuration>
- <startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
- </startup>
-</configuration>
\ No newline at end of file
diff --git
a/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Properties/AssemblyInfo.cs
b/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Properties/AssemblyInfo.cs
deleted file mode 100644
index aa2ca21..0000000
---
a/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
- using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Receiver")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Receiver")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed
to COM
-[assembly: Guid("57860fb2-59c1-4302-b48c-982a82585116")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision
Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Receiver.cs
b/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Receiver.cs
index eda4e9c..9773906 100644
--- a/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Receiver.cs
+++ b/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Receiver.cs
@@ -27,8 +27,6 @@ using System.Threading;
using Amqp;
using Amqp.Framing;
using Amqp.Types;
-using System.Web.Script.Serialization;
-//using Newtonsoft.Json;
namespace Qpidit
{
diff --git
a/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Receiver.csproj.in
b/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Receiver.csproj.in
index 94b60a4..685a04e 100644
--- a/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Receiver.csproj.in
+++ b/shims/amqpnetlite/src/amqp_large_content_test/Receiver/Receiver.csproj.in
@@ -1,77 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
+<Project Sdk="Microsoft.NET.Sdk">
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Project ToolsVersion="14.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
- <Import
Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"
/>
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{57860FB2-59C1-4302-B48C-982A82585116}</ProjectGuid>
<OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Receiver</RootNamespace>
- <AssemblyName>Receiver</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
+ <TargetFramework>netcoreapp@REQUIRED_DOTNET_VERSION@</TargetFramework>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Amqp.Net, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\..\packages\amqpnetlite\lib\net45\Amqp.Net.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Web" />
- <Reference Include="System.Web.Extensions" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_large_content_test/Receiver/Receiver.cs"
/>
- <Compile
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_large_content_test/Receiver/Properties\AssemblyInfo.cs"
/>
- </ItemGroup>
- <ItemGroup>
- <None
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_large_content_test/Receiver/App.config"
/>
- <None
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_large_content_test/Receiver/packages.config"
/>
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
</Project>
diff --git
a/shims/amqpnetlite/src/amqp_large_content_test/Receiver/packages.config
b/shims/amqpnetlite/src/amqp_large_content_test/Receiver/packages.config
deleted file mode 100644
index 7496c87..0000000
--- a/shims/amqpnetlite/src/amqp_large_content_test/Receiver/packages.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<packages>
-</packages>
\ No newline at end of file
diff --git a/shims/amqpnetlite/src/amqp_large_content_test/Sender/App.config
b/shims/amqpnetlite/src/amqp_large_content_test/Sender/App.config
deleted file mode 100644
index c60d743..0000000
--- a/shims/amqpnetlite/src/amqp_large_content_test/Sender/App.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<configuration>
- <startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
- </startup>
-</configuration>
\ No newline at end of file
diff --git
a/shims/amqpnetlite/src/amqp_large_content_test/Sender/Properties/AssemblyInfo.cs
b/shims/amqpnetlite/src/amqp_large_content_test/Sender/Properties/AssemblyInfo.cs
deleted file mode 100644
index bc5c247..0000000
---
a/shims/amqpnetlite/src/amqp_large_content_test/Sender/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Sender")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sender")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed
to COM
-[assembly: Guid("ab0b793a-c64c-4370-9f3e-75f80cdbdbd6")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision
Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/shims/amqpnetlite/src/amqp_large_content_test/Sender/Sender.cs
b/shims/amqpnetlite/src/amqp_large_content_test/Sender/Sender.cs
index 8d0cbc7..86812a2 100644
--- a/shims/amqpnetlite/src/amqp_large_content_test/Sender/Sender.cs
+++ b/shims/amqpnetlite/src/amqp_large_content_test/Sender/Sender.cs
@@ -26,10 +26,10 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
-using System.Web.Script.Serialization;
using Amqp;
using Amqp.Framing;
using Amqp.Types;
+using Newtonsoft.Json;
// Large_content_test is driven by a list like this:
//
@@ -632,8 +632,7 @@ namespace Qpidit
String.Equals(amqpType, "symbol",
StringComparison.OrdinalIgnoreCase))
{
// Deserialize the count spec list
- JavaScriptSerializer csl = new JavaScriptSerializer();
- var itMsgs = csl.Deserialize<dynamic>(countSpec);
+ var itMsgs = JsonConvert.DeserializeObject<dynamic>(countSpec);
//if (!(itMsgs is Array))
// throw new ApplicationException(String.Format(
// "Messages are not formatted as a json list: {0}, but
as type: {1}", countSpec, itMsgs.GetType().Name));
diff --git
a/shims/amqpnetlite/src/amqp_large_content_test/Sender/Sender.csproj.in
b/shims/amqpnetlite/src/amqp_large_content_test/Sender/Sender.csproj.in
index ca59361..685a04e 100644
--- a/shims/amqpnetlite/src/amqp_large_content_test/Sender/Sender.csproj.in
+++ b/shims/amqpnetlite/src/amqp_large_content_test/Sender/Sender.csproj.in
@@ -1,76 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
+<Project Sdk="Microsoft.NET.Sdk">
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Project ToolsVersion="14.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
- <Import
Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"
/>
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{AB0B793A-C64C-4370-9F3E-75F80CDBDBD6}</ProjectGuid>
<OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Sender</RootNamespace>
- <AssemblyName>Sender</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
+ <TargetFramework>netcoreapp@REQUIRED_DOTNET_VERSION@</TargetFramework>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Amqp.Net, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\..\packages\amqpnetlite\lib\net45\Amqp.Net.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Web.Extensions" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_large_content_test/Sender/Sender.cs" />
- <Compile
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_large_content_test/Sender/Properties/AssemblyInfo.cs"
/>
- </ItemGroup>
- <ItemGroup>
- <None
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_large_content_test/Sender/App.config"
/>
- <None
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_large_content_test/Sender/packages.config"
/>
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
</Project>
diff --git
a/shims/amqpnetlite/src/amqp_large_content_test/Sender/packages.config
b/shims/amqpnetlite/src/amqp_large_content_test/Sender/packages.config
deleted file mode 100644
index 7496c87..0000000
--- a/shims/amqpnetlite/src/amqp_large_content_test/Sender/packages.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<packages>
-</packages>
\ No newline at end of file
diff --git a/shims/amqpnetlite/src/amqp_types_test/Receiver/App.config
b/shims/amqpnetlite/src/amqp_types_test/Receiver/App.config
deleted file mode 100644
index c60d743..0000000
--- a/shims/amqpnetlite/src/amqp_types_test/Receiver/App.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<configuration>
- <startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
- </startup>
-</configuration>
\ No newline at end of file
diff --git
a/shims/amqpnetlite/src/amqp_types_test/Receiver/Properties/AssemblyInfo.cs
b/shims/amqpnetlite/src/amqp_types_test/Receiver/Properties/AssemblyInfo.cs
deleted file mode 100644
index aa2ca21..0000000
--- a/shims/amqpnetlite/src/amqp_types_test/Receiver/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
- using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Receiver")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Receiver")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed
to COM
-[assembly: Guid("57860fb2-59c1-4302-b48c-982a82585116")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision
Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/shims/amqpnetlite/src/amqp_types_test/Receiver/Receiver.cs
b/shims/amqpnetlite/src/amqp_types_test/Receiver/Receiver.cs
index 78c9e88..0443606 100644
--- a/shims/amqpnetlite/src/amqp_types_test/Receiver/Receiver.cs
+++ b/shims/amqpnetlite/src/amqp_types_test/Receiver/Receiver.cs
@@ -27,8 +27,6 @@ using System.Threading;
using Amqp;
using Amqp.Framing;
using Amqp.Types;
-using System.Web.Script.Serialization;
-//using Newtonsoft.Json;
namespace Qpidit
{
diff --git a/shims/amqpnetlite/src/amqp_types_test/Receiver/Receiver.csproj.in
b/shims/amqpnetlite/src/amqp_types_test/Receiver/Receiver.csproj.in
index bc5875c..685a04e 100644
--- a/shims/amqpnetlite/src/amqp_types_test/Receiver/Receiver.csproj.in
+++ b/shims/amqpnetlite/src/amqp_types_test/Receiver/Receiver.csproj.in
@@ -1,77 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
+<Project Sdk="Microsoft.NET.Sdk">
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Project ToolsVersion="14.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
- <Import
Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"
/>
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{57860FB2-59C1-4302-B48C-982A82585116}</ProjectGuid>
<OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Receiver</RootNamespace>
- <AssemblyName>Receiver</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
+ <TargetFramework>netcoreapp@REQUIRED_DOTNET_VERSION@</TargetFramework>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Amqp.Net, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\..\packages\amqpnetlite\lib\net45\Amqp.Net.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Web" />
- <Reference Include="System.Web.Extensions" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_types_test/Receiver/Receiver.cs" />
- <Compile
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_types_test/Receiver/Properties\AssemblyInfo.cs"
/>
- </ItemGroup>
- <ItemGroup>
- <None
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_types_test/Receiver/App.config" />
- <None
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_types_test/Receiver/packages.config" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
</Project>
diff --git a/shims/amqpnetlite/src/amqp_types_test/Receiver/packages.config
b/shims/amqpnetlite/src/amqp_types_test/Receiver/packages.config
deleted file mode 100644
index 7496c87..0000000
--- a/shims/amqpnetlite/src/amqp_types_test/Receiver/packages.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<packages>
-</packages>
\ No newline at end of file
diff --git a/shims/amqpnetlite/src/amqp_types_test/Sender/App.config
b/shims/amqpnetlite/src/amqp_types_test/Sender/App.config
deleted file mode 100644
index c60d743..0000000
--- a/shims/amqpnetlite/src/amqp_types_test/Sender/App.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<configuration>
- <startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
- </startup>
-</configuration>
\ No newline at end of file
diff --git
a/shims/amqpnetlite/src/amqp_types_test/Sender/Properties/AssemblyInfo.cs
b/shims/amqpnetlite/src/amqp_types_test/Sender/Properties/AssemblyInfo.cs
deleted file mode 100644
index bc5c247..0000000
--- a/shims/amqpnetlite/src/amqp_types_test/Sender/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Sender")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Sender")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed
to COM
-[assembly: Guid("ab0b793a-c64c-4370-9f3e-75f80cdbdbd6")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision
Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/shims/amqpnetlite/src/amqp_types_test/Sender/Sender.cs
b/shims/amqpnetlite/src/amqp_types_test/Sender/Sender.cs
index ff76732..979900f 100644
--- a/shims/amqpnetlite/src/amqp_types_test/Sender/Sender.cs
+++ b/shims/amqpnetlite/src/amqp_types_test/Sender/Sender.cs
@@ -25,10 +25,10 @@ using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Threading;
-using System.Web.Script.Serialization;
using Amqp;
using Amqp.Framing;
using Amqp.Types;
+using Newtonsoft.Json;
namespace Qpidit
{
@@ -431,8 +431,7 @@ namespace Qpidit
List<Message> messagesToSend = new List<Message>();
// Deserialize the json message list
- JavaScriptSerializer jss = new JavaScriptSerializer();
- var itMsgs = jss.Deserialize<dynamic>(jsonMessages);
+ var itMsgs = JsonConvert.DeserializeObject<dynamic>(jsonMessages);
//if (!(itMsgs is Array))
// throw new ApplicationException(String.Format(
// "Messages are not formatted as a json list: {0}, but as
type: {1}", jsonMessages, itMsgs.GetType().Name));
@@ -440,7 +439,7 @@ namespace Qpidit
// Generate messages
foreach (object itMsg in itMsgs)
{
- MessageValue mv = new MessageValue(amqpType, itMsg);
+ MessageValue mv = new MessageValue(amqpType, itMsg.ToString());
mv.Encode();
messagesToSend.Add(mv.ToMessage());
}
diff --git a/shims/amqpnetlite/src/amqp_types_test/Sender/Sender.csproj.in
b/shims/amqpnetlite/src/amqp_types_test/Sender/Sender.csproj.in
index 6da7e8d..685a04e 100644
--- a/shims/amqpnetlite/src/amqp_types_test/Sender/Sender.csproj.in
+++ b/shims/amqpnetlite/src/amqp_types_test/Sender/Sender.csproj.in
@@ -1,76 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
+<Project Sdk="Microsoft.NET.Sdk">
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Project ToolsVersion="14.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
- <Import
Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"
/>
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{AB0B793A-C64C-4370-9F3E-75F80CDBDBD6}</ProjectGuid>
<OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Sender</RootNamespace>
- <AssemblyName>Sender</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'
">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
+ <TargetFramework>netcoreapp@REQUIRED_DOTNET_VERSION@</TargetFramework>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Amqp.Net, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\..\packages\amqpnetlite\lib\net45\Amqp.Net.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Web.Extensions" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_types_test/Sender/Sender.cs" />
- <Compile
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_types_test/Sender/Properties/AssemblyInfo.cs"
/>
- </ItemGroup>
- <ItemGroup>
- <None
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_types_test/Sender/App.config" />
- <None
Include="@CMAKE_CURRENT_SOURCE_DIR@/amqp_types_test/Sender/packages.config" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
</Project>
diff --git a/shims/amqpnetlite/src/amqp_types_test/Sender/packages.config
b/shims/amqpnetlite/src/amqp_types_test/Sender/packages.config
deleted file mode 100644
index 7496c87..0000000
--- a/shims/amqpnetlite/src/amqp_types_test/Sender/packages.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<packages>
-</packages>
\ No newline at end of file
diff --git a/shims/rhea-js/amqp_types_test/README
b/shims/rhea-js/amqp_types_test/README
index feb8f79..97752a7 100644
--- a/shims/rhea-js/amqp_types_test/README
+++ b/shims/rhea-js/amqp_types_test/README
@@ -30,6 +30,6 @@ The AMQP types and test values are all set within the
top-level test program.
Required modules
----------------
- rhea (https://github.com/grs/rhea.git)
+ rhea (https://github.com/amqp/rhea.git)
node-uuid (via npm)
diff --git a/src/python/qpid_interop_test/qit_common.py
b/src/python/qpid_interop_test/qit_common.py
index f79ad48..bd066da 100644
--- a/src/python/qpid_interop_test/qit_common.py
+++ b/src/python/qpid_interop_test/qit_common.py
@@ -339,8 +339,8 @@ class QitTest(object):
print('WARNING: Rhea Javascript shims not found')
# AMQP DotNetLite client
- amqpnetlite_rcv_shim = path.join(QIT_TEST_SHIM_HOME, 'amqpnetlite',
self.TEST_NAME, 'Receiver.exe')
- amqpnetlite_snd_shim = path.join(QIT_TEST_SHIM_HOME, 'amqpnetlite',
self.TEST_NAME, 'Sender.exe')
+ amqpnetlite_rcv_shim = path.join(QIT_TEST_SHIM_HOME, 'amqpnetlite',
self.TEST_NAME, 'Receiver', 'Receiver.dll')
+ amqpnetlite_snd_shim = path.join(QIT_TEST_SHIM_HOME, 'amqpnetlite',
self.TEST_NAME, 'Sender', 'Sender.dll')
if path.isfile(amqpnetlite_rcv_shim) and
path.isfile(amqpnetlite_snd_shim):
self.shim_map[qpid_interop_test.qit_shim.AmqpNetLiteShim.NAME] = \
qpid_interop_test.qit_shim.AmqpNetLiteShim(amqpnetlite_snd_shim,
amqpnetlite_rcv_shim)
diff --git a/src/python/qpid_interop_test/qit_shim.py
b/src/python/qpid_interop_test/qit_shim.py
index 916337a..4cdb639 100644
--- a/src/python/qpid_interop_test/qit_shim.py
+++ b/src/python/qpid_interop_test/qit_shim.py
@@ -54,7 +54,9 @@ class ShimProcess(subprocess.Popen):
if stderrdata: # length > 0
# Workaround for Amqp.NetLite which on some OSs produces a
spurious error message on stderr
# which should be ignored:
- if not stderrdata.startswith('Got a bad hardware address
length for an AF_PACKET'):
+ # Workaround for deprecation warning on stderr:
+ if not stderrdata.startswith('Got a bad hardware address
length for an AF_PACKET') and \
+ not "[DEP0005]" in stderrdata:
return 'stderr: %s\nstdout: %s' % (stderrdata, stdoutdata)
if not stdoutdata: # zero length
return None
@@ -174,5 +176,5 @@ class AmqpNetLiteShim(Shim):
NAME = 'AmqpNetLite'
def __init__(self, sender_shim, receiver_shim):
super(AmqpNetLiteShim, self).__init__(sender_shim, receiver_shim)
- self.send_params = ['mono', self.sender_shim]
- self.receive_params = ['mono', self.receiver_shim]
+ self.send_params = ['dotnet', self.sender_shim]
+ self.receive_params = ['dotnet', self.receiver_shim]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
