diff --git a/config/Make.rules b/config/Make.rules index 361f9c60539..349ce89c0b4 100644 --- a/config/Make.rules +++ b/config/Make.rules @@ -50,13 +50,6 @@ PLATFORMS ?= $(firstword $(supported-platforms)) # CONFIGS ?= $(default-configs) -# -# List of binary distributions to build against. Defaults to undefined, -# i.e. build all source distributions. This is useful for building -# a language mapping or tests against a binary distribution. -# -#ICE_BIN_DIST ?= - # # Third-party libraries (Ice for C++) # @@ -105,35 +98,14 @@ soversion = 38a0 # compatversion = $(version) -ifneq ($(filter all cpp obj%c,$(ICE_BIN_DIST)),) -# NOTE: on macOS, if ICE_HOME isn't set we build against /usr/local/opt/ice because the -# XCode SDK is not accessible through /usr/local -$(eval $(call create-project-dependencies,ice,$(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local/opt/ice),$(if $(filter AIX,$(os)),/opt/freeware)),cpp)) -else ifneq ($(filter compilers,$(ICE_BIN_DIST)),) -ice_compilers_dir = $(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local/opt/ice),$(system-install-dir)) -endif - -ifeq ($(filter all cpp,$(ICE_BIN_DIST)),) ice_cpp_cppflags = -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -else -ice_cpp_cppflags = $(if $(ice_includedir),-I$(ice_includedir) $(if $(ice_src_dist),-I$(ice_includedir)/generated)) -endif -ifeq ($(filter all cpp,$(ICE_BIN_DIST)),) bindir = $(call mappingdir,$(or $1,$(currentdir)),bin) -else -bindir = $(ice_bindir) -endif - -# Use the bin distribution if ICE_BIN_DIST=all or if ICE_BIN_DIST=cpp and processing a file from the cpp directory. -use-bin-dist = $(or $(filter all,$(ICE_BIN_DIST)),\ - $(and $(filter cpp,$(ICE_BIN_DIST)),$(filter %/cpp/,$(call mappingdir,$(or $1,$(currentdir)))))) - -bindir = $(if $(use-bin-dist),$(ice_bindir),$(call mappingdir,$(or $1,$(currentdir)),bin)) -libdir = $(if $(use-bin-dist),$(ice_libdir),$(call mappingdir,$(or $1,$(currentdir)),lib)) -includedir = $(if $(use-bin-dist),$(ice_includedir),$(call mappingdir,$(or $1,$(currentdir)),include)) -slicedir = $(if $(use-bin-dist),$(ice_slicedir),$(top_srcdir)/slice) -sdkdir = $(if $(use-bin-dist),$(ice_home)/sdk,$(top_srcdir)/sdk) + +bindir = $(call mappingdir,$(or $1,$(currentdir)),bin) +libdir = $(call mappingdir,$(or $1,$(currentdir)),lib) +includedir = $(call mappingdir,$(or $1,$(currentdir)),include) +slicedir = $(top_srcdir)/slice srcdir = $(call mappingdir,$(or $1,$(currentdir)),src) usr_dir_install := $(or $(filter yes,$(USR_DIR_INSTALL)),$(filter /usr%,$(prefix))) diff --git a/config/Make.rules.Darwin b/config/Make.rules.Darwin index 34b5872b56c..7584a603512 100644 --- a/config/Make.rules.Darwin +++ b/config/Make.rules.Darwin @@ -180,8 +180,6 @@ $1[$2-$3]: $$($1_dependencies) $1/.translator-$2-$3.dep -project "$1/$$(call $1_project,$2,$3)" \ -configuration "$$(call $1_configuration,$2,$3)" \ -scheme "$$(call $1_scheme,$2,$3)" \ - $(if $(ICE_BIN_DIST),HEADER_SEARCH_PATHS=../../Ice\ ../../include\ $(sdkdir)/$2.sdk/usr/include \ - LIBRARY_SEARCH_PATHS=$(sdkdir)/$2.sdk/usr/lib) \ $(if $(V),,-quiet) \ $(if $(PLATFORM_NAME),iphonesimulator,-arch `uname -m`) \ build diff --git a/cpp/BUILDING.md b/cpp/BUILDING.md index 8398be15272..ec9ff69e092 100644 --- a/cpp/BUILDING.md +++ b/cpp/BUILDING.md @@ -20,7 +20,6 @@ unnecessary. - [Windows](#windows) - [Building Ice for Linux or macOS](#building-ice-for-linux-or-macos) - [Build configurations and platforms](#build-configurations-and-platforms) - - [Ice Xcode SDK (macOS only)](#ice-xcode-sdk-macos-only) - [Building Ice for Windows](#building-ice-for-windows) - [Build Using MSBuild](#build-using-msbuild) - [Build Using Visual Studio](#build-using-visual-studio) @@ -105,9 +104,9 @@ These packages are provided with the system and can be installed with: sudo apt-get install pkg-config libdbus-1-dev libbluetooth-dev ``` -> *We have experienced problems with BlueZ versions up to and including 5.39, as -well as 5.44 and 5.45. At this time we recommend using the daemon (`bluetoothd`) -from BlueZ 5.43.* +> _We have experienced problems with BlueZ versions up to and including 5.39, as +> well as 5.44 and 5.45. At this time we recommend using the daemon (`bluetoothd`) +> from BlueZ 5.43._ #### macOS @@ -150,20 +149,6 @@ make V=1 -j8 srcs The build system supports specifying additional preprocessor, compiler and linker options with the `CPPFLAGS`, `CXXFLAGS` and `LDFLAGS` variables. -To build the test suite using a binary distribution use: - -```shell -make ICE_BIN_DIST=all -``` - -If the binary distribution you are using is not installed in a system wide location -where the C++ compiler can automatically find the header and library files, you also -need to set `ICE_HOME` - -```shell -make ICE_HOME=/opt/Ice-3.8.0 ICE_BIN_DIST=all -``` - ### Build configurations and platforms The C++ source tree supports multiple build configurations and platforms. To @@ -180,19 +165,6 @@ To build all the supported configurations and platforms: make CONFIGS=all PLATFORMS=all -j8 ``` -### Ice Xcode SDK (macOS only) - -The build system supports building Xcode SDKs for Ice. These SDKs allow you to -easily develop Ice applications with Xcode. To build Xcode SDKs, use the `xcodesdk` -configurations. The [Ice Builder for Xcode][13] must be installed before building -the SDKs: - -```shell -make CONFIGS=xcodesdk -j8 srcs # Build the C++ Xcode SDK -``` - -The Xcode SDKs are built into `ice/sdk`. - ## Building Ice for Windows ### Build Using MSBuild @@ -243,12 +215,6 @@ You can also skip the build of the test suite with the `BuildDist` target: msbuild /m msbuild\ice.proj /t:BuildDist /p:Platform=x64 ``` -To build the test suite using the NuGet binary distribution use: - -```shell -msbuild /m msbuild\ice.proj /p:ICE_BIN_DIST=all -``` - You can also sign the Ice binaries with Authenticode, by setting the following environment variables: @@ -275,7 +241,7 @@ automatically. The test suite is built using separate Visual Studio solutions: -- Ice Test Suite [msbuild/ice.test.sln](./msbuild/ice.test.sln) +- Ice Test Suite [msbuild/ice.test.sln](./msbuild/ice.test.sln) - Ice OpenSSL Test Suite [msbuild/ice.openssl.test.sln](./msbuild/ice.openssl.test.sln) The solution provides a separate project for each test component. the @@ -288,10 +254,6 @@ attempting to build the tests. For example to build the `Release/x64` tests you must have built the C++ mapping using `Release/x64`. -It is also possible to build the tests using a C++ binary distribution, to do -that you must set the `ICE_BIN_DIST` environment variable to `all` before -starting Visual Studio. - Then launch Visual Studio and open the desired test solution, you must now use NuGet package manager to restore the NuGet packages, and the build will use Ice NuGet packages instead of your local source build. @@ -373,7 +335,6 @@ Python module `zeroc-ice`, using the following command: ```shell python3 -m pip install zeroc-ice -``` In order to run the test suite on `iphoneos`, you need to build the C++ Test Controller app from Xcode: diff --git a/cpp/Makefile b/cpp/Makefile index 36a2959a2a4..4f3cf7250a1 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -21,7 +21,7 @@ $(foreach t, $(slice_translators), $(eval $(call create-translator-project,$(cal include $(foreach p,$(load_first),src/$p/Makefile.mk) include $(filter-out $(foreach p,$(load_first),%/src/$p/Makefile.mk),$(shell find $(lang_srcdir)/src -name Makefile.mk)) -$(call make-projects,$(projects),make-cpp-src-project,,$(filter all cpp,$(ICE_BIN_DIST))) +$(call make-projects,$(projects),make-cpp-src-project,,) ifeq ($(os),Darwin) $(call make-xcframeworks) diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index b4e2f225aa9..4079ff9b6bf 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -64,26 +64,22 @@ endif # $(call make-cpp-src-project,$1=project) # define make-cpp-src-project -ifeq ($(filter all cpp,$(ICE_BIN_DIST)),) $1_slicecompiler := slice2cpp $1_sliceflags += -I$(slicedir) $1_cppflags += -I$1/generated -I$(includedir) -I$(includedir)/generated $(make-project) srcs:: $1 -endif endef # # $(call make-cpp-doxygen-example-project,$1=project) # define make-cpp-doxygen-example-project -ifeq ($(filter all cpp,$(ICE_BIN_DIST)),) $1_slicecompiler := slice2cpp $1_sliceflags += -I$(slicedir) $1_cppflags += -I$(includedir) -I$(includedir)/generated $(make-project) doxygen_examples:: $1 -endif endef # diff --git a/cpp/doxygen/examples/Ice/msbuild/IceExamples.vcxproj b/cpp/doxygen/examples/Ice/msbuild/IceExamples.vcxproj index 55e53a34349..e93f32d830e 100644 --- a/cpp/doxygen/examples/Ice/msbuild/IceExamples.vcxproj +++ b/cpp/doxygen/examples/Ice/msbuild/IceExamples.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -98,15 +97,12 @@ - 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}. - - diff --git a/cpp/doxygen/examples/Ice/msbuild/packages.config b/cpp/doxygen/examples/Ice/msbuild/packages.config index a36cb289a52..2bece8161b2 100644 --- a/cpp/doxygen/examples/Ice/msbuild/packages.config +++ b/cpp/doxygen/examples/Ice/msbuild/packages.config @@ -1,5 +1,4 @@  - - \ No newline at end of file + diff --git a/cpp/msbuild/ice.cpp.props b/cpp/msbuild/ice.cpp.props index 53eb5dd2ce8..85dd0aed930 100644 --- a/cpp/msbuild/ice.cpp.props +++ b/cpp/msbuild/ice.cpp.props @@ -6,10 +6,9 @@ yes - + $(MSBuildThisFileDirectory)..\.. @@ -41,7 +40,7 @@ - + $(IceHome)\cpp\bin\$(Platform)\$(Configuration) @@ -73,7 +72,7 @@ - + $(IceHome)\cpp\include;%(AdditionalIncludeDirectories) $(IceHome)\cpp\include\generated\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) diff --git a/cpp/msbuild/ice.proj b/cpp/msbuild/ice.proj index 3c4d818aa87..a4a5cc0ae74 100644 --- a/cpp/msbuild/ice.proj +++ b/cpp/msbuild/ice.proj @@ -30,22 +30,6 @@ - - - - - - - - - - - - - - - - + - + - + diff --git a/cpp/msbuild/zeroc.ice.v143.nuspec b/cpp/msbuild/zeroc.ice.v143.nuspec index 147bff67220..9b1a9713e1e 100644 --- a/cpp/msbuild/zeroc.ice.v143.nuspec +++ b/cpp/msbuild/zeroc.ice.v143.nuspec @@ -12,7 +12,7 @@ false Ice C++ SDK for Visual Studio 2022 (v143). The Ice framework provides everything you need to build networked applications, including RPC, pub/sub, server deployment, and more. https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-10-release-notes - ice native rpc v141 zeroc + ice native rpc v143 zeroc README.md diff --git a/cpp/test/Common/msbuild/packages.config b/cpp/test/Common/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Common/msbuild/packages.config +++ b/cpp/test/Common/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Common/msbuild/testcommon.vcxproj b/cpp/test/Common/msbuild/testcommon.vcxproj index e84e09aaf83..faf9f91196f 100644 --- a/cpp/test/Common/msbuild/testcommon.vcxproj +++ b/cpp/test/Common/msbuild/testcommon.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,18 +20,18 @@ - + - + - + {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} - + @@ -55,29 +54,29 @@ false $(DefaultPlatformToolset) - - + + - + - + - + - + - - - - - + + + + + TEST_API_EXPORTS;%(PreprocessorDefinitions) @@ -98,18 +97,15 @@ TEST_API_EXPORTS;%(PreprocessorDefinitions) - + - - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/DataStorm/api/msbuild/writer/packages.config b/cpp/test/DataStorm/api/msbuild/writer/packages.config index d67b054a90d..fb43e38f42f 100644 --- a/cpp/test/DataStorm/api/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/api/msbuild/writer/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj index 15b01824c80..badaf09f2ec 100644 --- a/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj @@ -1,6 +1,5 @@  - @@ -107,7 +106,6 @@ - @@ -155,9 +153,7 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj.filters b/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj.filters index 7a2ec951b94..5a9130b7525 100644 --- a/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj.filters +++ b/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj.filters @@ -58,12 +58,8 @@ Source Files\x64\Release - - Source Files\Win32\Debug - - - Source Files\Win32\Release - + + @@ -80,11 +76,7 @@ Header Files\x64\Release - - Header Files\Win32\Debug - - - Header Files\Win32\Release - + + \ No newline at end of file diff --git a/cpp/test/DataStorm/callbacks/msbuild/reader/packages.config b/cpp/test/DataStorm/callbacks/msbuild/reader/packages.config deleted file mode 100644 index 9a5f7b2c74a..00000000000 --- a/cpp/test/DataStorm/callbacks/msbuild/reader/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj index 2281cf47cd3..5b7cdc43076 100644 --- a/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj @@ -1,6 +1,5 @@  - Debug @@ -22,9 +21,6 @@ - - - {783EE047-9119-4412-960A-600729D1A0F1} @@ -51,9 +47,7 @@ - - - + @@ -96,7 +90,5 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj.filters b/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj.filters index 9eff3ef7ab8..b307d850f0f 100644 --- a/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj.filters +++ b/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj.filters @@ -13,7 +13,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/DataStorm/callbacks/msbuild/writer/packages.config b/cpp/test/DataStorm/callbacks/msbuild/writer/packages.config deleted file mode 100644 index 9a5f7b2c74a..00000000000 --- a/cpp/test/DataStorm/callbacks/msbuild/writer/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj index f9d91232844..112c81fe8bf 100644 --- a/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj @@ -1,6 +1,5 @@  - Debug @@ -22,9 +21,6 @@ - - - {8ADD3C14-F6A9-4683-94BE-EB87C60078F1} @@ -51,9 +47,7 @@ - - - + @@ -96,7 +90,5 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj.filters b/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj.filters index bc887ef6719..39262b82bc7 100644 --- a/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj.filters +++ b/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj.filters @@ -13,7 +13,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/DataStorm/config/msbuild/reader/packages.config b/cpp/test/DataStorm/config/msbuild/reader/packages.config deleted file mode 100644 index 9a5f7b2c74a..00000000000 --- a/cpp/test/DataStorm/config/msbuild/reader/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj index 4279ae9109e..69ba24900b2 100644 --- a/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj @@ -1,6 +1,5 @@  - Debug @@ -22,9 +21,6 @@ - - - {735292B7-70CB-43B2-B7BB-D123B7497CC7} @@ -51,9 +47,7 @@ - - - + @@ -96,7 +90,5 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj.filters b/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj.filters index 9eff3ef7ab8..b307d850f0f 100644 --- a/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj.filters +++ b/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj.filters @@ -13,7 +13,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/DataStorm/config/msbuild/writer/packages.config b/cpp/test/DataStorm/config/msbuild/writer/packages.config deleted file mode 100644 index 9a5f7b2c74a..00000000000 --- a/cpp/test/DataStorm/config/msbuild/writer/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj index 4bfc57888e7..ad664c019c6 100644 --- a/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj @@ -1,6 +1,5 @@  - Debug @@ -22,9 +21,6 @@ - - - {1C5D0A06-731C-4FBB-8250-0B09E7D5BF55} @@ -51,9 +47,7 @@ - - - + @@ -96,7 +90,5 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj.filters b/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj.filters index bc887ef6719..39262b82bc7 100644 --- a/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj.filters +++ b/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj.filters @@ -13,7 +13,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/DataStorm/events/msbuild/reader/packages.config b/cpp/test/DataStorm/events/msbuild/reader/packages.config index d67b054a90d..fb43e38f42f 100644 --- a/cpp/test/DataStorm/events/msbuild/reader/packages.config +++ b/cpp/test/DataStorm/events/msbuild/reader/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/events/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/events/msbuild/reader/reader.vcxproj index 09c79fe95da..84240501130 100644 --- a/cpp/test/DataStorm/events/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/events/msbuild/reader/reader.vcxproj @@ -1,6 +1,5 @@  - @@ -107,7 +106,6 @@ - @@ -155,9 +153,7 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/events/msbuild/writer/packages.config b/cpp/test/DataStorm/events/msbuild/writer/packages.config index d67b054a90d..fb43e38f42f 100644 --- a/cpp/test/DataStorm/events/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/events/msbuild/writer/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/events/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/events/msbuild/writer/writer.vcxproj index d532ffc4bb1..f3aa941c2eb 100644 --- a/cpp/test/DataStorm/events/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/events/msbuild/writer/writer.vcxproj @@ -1,6 +1,5 @@  - @@ -107,7 +106,6 @@ - @@ -155,9 +153,7 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/partial/msbuild/reader/packages.config b/cpp/test/DataStorm/partial/msbuild/reader/packages.config index d67b054a90d..fb43e38f42f 100644 --- a/cpp/test/DataStorm/partial/msbuild/reader/packages.config +++ b/cpp/test/DataStorm/partial/msbuild/reader/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/partial/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/partial/msbuild/reader/reader.vcxproj index f58636d4119..e310583b303 100644 --- a/cpp/test/DataStorm/partial/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/partial/msbuild/reader/reader.vcxproj @@ -1,6 +1,5 @@  - @@ -107,7 +106,6 @@ - @@ -155,9 +153,7 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/partial/msbuild/writer/packages.config b/cpp/test/DataStorm/partial/msbuild/writer/packages.config index d67b054a90d..fb43e38f42f 100644 --- a/cpp/test/DataStorm/partial/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/partial/msbuild/writer/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/partial/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/partial/msbuild/writer/writer.vcxproj index e237415ba9a..30091940df2 100644 --- a/cpp/test/DataStorm/partial/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/partial/msbuild/writer/writer.vcxproj @@ -1,6 +1,5 @@  - @@ -107,7 +106,6 @@ - @@ -155,9 +153,7 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/reliability/msbuild/reader/packages.config b/cpp/test/DataStorm/reliability/msbuild/reader/packages.config deleted file mode 100644 index 9a5f7b2c74a..00000000000 --- a/cpp/test/DataStorm/reliability/msbuild/reader/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj index 0d530ff4695..2af431210a4 100644 --- a/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj @@ -1,6 +1,5 @@  - Debug @@ -22,9 +21,6 @@ - - - {18B9E886-A355-4CCC-8E27-84900C516DA8} @@ -51,9 +47,7 @@ - - - + @@ -96,7 +90,5 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj.filters b/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj.filters index 9eff3ef7ab8..b307d850f0f 100644 --- a/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj.filters +++ b/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj.filters @@ -13,7 +13,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/DataStorm/reliability/msbuild/writer/packages.config b/cpp/test/DataStorm/reliability/msbuild/writer/packages.config deleted file mode 100644 index 9a5f7b2c74a..00000000000 --- a/cpp/test/DataStorm/reliability/msbuild/writer/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj index f743ec72d15..8f9e797673e 100644 --- a/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj @@ -1,6 +1,5 @@  - Debug @@ -22,9 +21,6 @@ - - - {71A33CBC-71F6-434B-BB90-620710269310} @@ -51,9 +47,7 @@ - - - + @@ -96,7 +90,5 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj.filters b/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj.filters index bc887ef6719..39262b82bc7 100644 --- a/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj.filters +++ b/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj.filters @@ -13,7 +13,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/DataStorm/types/msbuild/reader/packages.config b/cpp/test/DataStorm/types/msbuild/reader/packages.config index d67b054a90d..fb43e38f42f 100644 --- a/cpp/test/DataStorm/types/msbuild/reader/packages.config +++ b/cpp/test/DataStorm/types/msbuild/reader/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/types/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/types/msbuild/reader/reader.vcxproj index 35164ca2eb6..6458a3bdf9f 100644 --- a/cpp/test/DataStorm/types/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/types/msbuild/reader/reader.vcxproj @@ -1,6 +1,5 @@  - @@ -107,7 +106,6 @@ - @@ -155,9 +153,7 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/types/msbuild/writer/packages.config b/cpp/test/DataStorm/types/msbuild/writer/packages.config index d67b054a90d..fb43e38f42f 100644 --- a/cpp/test/DataStorm/types/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/types/msbuild/writer/packages.config @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/cpp/test/DataStorm/types/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/types/msbuild/writer/writer.vcxproj index be01c0fb374..eec76122a82 100644 --- a/cpp/test/DataStorm/types/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/types/msbuild/writer/writer.vcxproj @@ -1,6 +1,5 @@  - @@ -107,7 +106,6 @@ - @@ -155,9 +153,7 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj index 131a1d3cca9..bfa8cc37de0 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA} - + Application true @@ -44,31 +43,30 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -121,19 +119,17 @@ - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/client/packages.config b/cpp/test/Glacier2/attack/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/packages.config +++ b/cpp/test/Glacier2/attack/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/server/packages.config b/cpp/test/Glacier2/attack/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/packages.config +++ b/cpp/test/Glacier2/attack/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj index 0d631f35cd6..8f23721d43a 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D} - + Application true @@ -44,30 +43,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + true true @@ -94,10 +92,10 @@ - + - + true true @@ -124,17 +122,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj index 8deb78858d6..605ddfb90e3 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {14C78FC0-F80C-425F-A504-1DD264BCDD01} - + Application true @@ -44,30 +43,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + true true @@ -94,7 +92,7 @@ - + @@ -123,16 +121,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj index 877cff53da0..73df317b2d3 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B} - + Application true @@ -44,32 +43,31 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - - - + + + + true true @@ -96,9 +94,9 @@ - - - + + + true true @@ -125,20 +123,18 @@ - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj index a2cbe2b2247..70d0321ba7f 100644 --- a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,11 +20,11 @@ - + - - + + true true @@ -52,7 +51,7 @@ - + true true @@ -79,12 +78,12 @@ - + {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C} - + Application true @@ -105,36 +104,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/client/packages.config b/cpp/test/Glacier2/router/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Glacier2/router/msbuild/client/packages.config +++ b/cpp/test/Glacier2/router/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/server/packages.config b/cpp/test/Glacier2/router/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Glacier2/router/msbuild/server/packages.config +++ b/cpp/test/Glacier2/router/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj index 1a112832000..0fd65e2170f 100644 --- a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A} - + Application true @@ -44,30 +43,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + true true @@ -94,10 +92,10 @@ - + - + true true @@ -124,17 +122,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj index d97b1746c98..8dd9c733380 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,7 +20,7 @@ - + true true @@ -48,7 +47,7 @@ - + @@ -77,12 +76,12 @@ - + {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config b/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config b/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj index 47872a9bb7d..b808863b5dd 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {40C0ABA8-A839-4988-AC60-04F649B44C54} - + Application true @@ -44,30 +43,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + true true @@ -94,10 +92,10 @@ - + - + true true @@ -124,17 +122,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj index e3357bdc0b6..6889437b280 100644 --- a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -20,15 +19,12 @@ - - - - + {F0F9CA32-65BC-4F71-9901-E231FD485CDA} - + Application true @@ -49,30 +45,26 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - + + 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}. - - \ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj.filters b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj.filters index 2ba9e7c5f4a..f9fb1b44b53 100644 --- a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj.filters @@ -9,7 +9,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/client/packages.config b/cpp/test/Glacier2/ssl/msbuild/client/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Glacier2/ssl/msbuild/client/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/server/packages.config b/cpp/test/Glacier2/ssl/msbuild/server/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Glacier2/ssl/msbuild/server/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj index 34d20aa9f20..fe7d414b095 100644 --- a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {5579253D-24F6-4001-BF9E-D0D6DA3EF928} - + Application true @@ -43,36 +42,29 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - - - + - - + + 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}. - - \ No newline at end of file diff --git a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj.filters b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj.filters index 6c45a43c19b..d911f6cf9a5 100644 --- a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj.filters @@ -9,7 +9,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj index 9c302920014..d97f6a25cba 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,8 +20,8 @@ - - + + true true @@ -49,7 +48,7 @@ - + @@ -78,12 +77,12 @@ - + {C02402BC-608E-4E46-B432-3C0C39E3B346} - + Application true @@ -104,36 +103,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config b/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config b/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj index 8efac14d0c0..6c3fecbefcd 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B} - + Application true @@ -44,30 +43,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + true true @@ -94,10 +92,10 @@ - + - + true true @@ -124,17 +122,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj index 180c9925710..9b4e7bc0875 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {715411FA-34B3-4ABF-8476-3C84F5EFFFE5} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj index 94b307ac4e9..8065f04c81f 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {5D38E70A-98C1-4B1D-BC0D-01BC114078C5} - + @@ -46,36 +45,35 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - - - + + + + true true @@ -102,8 +100,8 @@ - - + + true true @@ -130,16 +128,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj index 89102e2f551..625ad6cdbb5 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {9929ACAD-44DE-4699-BA2C-6EE8B665C6EB} - + @@ -46,35 +45,34 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - - + + + true true @@ -101,8 +99,8 @@ - - + + true true @@ -129,16 +127,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/client/client.vcxproj index c05e3027cd0..f14de08a57c 100644 --- a/cpp/test/Ice/admin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {25132357-8775-4C8F-AF35-CEC5F6BB08E7} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -100,7 +98,7 @@ - + true true @@ -127,16 +125,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/client/packages.config b/cpp/test/Ice/admin/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/admin/msbuild/client/packages.config +++ b/cpp/test/Ice/admin/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/server/packages.config b/cpp/test/Ice/admin/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/admin/msbuild/server/packages.config +++ b/cpp/test/Ice/admin/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/server/server.vcxproj index 9a19cf4286e..df07a96069c 100644 --- a/cpp/test/Ice/admin/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {0A601498-AA62-4639-9319-BC1EA94EBE13} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -100,7 +98,7 @@ - + true true @@ -127,16 +125,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/client/client.vcxproj index 0d24dabcd51..5b88575b697 100644 --- a/cpp/test/Ice/ami/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {24272AC4-1B9D-40C0-B432-485EEB642A38} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/client/packages.config b/cpp/test/Ice/ami/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/ami/msbuild/client/packages.config +++ b/cpp/test/Ice/ami/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj index fc2aa466000..faad7419988 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {26E3EDCA-70EE-43EA-8FB1-0B7BD61DD3F2} - + @@ -46,35 +45,34 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - - + + + true true @@ -101,7 +99,7 @@ - + true true @@ -128,16 +126,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/collocated/packages.config b/cpp/test/Ice/ami/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/packages.config +++ b/cpp/test/Ice/ami/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/server/packages.config b/cpp/test/Ice/ami/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/ami/msbuild/server/packages.config +++ b/cpp/test/Ice/ami/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/server/server.vcxproj index c80433e4251..f1578629429 100644 --- a/cpp/test/Ice/ami/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {697273CB-CEAF-481E-A77B-56FDAE5B3D3A} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -100,7 +98,7 @@ - + true true @@ -127,16 +125,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/client/client.vcxproj b/cpp/test/Ice/background/msbuild/client/client.vcxproj index 4b55245a5c6..8db2702a0e0 100644 --- a/cpp/test/Ice/background/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/background/msbuild/client/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {F5827922-7493-4DB4-AA42-3DCFF59CCA0D} - + @@ -45,24 +44,22 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - + ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) @@ -96,21 +93,16 @@ - - - - - + + - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/background/msbuild/client/client.vcxproj.filters index bb80cd2f19f..c547038d352 100644 --- a/cpp/test/Ice/background/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/background/msbuild/client/client.vcxproj.filters @@ -61,7 +61,4 @@ Header Files - - - \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/client/packages.config b/cpp/test/Ice/background/msbuild/client/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/background/msbuild/client/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/server/packages.config b/cpp/test/Ice/background/msbuild/server/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/background/msbuild/server/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/server/server.vcxproj b/cpp/test/Ice/background/msbuild/server/server.vcxproj index 443cbd2881d..9e2e90f4760 100644 --- a/cpp/test/Ice/background/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/background/msbuild/server/server.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {C1228BE2-FC54-4D44-94B1-964F62A569C3} - + @@ -45,24 +44,22 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - + ..\..;..\..\msbuild\testtransport\$(Platform)\$(Configuration);..\..\..\..\..\src;%(AdditionalIncludeDirectories) @@ -96,22 +93,17 @@ - - - - - - + + - + + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/background/msbuild/server/server.vcxproj.filters index dc871078115..12d13798ed8 100644 --- a/cpp/test/Ice/background/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/background/msbuild/server/server.vcxproj.filters @@ -64,7 +64,4 @@ Header Files - - - \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/testtransport/packages.config b/cpp/test/Ice/background/msbuild/testtransport/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/packages.config +++ b/cpp/test/Ice/background/msbuild/testtransport/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj index 09b2c852e94..9280227996d 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj +++ b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {01C495B5-93BE-424E-BB7C-5110A3952A75} - + @@ -46,29 +45,28 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - - - - - + + + + + ..\..;..\..\..\..\..\src;%(AdditionalIncludeDirectories) @@ -90,19 +88,19 @@ - + - + - - - - - - - + + + + + + + true true @@ -129,13 +127,13 @@ - - - - - - - + + + + + + + true true @@ -162,16 +160,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/client/client.vcxproj b/cpp/test/Ice/binding/msbuild/client/client.vcxproj index 8d8aa2c505e..d5dae386272 100644 --- a/cpp/test/Ice/binding/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {5BEA940C-1C98-486B-A530-C238D3A74E87} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/client/packages.config b/cpp/test/Ice/binding/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/binding/msbuild/client/packages.config +++ b/cpp/test/Ice/binding/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/server/packages.config b/cpp/test/Ice/binding/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/binding/msbuild/server/packages.config +++ b/cpp/test/Ice/binding/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/server/server.vcxproj index e9206f74a2c..322f8e41bc5 100644 --- a/cpp/test/Ice/binding/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {3215FCAD-59F2-47F4-8DB5-AEA11B39991D} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -100,7 +98,7 @@ - + true true @@ -127,16 +125,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/client/client.vcxproj b/cpp/test/Ice/custom/msbuild/client/client.vcxproj index 257f64dcd08..f1458bc73ad 100644 --- a/cpp/test/Ice/custom/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/custom/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -210,8 +208,6 @@ 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}. - - diff --git a/cpp/test/Ice/custom/msbuild/client/packages.config b/cpp/test/Ice/custom/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/custom/msbuild/client/packages.config +++ b/cpp/test/Ice/custom/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj index f190af856dd..d06b3382373 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -214,8 +212,6 @@ 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}. - - diff --git a/cpp/test/Ice/custom/msbuild/collocated/packages.config b/cpp/test/Ice/custom/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/packages.config +++ b/cpp/test/Ice/custom/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/server/packages.config b/cpp/test/Ice/custom/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/custom/msbuild/server/packages.config +++ b/cpp/test/Ice/custom/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/server/server.vcxproj b/cpp/test/Ice/custom/msbuild/server/server.vcxproj index 8a2c0dfed05..9cca588c7e8 100644 --- a/cpp/test/Ice/custom/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/custom/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -213,8 +211,6 @@ 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}. - - diff --git a/cpp/test/Ice/custom/msbuild/serveramd/packages.config b/cpp/test/Ice/custom/msbuild/serveramd/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/custom/msbuild/serveramd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj index e63f449f852..7eb32d96a94 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -213,8 +211,6 @@ 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}. - - diff --git a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj index 18248dbd9f5..a16cb71030f 100644 --- a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {5105B294-6DAB-4604-8BD7-10C126EED1FE} - + @@ -46,25 +45,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + ..;%(AdditionalIncludeDirectories) @@ -86,12 +84,12 @@ - + - - - + + + true true @@ -118,7 +116,7 @@ - + @@ -147,16 +145,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/defaultServant/msbuild/packages.config b/cpp/test/Ice/defaultServant/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/defaultServant/msbuild/packages.config +++ b/cpp/test/Ice/defaultServant/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj index 0f0484ebc8c..30a1475cfbb 100644 --- a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {80FE3863-C289-4BDE-833C-256D5E54093A} - + @@ -46,31 +45,30 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -97,7 +95,7 @@ - + @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/defaultValue/msbuild/packages.config b/cpp/test/Ice/defaultValue/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/defaultValue/msbuild/packages.config +++ b/cpp/test/Ice/defaultValue/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/echo/msbuild/packages.config b/cpp/test/Ice/echo/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/echo/msbuild/packages.config +++ b/cpp/test/Ice/echo/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/echo/msbuild/server.vcxproj b/cpp/test/Ice/echo/msbuild/server.vcxproj index 62b7c511692..265b16bd1a8 100644 --- a/cpp/test/Ice/echo/msbuild/server.vcxproj +++ b/cpp/test/Ice/echo/msbuild/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {5F22AF4C-5DFE-43E9-98E6-64187F174761} - + @@ -46,25 +45,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + ..;%(AdditionalIncludeDirectories) @@ -86,14 +84,14 @@ - + - + - - + + true true @@ -120,7 +118,7 @@ - + true true @@ -147,16 +145,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/client/client.vcxproj b/cpp/test/Ice/enums/msbuild/client/client.vcxproj index 959f73da4ca..950df07f5c1 100644 --- a/cpp/test/Ice/enums/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {3BDD2378-5B4E-4021-846E-3225A04E85B1} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/client/packages.config b/cpp/test/Ice/enums/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/enums/msbuild/client/packages.config +++ b/cpp/test/Ice/enums/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/server/packages.config b/cpp/test/Ice/enums/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/enums/msbuild/server/packages.config +++ b/cpp/test/Ice/enums/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/server/server.vcxproj index 09d9437a8c5..51151fcd033 100644 --- a/cpp/test/Ice/enums/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {0E5471E9-E208-4B77-B9D6-C4AD36CBB653} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj index d1369b8d0d0..6eb2d296012 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + - + \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/client/packages.config b/cpp/test/Ice/exceptions/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj index c141559d7d1..da7b54c7958 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {3A38F35B-3A61-4490-955D-D1CAE61CB7FD} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - + + + true true @@ -100,7 +98,7 @@ - + true true @@ -127,17 +125,15 @@ - + - - + + 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}. - - - - + + - + \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/packages.config b/cpp/test/Ice/exceptions/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/server/packages.config b/cpp/test/Ice/exceptions/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj index bba56414421..6c577b1d9f0 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {24550251-512C-4DC0-9B62-7DB6664DDCA8} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + - + \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config b/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj index 657feda2e18..8f019c6cd95 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {8D0B611C-F9C2-4B53-8497-7BD8036BD831} - + @@ -46,23 +45,22 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + @@ -85,11 +83,11 @@ - + - - + + true true @@ -116,7 +114,7 @@ - + true true @@ -143,20 +141,18 @@ - + - + - - + + 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}. - - - - + + - + \ No newline at end of file diff --git a/cpp/test/Ice/executor/msbuild/client/client.vcxproj b/cpp/test/Ice/executor/msbuild/client/client.vcxproj index 435e86f8073..fc8729a131a 100644 --- a/cpp/test/Ice/executor/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/executor/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {BA3042D4-7E5B-461D-A31E-345753A8A726} - + @@ -46,35 +45,34 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - - + + + true true @@ -101,7 +99,7 @@ - + true true @@ -128,16 +126,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/executor/msbuild/client/packages.config b/cpp/test/Ice/executor/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/executor/msbuild/client/packages.config +++ b/cpp/test/Ice/executor/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/executor/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/executor/msbuild/collocated/collocated.vcxproj index e1f38c89cb1..710fb6ef219 100644 --- a/cpp/test/Ice/executor/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/executor/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {FBAC9C87-6A77-4663-9653-F0DFEFB00935} - + @@ -46,35 +45,34 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - - + + + + true true @@ -101,8 +99,8 @@ - - + + true true @@ -129,17 +127,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/executor/msbuild/collocated/packages.config b/cpp/test/Ice/executor/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/executor/msbuild/collocated/packages.config +++ b/cpp/test/Ice/executor/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/executor/msbuild/server/packages.config b/cpp/test/Ice/executor/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/executor/msbuild/server/packages.config +++ b/cpp/test/Ice/executor/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/executor/msbuild/server/server.vcxproj b/cpp/test/Ice/executor/msbuild/server/server.vcxproj index 92af1a709d7..ff952fcd788 100644 --- a/cpp/test/Ice/executor/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/executor/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {3E471DF3-EB57-4FC3-AF20-2CF548DBF5C1} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - + + + true true @@ -100,8 +98,8 @@ - - + + true true @@ -128,17 +126,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/client/client.vcxproj index bd298a36022..0dfee96d9ee 100644 --- a/cpp/test/Ice/facets/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {386DD353-1314-407B-A394-476F4983461D} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/client/packages.config b/cpp/test/Ice/facets/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/facets/msbuild/client/packages.config +++ b/cpp/test/Ice/facets/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj index 473e637c46b..ab6baa74395 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {420B2FB5-833E-449A-BF43-5A5538DAEEC4} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - + + + true true @@ -100,7 +98,7 @@ - + true true @@ -127,17 +125,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/collocated/packages.config b/cpp/test/Ice/facets/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/packages.config +++ b/cpp/test/Ice/facets/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/server/packages.config b/cpp/test/Ice/facets/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/facets/msbuild/server/packages.config +++ b/cpp/test/Ice/facets/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/server/server.vcxproj index 3a715537abb..87eb8dfe36a 100644 --- a/cpp/test/Ice/facets/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {46DDEC66-2287-47E2-BFE4-BDE53B5D40C5} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj index d59e56fdf20..9dcaeb1ea2c 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {606D6061-3084-498A-988A-7F5B9FE8732D} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/packages.config b/cpp/test/Ice/faultTolerance/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/packages.config +++ b/cpp/test/Ice/faultTolerance/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/server/packages.config b/cpp/test/Ice/faultTolerance/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/packages.config +++ b/cpp/test/Ice/faultTolerance/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj index db802296eb7..b8c48d52e6e 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {CC0C7076-D15B-42AB-AFD6-CE40472F6E84} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/hash/msbuild/client.vcxproj b/cpp/test/Ice/hash/msbuild/client.vcxproj index 90b29e0c13e..6c067305c59 100644 --- a/cpp/test/Ice/hash/msbuild/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {685612A9-F2AA-4ACA-8327-5D40E4731906} - + @@ -46,42 +45,39 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - + - + 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}. - - - - + + - + \ No newline at end of file diff --git a/cpp/test/Ice/hash/msbuild/packages.config b/cpp/test/Ice/hash/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/hash/msbuild/packages.config +++ b/cpp/test/Ice/hash/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/client/client.vcxproj b/cpp/test/Ice/hold/msbuild/client/client.vcxproj index c1565606983..dcd0d4aa736 100644 --- a/cpp/test/Ice/hold/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {649ECCDB-5CA3-4371-B521-95CE8EF534BA} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/client/packages.config b/cpp/test/Ice/hold/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/hold/msbuild/client/packages.config +++ b/cpp/test/Ice/hold/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/server/packages.config b/cpp/test/Ice/hold/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/hold/msbuild/server/packages.config +++ b/cpp/test/Ice/hold/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/server/server.vcxproj index 61c5bc00dac..752927640f8 100644 --- a/cpp/test/Ice/hold/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {10A9A668-8508-4971-AD56-15B50AB12829} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/idleTimeout/msbuild/client/client.vcxproj b/cpp/test/Ice/idleTimeout/msbuild/client/client.vcxproj index dd88e945ad0..4cb516f5cb5 100644 --- a/cpp/test/Ice/idleTimeout/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/idleTimeout/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -134,8 +132,6 @@ 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}. - - diff --git a/cpp/test/Ice/idleTimeout/msbuild/client/packages.config b/cpp/test/Ice/idleTimeout/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/idleTimeout/msbuild/client/packages.config +++ b/cpp/test/Ice/idleTimeout/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/idleTimeout/msbuild/server/packages.config b/cpp/test/Ice/idleTimeout/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/idleTimeout/msbuild/server/packages.config +++ b/cpp/test/Ice/idleTimeout/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/idleTimeout/msbuild/server/server.vcxproj b/cpp/test/Ice/idleTimeout/msbuild/server/server.vcxproj index 36039956e5d..6fa9daa5a99 100644 --- a/cpp/test/Ice/idleTimeout/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/idleTimeout/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -134,8 +132,6 @@ 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}. - - diff --git a/cpp/test/Ice/inactivityTimeout/msbuild/client/client.vcxproj b/cpp/test/Ice/inactivityTimeout/msbuild/client/client.vcxproj index a4f6de81149..2dde7a78f90 100644 --- a/cpp/test/Ice/inactivityTimeout/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/inactivityTimeout/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -134,8 +132,6 @@ 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}. - - diff --git a/cpp/test/Ice/inactivityTimeout/msbuild/client/packages.config b/cpp/test/Ice/inactivityTimeout/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/inactivityTimeout/msbuild/client/packages.config +++ b/cpp/test/Ice/inactivityTimeout/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/inactivityTimeout/msbuild/server/packages.config b/cpp/test/Ice/inactivityTimeout/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/inactivityTimeout/msbuild/server/packages.config +++ b/cpp/test/Ice/inactivityTimeout/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/inactivityTimeout/msbuild/server/server.vcxproj b/cpp/test/Ice/inactivityTimeout/msbuild/server/server.vcxproj index 5f9eb065db2..b32614e76a7 100644 --- a/cpp/test/Ice/inactivityTimeout/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/inactivityTimeout/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -134,8 +132,6 @@ 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}. - - diff --git a/cpp/test/Ice/info/msbuild/client/client.vcxproj b/cpp/test/Ice/info/msbuild/client/client.vcxproj index 69171df54ce..43aba87b5a8 100644 --- a/cpp/test/Ice/info/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {3001AE1F-E8D1-4C33-8ED1-B7D676D3BC73} - + @@ -46,35 +45,34 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - - + + + true true @@ -101,7 +99,7 @@ - + true true @@ -128,16 +126,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/client/packages.config b/cpp/test/Ice/info/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/info/msbuild/client/packages.config +++ b/cpp/test/Ice/info/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/server/packages.config b/cpp/test/Ice/info/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/info/msbuild/server/packages.config +++ b/cpp/test/Ice/info/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/server/server.vcxproj b/cpp/test/Ice/info/msbuild/server/server.vcxproj index 084f162c3e2..aa5396bfa79 100644 --- a/cpp/test/Ice/info/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {9145C992-2C7A-4D01-B957-F38373DF5829} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj index 2e5a25e240c..63c61e00a44 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {4ADE8581-F2FC-4350-BFAE-62FEFF254A11} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/client/packages.config b/cpp/test/Ice/inheritance/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj index 44e2a2a5e34..e6eface8342 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {1E199A0A-392A-45E3-9B33-D27ADD734F0D} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - + + + true true @@ -100,7 +98,7 @@ - + true true @@ -127,17 +125,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/collocated/packages.config b/cpp/test/Ice/inheritance/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/server/packages.config b/cpp/test/Ice/inheritance/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj index 9ac32239d54..623d297f5cc 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {C95B71C9-654C-4C6C-B956-F1A70F5CB5A3} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj index 787ac4e4b4a..b11b1e19d9a 100644 --- a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {311D5177-A40C-4527-BA81-A0D8C20AA121} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/client/packages.config b/cpp/test/Ice/invoke/msbuild/client/packages.config index 419fb9ee24d..fb43e38f42f 100644 --- a/cpp/test/Ice/invoke/msbuild/client/packages.config +++ b/cpp/test/Ice/invoke/msbuild/client/packages.config @@ -1,6 +1,4 @@  - - \ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/server/packages.config b/cpp/test/Ice/invoke/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/invoke/msbuild/server/packages.config +++ b/cpp/test/Ice/invoke/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj index bfeb1586255..9d9ece8e16a 100644 --- a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {74931348-C85B-4B59-BC91-154D1CF9A933} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj index 3112a988805..8057cf5f421 100644 --- a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj +++ b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {A9537443-BB6C-4324-B1B9-B9492CAE1CD5} - + @@ -45,33 +44,31 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - - - - + + + + + ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - + ..\..\msbuild\consumer\$(Platform)\$(Configuration);..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) @@ -101,17 +98,12 @@ - - - - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj.filters b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj.filters index 271a35aac51..c949c0b0d50 100644 --- a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj.filters +++ b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj.filters @@ -9,7 +9,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/alltests/packages.config b/cpp/test/Ice/library/msbuild/alltests/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/library/msbuild/alltests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/client/client.vcxproj b/cpp/test/Ice/library/msbuild/client/client.vcxproj index 41fb9500368..d6dbce0d80d 100644 --- a/cpp/test/Ice/library/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/library/msbuild/client/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {28347243-F75F-4B28-89F9-7EA84478D9C9} - + @@ -45,26 +44,24 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - + - + ..\..\msbuild\alltests\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) @@ -85,17 +82,12 @@ - - - - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/library/msbuild/client/client.vcxproj.filters index 59ec3e257c1..90db4f082e3 100644 --- a/cpp/test/Ice/library/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/library/msbuild/client/client.vcxproj.filters @@ -9,7 +9,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/client/packages.config b/cpp/test/Ice/library/msbuild/client/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/library/msbuild/client/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj index dc822bc8b3b..7a3319940b4 100644 --- a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj +++ b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {73C0E333-6476-4B7E-A52D-AB5E9CA36906} - + @@ -45,33 +44,31 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - - - - + + + + + ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories) - + ..\..\msbuild\gencode\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) @@ -101,17 +98,12 @@ - - - - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj.filters b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj.filters index 4c53ccc297e..837dac706bf 100644 --- a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj.filters +++ b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj.filters @@ -9,7 +9,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/consumer/packages.config b/cpp/test/Ice/library/msbuild/consumer/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/library/msbuild/consumer/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj index 6cb8a1aeef7..4aa0f132f9f 100644 --- a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj +++ b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {2454F754-3A55-4875-9D8E-57B63673C231} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - - - - - + + + + + - + - + @@ -128,16 +126,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/gencode/packages.config b/cpp/test/Ice/library/msbuild/gencode/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/library/msbuild/gencode/packages.config +++ b/cpp/test/Ice/library/msbuild/gencode/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/client/client.vcxproj b/cpp/test/Ice/location/msbuild/client/client.vcxproj index 1e0131a2b5c..2028170a13e 100644 --- a/cpp/test/Ice/location/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {FD9FB0E5-22D8-41B2-B6B9-272BA12516CC} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/client/packages.config b/cpp/test/Ice/location/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/location/msbuild/client/packages.config +++ b/cpp/test/Ice/location/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/server/packages.config b/cpp/test/Ice/location/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/location/msbuild/server/packages.config +++ b/cpp/test/Ice/location/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/server/server.vcxproj b/cpp/test/Ice/location/msbuild/server/server.vcxproj index 68ffc30e61d..2577c954866 100644 --- a/cpp/test/Ice/location/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {40D8363E-E617-4270-9A1F-7B69A3112F6B} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - + + + true true @@ -100,8 +98,8 @@ - - + + true true @@ -128,17 +126,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj index 659d8de88ba..ca592f88649 100644 --- a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -20,15 +19,12 @@ - - - - + {2923D875-5496-4D0D-B19F-B55AF6EC25E8} - + @@ -51,30 +47,26 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - + + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj.filters b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj.filters index 38addeb722d..a2afe20297a 100644 --- a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj.filters +++ b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client1/packages.config b/cpp/test/Ice/logger/msbuild/client1/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/logger/msbuild/client1/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj index 8f1a90ae5fb..44071de735e 100644 --- a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -20,15 +19,12 @@ - - - - + {BDA98D7E-A92B-4B18-89C0-5F5C5D52934D} - + @@ -51,30 +47,26 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - + + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj.filters b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj.filters index 93f78f0c78b..049aa6110e2 100644 --- a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj.filters +++ b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj.filters @@ -9,7 +9,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client2/packages.config b/cpp/test/Ice/logger/msbuild/client2/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/logger/msbuild/client2/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj index e840530fc7c..c4f8f125534 100644 --- a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -20,15 +19,12 @@ - - - - + {11C94711-6AA5-4D42-8F1A-08421527376E} - + @@ -51,30 +47,26 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - + + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj.filters b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj.filters index bcc8160cebe..80210645330 100644 --- a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj.filters +++ b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj.filters @@ -9,7 +9,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client3/packages.config b/cpp/test/Ice/logger/msbuild/client3/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/logger/msbuild/client3/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj index 6e00ff83321..6539c87929b 100644 --- a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -20,15 +19,12 @@ - - - - + {649FACD9-76C7-4184-A34C-269E7F302952} - + @@ -51,30 +47,26 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - + + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj.filters b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj.filters index b7b276fa9bd..56353d87ce2 100644 --- a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj.filters +++ b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj.filters @@ -9,7 +9,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client4/packages.config b/cpp/test/Ice/logger/msbuild/client4/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/logger/msbuild/client4/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj index 7f9bbb2e1be..9c32af3d723 100644 --- a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -20,15 +19,12 @@ - - - - + {A4E94959-FD6B-4280-B1B3-99E4829153C9} - + @@ -51,30 +47,26 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - + + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj.filters b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj.filters index 568edb1e76b..0d7be764e1a 100644 --- a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj.filters +++ b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj.filters @@ -9,7 +9,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client5/packages.config b/cpp/test/Ice/logger/msbuild/client5/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/logger/msbuild/client5/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/maxConnections/msbuild/client/client.vcxproj b/cpp/test/Ice/maxConnections/msbuild/client/client.vcxproj index b92b9806dd8..dbfcb6e94ce 100644 --- a/cpp/test/Ice/maxConnections/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/maxConnections/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -134,8 +132,6 @@ 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}. - - diff --git a/cpp/test/Ice/maxConnections/msbuild/client/packages.config b/cpp/test/Ice/maxConnections/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/maxConnections/msbuild/client/packages.config +++ b/cpp/test/Ice/maxConnections/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/maxConnections/msbuild/server/packages.config b/cpp/test/Ice/maxConnections/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/maxConnections/msbuild/server/packages.config +++ b/cpp/test/Ice/maxConnections/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/maxConnections/msbuild/server/server.vcxproj b/cpp/test/Ice/maxConnections/msbuild/server/server.vcxproj index 72be156aaf4..40b2605e645 100644 --- a/cpp/test/Ice/maxConnections/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/maxConnections/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -134,8 +132,6 @@ 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}. - - diff --git a/cpp/test/Ice/maxDispatches/msbuild/client/client.vcxproj b/cpp/test/Ice/maxDispatches/msbuild/client/client.vcxproj index c90a24f24a8..0c976033293 100644 --- a/cpp/test/Ice/maxDispatches/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/maxDispatches/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -134,8 +132,6 @@ 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}. - - diff --git a/cpp/test/Ice/maxDispatches/msbuild/client/packages.config b/cpp/test/Ice/maxDispatches/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/maxDispatches/msbuild/client/packages.config +++ b/cpp/test/Ice/maxDispatches/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/maxDispatches/msbuild/server/packages.config b/cpp/test/Ice/maxDispatches/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/maxDispatches/msbuild/server/packages.config +++ b/cpp/test/Ice/maxDispatches/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/maxDispatches/msbuild/server/server.vcxproj b/cpp/test/Ice/maxDispatches/msbuild/server/server.vcxproj index 4bf42b61d0f..79fb1556eb7 100644 --- a/cpp/test/Ice/maxDispatches/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/maxDispatches/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -134,8 +132,6 @@ 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}. - - diff --git a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj index 8dffad95e18..e2d857664e6 100644 --- a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {387716BD-A892-4D88-86CB-E64FF359271D} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -100,7 +98,7 @@ - + true true @@ -127,16 +125,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/client/packages.config b/cpp/test/Ice/metrics/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/metrics/msbuild/client/packages.config +++ b/cpp/test/Ice/metrics/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj index b32887bc690..fd7720fe460 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {CC584047-6A76-4E0B-AABE-1CDB4A735079} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - + + + true true @@ -100,8 +98,8 @@ - - + + true true @@ -128,17 +126,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/collocated/packages.config b/cpp/test/Ice/metrics/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/packages.config +++ b/cpp/test/Ice/metrics/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/server/packages.config b/cpp/test/Ice/metrics/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/metrics/msbuild/server/packages.config +++ b/cpp/test/Ice/metrics/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj index eb1237d67d1..975549aa637 100644 --- a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {BC79E960-2F72-4CC7-8C2F-A1C0E2EDD271} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/serveramd/packages.config b/cpp/test/Ice/metrics/msbuild/serveramd/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/metrics/msbuild/serveramd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj index fd01b160f39..91e332a6c24 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {75A5B8DA-6110-4588-8B86-D9002E6FD028} - + @@ -46,30 +45,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + true true @@ -96,7 +94,7 @@ - + true true @@ -123,20 +121,18 @@ - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/middleware/msbuild/client.vcxproj b/cpp/test/Ice/middleware/msbuild/client.vcxproj index e318895bcc9..57f79b72f12 100644 --- a/cpp/test/Ice/middleware/msbuild/client.vcxproj +++ b/cpp/test/Ice/middleware/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -154,8 +152,6 @@ 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}. - - diff --git a/cpp/test/Ice/middleware/msbuild/packages.config b/cpp/test/Ice/middleware/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/middleware/msbuild/packages.config +++ b/cpp/test/Ice/middleware/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj index 5c6cc3fffc7..ffb8ec1b14e 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,8 +20,8 @@ - - + + true true @@ -49,7 +48,7 @@ - + @@ -78,12 +77,12 @@ - + {9681E7B8-4D88-4AFF-8F96-784DDF5F5B76} - + @@ -106,25 +105,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + ..;%(AdditionalIncludeDirectories) @@ -146,16 +144,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/client/packages.config b/cpp/test/Ice/networkProxy/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/server/packages.config b/cpp/test/Ice/networkProxy/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj index a1ff85075a1..319bd035487 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,10 +20,10 @@ - + - + true true @@ -77,12 +76,12 @@ - + {ED9139A9-82F5-435F-BA2D-FD55D46ADCCB} - + @@ -105,25 +104,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + ..;%(AdditionalIncludeDirectories) @@ -145,16 +143,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/client/client.vcxproj index 3409f349681..63979cd62d6 100644 --- a/cpp/test/Ice/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {10096783-388B-4B2A-806A-F0190AFB5096} - + @@ -46,28 +45,27 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + 8388608 @@ -75,8 +73,8 @@ - - + + 8388608 @@ -84,8 +82,8 @@ - - + + 8388608 @@ -93,8 +91,8 @@ - - + + 8388608 @@ -107,9 +105,9 @@ - - - + + + true true @@ -208,7 +206,7 @@ - + true true @@ -307,22 +305,20 @@ - - - - + + + + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/client/packages.config b/cpp/test/Ice/objects/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/objects/msbuild/client/packages.config +++ b/cpp/test/Ice/objects/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj index 5144139affb..ef5ea5afecf 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {57E9C935-F8A6-4C1E-BDF4-0F0EB72CACC8} - + @@ -46,30 +45,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - - - + + + + true true @@ -168,7 +166,7 @@ - + true true @@ -267,22 +265,20 @@ - - - - + + + + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/collocated/packages.config b/cpp/test/Ice/objects/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/packages.config +++ b/cpp/test/Ice/objects/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/server/packages.config b/cpp/test/Ice/objects/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/objects/msbuild/server/packages.config +++ b/cpp/test/Ice/objects/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/server/server.vcxproj index 5ab49b5f4e6..8b431a6ce7f 100644 --- a/cpp/test/Ice/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {46204626-B8AC-4E09-88F2-0A68A5DEEF5A} - + @@ -46,29 +45,28 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - - + + + true true @@ -167,7 +165,7 @@ - + true true @@ -266,22 +264,20 @@ - - - - + + + + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/client/client.vcxproj index c4fada1e94f..3a1123840ff 100644 --- a/cpp/test/Ice/operations/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {A364B7AB-7129-4891-A305-B2EEE2948EC4} - + @@ -46,25 +45,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + 4503;%(DisableSpecificWarnings) @@ -86,20 +84,20 @@ - + - + - - - - - - - - + + + + + + + + true true @@ -152,16 +150,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/client/packages.config b/cpp/test/Ice/operations/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/operations/msbuild/client/packages.config +++ b/cpp/test/Ice/operations/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj index 4224979c59c..257e60d67dc 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {1C3367B8-CCFF-4409-8847-623DFD833DAD} - + @@ -46,23 +45,22 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + @@ -85,21 +83,21 @@ - + - + - - - - - - - - - + + + + + + + + + true true @@ -126,7 +124,7 @@ - + true true @@ -153,17 +151,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/collocated/packages.config b/cpp/test/Ice/operations/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/packages.config +++ b/cpp/test/Ice/operations/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/server/packages.config b/cpp/test/Ice/operations/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/operations/msbuild/server/packages.config +++ b/cpp/test/Ice/operations/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/server/server.vcxproj index 7d41e9fc9f3..807bc8d7817 100644 --- a/cpp/test/Ice/operations/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {27B7CAC4-9236-4139-88B8-3B9950D2DB2C} - + @@ -46,23 +45,22 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + @@ -85,14 +83,14 @@ - + - + - - + + true true @@ -119,7 +117,7 @@ - + true true @@ -146,17 +144,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/serveramd/packages.config b/cpp/test/Ice/operations/msbuild/serveramd/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/operations/msbuild/serveramd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj index 613435ab157..dec28846abe 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {306B9C8B-F11B-4071-AE80-CF69EF0BBB2B} - + @@ -46,23 +45,22 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + @@ -85,11 +83,11 @@ - + - - + + true true @@ -116,7 +114,7 @@ - + true true @@ -143,20 +141,18 @@ - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/client/client.vcxproj b/cpp/test/Ice/optional/msbuild/client/client.vcxproj index 88621dbe008..5cd42326164 100644 --- a/cpp/test/Ice/optional/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/optional/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {A82A6A91-4EEC-4F0A-BA2D-A689BDCDA9C2} - + @@ -46,25 +45,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + ..\..;%(AdditionalIncludeDirectories) @@ -86,15 +84,15 @@ - + - + - - - + + + true true @@ -147,16 +145,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/client/packages.config b/cpp/test/Ice/optional/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/optional/msbuild/client/packages.config +++ b/cpp/test/Ice/optional/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/server/packages.config b/cpp/test/Ice/optional/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/optional/msbuild/server/packages.config +++ b/cpp/test/Ice/optional/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/server/server.vcxproj b/cpp/test/Ice/optional/msbuild/server/server.vcxproj index 05fdfa2a453..f3a941341af 100644 --- a/cpp/test/Ice/optional/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/optional/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {E64764EB-2B8E-454F-9635-0729D07CCA24} - + @@ -46,23 +45,22 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + @@ -85,14 +83,14 @@ - + - + - - + + true true @@ -119,7 +117,7 @@ - + true true @@ -146,17 +144,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/serveramd/packages.config b/cpp/test/Ice/optional/msbuild/serveramd/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/optional/msbuild/serveramd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj index 54ebd0da25a..de7cf7218a4 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {9D99D6A3-3087-4B6B-BF7E-AD1D8BB9BEDA} - + @@ -46,23 +45,22 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + @@ -85,11 +83,11 @@ - + - - + + true true @@ -116,7 +114,7 @@ - + true true @@ -143,20 +141,18 @@ - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj index f9b3b6dc48a..0070bef919b 100644 --- a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -20,15 +19,12 @@ - - - - + {83B9B9F0-EFF4-447B-A7DD-60BAE22123F8} - + @@ -51,35 +47,31 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - + generated;..\..\;%(AdditionalIncludeDirectories) - + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj.filters index a6f2d814b62..c0de0f9d65f 100644 --- a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/client/packages.config b/cpp/test/Ice/plugin/msbuild/client/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/plugin/msbuild/client/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/testplugin/packages.config b/cpp/test/Ice/plugin/msbuild/testplugin/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/plugin/msbuild/testplugin/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj index b394e5524bb..a58c34d025e 100644 --- a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -20,15 +19,12 @@ - - - - + {948059F3-CD57-4ACC-9EA5-C4550D06CB19} - + @@ -51,30 +47,26 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - + + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj.filters b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj.filters index fc5e317919a..7e79c0f6dd8 100644 --- a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj.filters +++ b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/Ice/properties/msbuild/client.vcxproj b/cpp/test/Ice/properties/msbuild/client.vcxproj index f436c677b6a..691104b88bb 100644 --- a/cpp/test/Ice/properties/msbuild/client.vcxproj +++ b/cpp/test/Ice/properties/msbuild/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {EABE4465-0DDC-41CE-91C5-CCB9586B789F} - + @@ -45,36 +44,29 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - - - + - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/Ice/properties/msbuild/client.vcxproj.filters b/cpp/test/Ice/properties/msbuild/client.vcxproj.filters index dc58ad6503a..79686760e75 100644 --- a/cpp/test/Ice/properties/msbuild/client.vcxproj.filters +++ b/cpp/test/Ice/properties/msbuild/client.vcxproj.filters @@ -14,7 +14,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/Ice/properties/msbuild/packages.config b/cpp/test/Ice/properties/msbuild/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/Ice/properties/msbuild/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj index 1dc261fb949..97f092914ea 100644 --- a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {D0301B50-901B-4298-B8C8-B134A320E2A0} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/client/packages.config b/cpp/test/Ice/proxy/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/proxy/msbuild/client/packages.config +++ b/cpp/test/Ice/proxy/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj index 4f223a477e3..71aa00b2fbd 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {59ED55DD-0EF7-4028-B7DD-AFB6488155F6} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - + + + true true @@ -100,7 +98,7 @@ - + true true @@ -127,17 +125,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/collocated/packages.config b/cpp/test/Ice/proxy/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/packages.config +++ b/cpp/test/Ice/proxy/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/server/packages.config b/cpp/test/Ice/proxy/msbuild/server/packages.config index 419fb9ee24d..fb43e38f42f 100644 --- a/cpp/test/Ice/proxy/msbuild/server/packages.config +++ b/cpp/test/Ice/proxy/msbuild/server/packages.config @@ -1,6 +1,4 @@  - - \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj index ec8498cd132..c77e50cbded 100644 --- a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {2DAEF04A-7C9A-4C64-99E9-D0F503667FBF} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/packages.config b/cpp/test/Ice/proxy/msbuild/serveramd/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/proxy/msbuild/serveramd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj index 20649d51a07..3ae6207154a 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {36CC0D35-FFFE-46D1-8EE1-1A3438DCC938} - + @@ -46,30 +45,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + true true @@ -96,7 +94,7 @@ - + true true @@ -123,20 +121,18 @@ - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/client/client.vcxproj index 05764719f69..97326fd30c5 100644 --- a/cpp/test/Ice/retry/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {2C8EC06E-CC5B-4D04-A49E-4656CF1D199D} - + @@ -46,25 +45,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + generated;..\..\;%(AdditionalIncludeDirectories) @@ -86,15 +84,15 @@ - + - + - - - + + + true true @@ -121,7 +119,7 @@ - + true true @@ -148,16 +146,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/client/packages.config b/cpp/test/Ice/retry/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/retry/msbuild/client/packages.config +++ b/cpp/test/Ice/retry/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj index 9b5e6ab8204..6c2123f146b 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {9D7FD661-AA09-43D3-9772-66EC4915A848} - + @@ -46,35 +45,34 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - - + + + + true true @@ -101,8 +99,8 @@ - - + + true true @@ -129,17 +127,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/collocated/packages.config b/cpp/test/Ice/retry/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/packages.config +++ b/cpp/test/Ice/retry/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/server/packages.config b/cpp/test/Ice/retry/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/retry/msbuild/server/packages.config +++ b/cpp/test/Ice/retry/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/server/server.vcxproj index 10eb658af28..a4a04300e61 100644 --- a/cpp/test/Ice/retry/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {F689934E-7EED-4E85-A620-8FC72CD83255} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - + + + true true @@ -100,8 +98,8 @@ - - + + true true @@ -128,17 +126,15 @@ - + - - + + 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}. - - - - + + - + \ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/client/client.vcxproj b/cpp/test/Ice/scope/msbuild/client/client.vcxproj index 452a6c0a70d..26d3f7b6cf9 100644 --- a/cpp/test/Ice/scope/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/scope/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {A19DC61B-84AE-4983-9B4C-4F4A338178C5} - + @@ -46,25 +45,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + 4503;%(DisableSpecificWarnings) @@ -86,14 +84,14 @@ - + - + - - + + true true @@ -146,16 +144,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/client/packages.config b/cpp/test/Ice/scope/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/scope/msbuild/client/packages.config +++ b/cpp/test/Ice/scope/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/server/packages.config b/cpp/test/Ice/scope/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/scope/msbuild/server/packages.config +++ b/cpp/test/Ice/scope/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/server/server.vcxproj b/cpp/test/Ice/scope/msbuild/server/server.vcxproj index a4f319f0261..7b1e4af5cb1 100644 --- a/cpp/test/Ice/scope/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/scope/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2} - + @@ -46,23 +45,22 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + @@ -85,13 +83,13 @@ - + - + - + true true @@ -118,7 +116,7 @@ - + true true @@ -145,17 +143,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj index 5c58e353576..f73e00c0c5f 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {3329FD4A-C510-40FF-A642-365F8F56422E} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/client/packages.config b/cpp/test/Ice/servantLocator/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj index af50491f270..cc6c3dbda4c 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {8698D5A5-EABD-4024-B3A0-A78793B39510} - + @@ -46,35 +45,34 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - - + + + + true true @@ -101,8 +99,8 @@ - - + + true true @@ -129,17 +127,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config b/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/server/packages.config b/cpp/test/Ice/servantLocator/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj index 204ce01258a..5bbaa10135b 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {2B6769F3-9C20-49D1-821C-65BB70A53F76} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - - + + + true true @@ -100,8 +98,8 @@ - - + + true true @@ -128,17 +126,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config b/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj index dc8898d4eaa..c6cbc1c0687 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {425BC777-A886-4EC9-819B-35D103A7FDD0} - + @@ -46,23 +45,22 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + @@ -85,12 +83,12 @@ - + - - - + + + true true @@ -117,8 +115,8 @@ - - + + true true @@ -145,20 +143,18 @@ - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/services/msbuild/client.vcxproj b/cpp/test/Ice/services/msbuild/client.vcxproj index 76f8d591915..7d4b5ed9d7a 100644 --- a/cpp/test/Ice/services/msbuild/client.vcxproj +++ b/cpp/test/Ice/services/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {07BDBE85-B3C1-4E70-91E3-B2517CFB04C1} - + @@ -46,25 +45,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + 4250;4251;4275;4503 @@ -86,11 +84,11 @@ - + - - + + true true @@ -117,7 +115,7 @@ - + @@ -146,16 +144,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/services/msbuild/packages.config b/cpp/test/Ice/services/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/services/msbuild/packages.config +++ b/cpp/test/Ice/services/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj index a5f862050e6..57e273985bf 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {6476DBD1-9C4F-4107-8271-2B1DC2B535E5} - + @@ -46,31 +45,30 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -123,16 +121,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj index a1abe6f8c4b..eae175cc73d 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {CFFE56E2-BBDE-4B6E-BB76-1A1A61453570} - + @@ -46,31 +45,30 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - - + + - - + + true true @@ -121,7 +119,7 @@ - + true true @@ -172,17 +170,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj index a990b1deecd..b068f59a9e0 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {171056B8-17A5-4825-9110-2877A94CD933} - + @@ -46,27 +45,26 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - - + + true true @@ -117,7 +115,7 @@ - + true true @@ -168,21 +166,19 @@ - - + + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj index 170e56edc40..1dc5a218ee8 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {ECFBC0CA-07CD-448D-8B23-660644E9D9FC} - + @@ -46,28 +45,27 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + true true @@ -118,8 +116,8 @@ - - + + @@ -172,16 +170,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/client/packages.config b/cpp/test/Ice/slicing/objects/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/server/packages.config b/cpp/test/Ice/slicing/objects/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj index 4ea19071b84..5163beeb12b 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {3A76C039-4054-4D6C-AA2D-D69C8806FB6E} - + @@ -46,31 +45,30 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - - + + - - + + true true @@ -121,7 +119,7 @@ - + true true @@ -172,17 +170,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config b/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj index dccf188d7ac..281892b9d87 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {5AB527E1-111F-4AD0-8D98-2896E1390A70} - + @@ -46,27 +45,26 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - - + + true true @@ -117,7 +115,7 @@ - + true true @@ -168,21 +166,19 @@ - - + + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/span/msbuild/client/client.vcxproj b/cpp/test/Ice/span/msbuild/client/client.vcxproj index b8c28358f61..cceb4d4ae2d 100644 --- a/cpp/test/Ice/span/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/span/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -133,8 +131,6 @@ 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}. - - diff --git a/cpp/test/Ice/span/msbuild/client/packages.config b/cpp/test/Ice/span/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/span/msbuild/client/packages.config +++ b/cpp/test/Ice/span/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/span/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/span/msbuild/collocated/collocated.vcxproj index b7b1b8f1585..3aee54f6627 100644 --- a/cpp/test/Ice/span/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/span/msbuild/collocated/collocated.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -135,8 +133,6 @@ 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}. - - diff --git a/cpp/test/Ice/span/msbuild/collocated/packages.config b/cpp/test/Ice/span/msbuild/collocated/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/span/msbuild/collocated/packages.config +++ b/cpp/test/Ice/span/msbuild/collocated/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/span/msbuild/server/packages.config b/cpp/test/Ice/span/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/span/msbuild/server/packages.config +++ b/cpp/test/Ice/span/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/span/msbuild/server/server.vcxproj b/cpp/test/Ice/span/msbuild/server/server.vcxproj index 1b08c753870..3c50eb1b25e 100644 --- a/cpp/test/Ice/span/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/span/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -134,8 +132,6 @@ 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}. - - diff --git a/cpp/test/Ice/span/msbuild/serveramd/packages.config b/cpp/test/Ice/span/msbuild/serveramd/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/span/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/span/msbuild/serveramd/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/span/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/span/msbuild/serveramd/serveramd.vcxproj index cab8d9c59bc..66e44ce27ff 100644 --- a/cpp/test/Ice/span/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/span/msbuild/serveramd/serveramd.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -134,8 +132,6 @@ 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}. - - diff --git a/cpp/test/Ice/stream/msbuild/client.vcxproj b/cpp/test/Ice/stream/msbuild/client.vcxproj index 106155c5ef4..984ca67070c 100644 --- a/cpp/test/Ice/stream/msbuild/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {263E5E46-AE57-4B3B-A3CE-7B639674F3A6} - + @@ -46,42 +45,41 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - + - + - + - + true true @@ -108,7 +106,7 @@ - + @@ -137,16 +135,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/stream/msbuild/packages.config b/cpp/test/Ice/stream/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/stream/msbuild/packages.config +++ b/cpp/test/Ice/stream/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj index ee702cad6f7..8c1d2da51e9 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {076446BE-553C-4938-9CF8-BC7DEB1BF235} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - + true true @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/client/packages.config b/cpp/test/Ice/stringConverter/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/server/packages.config b/cpp/test/Ice/stringConverter/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj index 8a889799311..f39d3ba46d4 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {1733A0D9-A75C-47DB-86B9-EF199E48482B} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - + true true @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj index 661aa83b2b9..96cc13f20e6 100644 --- a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {2EE3C8C1-B890-4B24-932D-D699F1825C01} - + @@ -46,35 +45,34 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - - + + + true true @@ -101,7 +99,7 @@ - + true true @@ -128,16 +126,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/client/packages.config b/cpp/test/Ice/timeout/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/timeout/msbuild/client/packages.config +++ b/cpp/test/Ice/timeout/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/server/packages.config b/cpp/test/Ice/timeout/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/timeout/msbuild/server/packages.config +++ b/cpp/test/Ice/timeout/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj index c8ac8814cec..d6c0ca45111 100644 --- a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {ACB2D1AC-CD6D-4AF9-9C11-B0B0AA5C5A8F} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/client/client.vcxproj index 8219099a1cb..5a5a62982cb 100644 --- a/cpp/test/Ice/udp/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {C2A13189-B75A-4ACA-98A0-326956F1F6EA} - + @@ -46,34 +45,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/client/packages.config b/cpp/test/Ice/udp/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/udp/msbuild/client/packages.config +++ b/cpp/test/Ice/udp/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/server/packages.config b/cpp/test/Ice/udp/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Ice/udp/msbuild/server/packages.config +++ b/cpp/test/Ice/udp/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/server/server.vcxproj index f6cfd37a8e7..90b775cf4f5 100644 --- a/cpp/test/Ice/udp/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {B2DDDBC0-559B-46E9-898F-958A1AA8991F} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj index e6d058bda37..9a62da90c2c 100644 --- a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {0AF7FE2E-9C7F-4F87-A999-D397D39CE752} - + @@ -46,31 +45,30 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -97,7 +95,7 @@ - + @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/client/packages.config b/cpp/test/IceBox/admin/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceBox/admin/msbuild/client/packages.config +++ b/cpp/test/IceBox/admin/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/testservice/packages.config b/cpp/test/IceBox/admin/msbuild/testservice/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/packages.config +++ b/cpp/test/IceBox/admin/msbuild/testservice/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj index 89126804dd5..2972d53a705 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,8 +20,8 @@ - - + + true true @@ -49,10 +48,10 @@ - + - + true true @@ -79,12 +78,12 @@ - + {508275B8-D93D-4F1B-BD48-1A4B7420F860} - + @@ -107,28 +106,27 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + $(ProjectName)d @@ -141,14 +139,12 @@ $(ProjectName) - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj index f8f49ed4592..79fe1351199 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {6854119E-CB5F-4B6F-9AB9-49538B9219F6} - + @@ -46,31 +45,30 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -97,7 +95,7 @@ - + @@ -126,16 +124,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/client/packages.config b/cpp/test/IceBox/configuration/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/packages.config +++ b/cpp/test/IceBox/configuration/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/testservice/packages.config b/cpp/test/IceBox/configuration/msbuild/testservice/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/packages.config +++ b/cpp/test/IceBox/configuration/msbuild/testservice/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj index cdd843753c1..dd35b6ef153 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,8 +20,8 @@ - - + + true true @@ -49,10 +48,10 @@ - + - + true true @@ -79,12 +78,12 @@ - + {C4A93019-9757-4999-A1E5-3C019569A525} - + @@ -107,28 +106,27 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + $(ProjectName)d @@ -141,14 +139,12 @@ $(ProjectName) - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj index c72c7ddd360..00b116e34b7 100644 --- a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {86FA255C-ED2F-44E3-989B-F9291165D3E1} - + @@ -46,31 +45,30 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -97,10 +95,10 @@ - + - + @@ -128,14 +126,12 @@ ..\..\Test.ice - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceBridge/simple/msbuild/client/packages.config b/cpp/test/IceBridge/simple/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceBridge/simple/msbuild/client/packages.config +++ b/cpp/test/IceBridge/simple/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceBridge/simple/msbuild/server/packages.config b/cpp/test/IceBridge/simple/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceBridge/simple/msbuild/server/packages.config +++ b/cpp/test/IceBridge/simple/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj index ae86d045e1e..e890b925b07 100644 --- a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {4D76D578-E858-485E-8498-9FC604B3B069} - + @@ -46,31 +45,30 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -123,19 +121,17 @@ - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj index 51cf056ea15..9776e7bcdad 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {8458C2DB-4B5E-4CC9-9365-571C62B2832F} - + @@ -46,46 +45,45 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - + - + - + - + - - + + true true @@ -138,16 +136,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/client/packages.config b/cpp/test/IceDiscovery/simple/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/packages.config +++ b/cpp/test/IceDiscovery/simple/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/server/packages.config b/cpp/test/IceDiscovery/simple/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/packages.config +++ b/cpp/test/IceDiscovery/simple/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj index 2e258c19c77..33e347ede20 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {667B765B-502E-46C3-92EE-DDDDC657ED2D} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj index 1538e707617..b533b17f74a 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -124,16 +122,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/client/packages.config b/cpp/test/IceGrid/activation/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/packages.config +++ b/cpp/test/IceGrid/activation/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/server/packages.config b/cpp/test/IceGrid/activation/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/packages.config +++ b/cpp/test/IceGrid/activation/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj index 11bf25e2107..2791fe81899 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {C00984F2-B825-45AF-86EC-A4FEF70B02C8} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -98,7 +96,7 @@ - + true true @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/admin/msbuild/packages.config b/cpp/test/IceGrid/admin/msbuild/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/IceGrid/admin/msbuild/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/IceGrid/admin/msbuild/server.vcxproj b/cpp/test/IceGrid/admin/msbuild/server.vcxproj index 88eeb968085..23df134db0e 100644 --- a/cpp/test/IceGrid/admin/msbuild/server.vcxproj +++ b/cpp/test/IceGrid/admin/msbuild/server.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -20,15 +19,12 @@ - - - - + {2CF45619-1C69-4072-B869-817D7954CABF} - + Application true @@ -49,30 +45,26 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - + + 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}. - - \ No newline at end of file diff --git a/cpp/test/IceGrid/admin/msbuild/server.vcxproj.filters b/cpp/test/IceGrid/admin/msbuild/server.vcxproj.filters index a3af3e77642..d15d8bd0b34 100644 --- a/cpp/test/IceGrid/admin/msbuild/server.vcxproj.filters +++ b/cpp/test/IceGrid/admin/msbuild/server.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj index 91c0d6e94be..471bdb0bba2 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -124,16 +122,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/client/packages.config b/cpp/test/IceGrid/allocation/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/server/packages.config b/cpp/test/IceGrid/allocation/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj index 854e0d7d941..7a6cd0b8202 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {5DBA95DD-954C-4B77-A2D1-42E959B27C36} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -98,7 +96,7 @@ - + true true @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config b/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj index 25093bfd89d..48e0d8017a7 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {9EA751B7-04D5-484C-89EF-03AA2782B1D6} - + Application true @@ -43,36 +42,29 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - - - + - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj.filters b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj.filters index 06f4fc1b808..7a930596892 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj.filters +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj index 445c00bb964..c1f4e7bee6e 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -124,16 +122,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/client/packages.config b/cpp/test/IceGrid/deployer/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/server/packages.config b/cpp/test/IceGrid/deployer/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj index c3f3fc85426..dded54263ef 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -98,7 +96,7 @@ - + true true @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config b/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj index bffa39e4326..0fdd830f655 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {C3955110-CB5E-484A-938C-D7861E08D43B} - + DynamicLibrary true @@ -44,25 +43,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + $(ProjectName)d @@ -76,14 +74,14 @@ $(ProjectName) - + - + - - + + true true @@ -110,7 +108,7 @@ - + true true @@ -137,16 +135,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj index a048e78233d..24873c6c466 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -124,16 +122,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj index 472de78af81..f09b4c79bf9 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {8680F272-78C1-41E2-AE78-10E37BFC6F53} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -98,7 +96,7 @@ - + true true @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj index 2c77307760d..f097b386b88 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D} - + DynamicLibrary true @@ -44,25 +43,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + $(ProjectName) @@ -76,14 +74,14 @@ $(ProjectName)d - + - + - - + + true true @@ -110,7 +108,7 @@ - + true true @@ -137,16 +135,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj index 3beb46cd777..dae99137695 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {849F83BA-7817-419C-93E5-9F92541F773F} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -124,16 +122,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj index db03f509a1e..3a19c564605 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -20,15 +19,12 @@ - - - - + {77CB36FD-F130-4416-B6B7-C24EFD83630E} - + DynamicLibrary true @@ -49,30 +45,26 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - + + 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}. - - \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj.filters b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj.filters index b4952c36508..ecd3425166c 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj.filters +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj index 50926c4e5b6..36e2cc4a601 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {DA51489E-AC9D-4D59-89FC-1F103449CC5A} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -98,7 +96,7 @@ - + true true @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj index 77934668df3..1106f806459 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {299B54D9-A682-40D5-B87B-A0C21BF1E839} - + DynamicLibrary true @@ -44,25 +43,24 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + $(ProjectName)d @@ -76,14 +74,14 @@ $(ProjectName) - + - + - - + + true true @@ -110,7 +108,7 @@ - + true true @@ -137,16 +135,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj index 6e0ce9e58bb..a325a8994a2 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {D306ADCE-34A1-4599-BD50-8598BB92B47F} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -124,16 +122,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/client/packages.config b/cpp/test/IceGrid/replication/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/packages.config +++ b/cpp/test/IceGrid/replication/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/server/packages.config b/cpp/test/IceGrid/replication/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/packages.config +++ b/cpp/test/IceGrid/replication/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj index 1864db4fda0..0c8911667c3 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {3A517759-2BC3-4110-97AA-E5E7E45EA3D8} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -98,7 +96,7 @@ - + true true @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj index 19cb315672d..afbf21a7f41 100644 --- a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {8EBD7C12-5623-467F-B80D-CFBB4C695771} - + Application true @@ -44,43 +43,40 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/client/packages.config b/cpp/test/IceGrid/session/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/session/msbuild/client/packages.config +++ b/cpp/test/IceGrid/session/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/server/packages.config b/cpp/test/IceGrid/session/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/session/msbuild/server/packages.config +++ b/cpp/test/IceGrid/session/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj index a3489f73361..d8b99f2be28 100644 --- a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {00000035-0000-0000-0000-000000000000} - + Application true @@ -44,42 +43,39 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/verifier/packages.config b/cpp/test/IceGrid/session/msbuild/verifier/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/packages.config +++ b/cpp/test/IceGrid/session/msbuild/verifier/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj index f0340c660b3..30d04c0cdae 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {16EED45E-8D20-40EF-BB30-9DDD5A11B352} - + Application true @@ -44,42 +43,39 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj index 4b7fbf8cbf2..3993fc20815 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E} - + Application true @@ -44,58 +43,57 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + 4503;%(DisableSpecificWarnings) - + 4503;%(DisableSpecificWarnings) - + 4503;%(DisableSpecificWarnings) - + 4503;%(DisableSpecificWarnings) - + - + - - + + true true @@ -148,16 +146,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/client/packages.config b/cpp/test/IceGrid/simple/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/packages.config +++ b/cpp/test/IceGrid/simple/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/server/packages.config b/cpp/test/IceGrid/simple/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/packages.config +++ b/cpp/test/IceGrid/simple/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj index 3f7270ea3fb..628d5cb23b6 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {C5606B09-9FB7-4337-A490-2024CDCE4036} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -98,7 +96,7 @@ - + true true @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj index 0fb4ccee904..4043fc56caa 100644 --- a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {12405F8D-7361-450D-8AFE-85BFD3AEEFD7} - + Application true @@ -44,46 +43,45 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - + - + - + - + - - + + true true @@ -136,16 +134,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/client/packages.config b/cpp/test/IceGrid/update/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/update/msbuild/client/packages.config +++ b/cpp/test/IceGrid/update/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/server/packages.config b/cpp/test/IceGrid/update/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceGrid/update/msbuild/server/packages.config +++ b/cpp/test/IceGrid/update/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj index fd95d40a72d..55b12427a4e 100644 --- a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {D7224A94-13EF-4253-B3EA-801295D5966B} - + Application true @@ -44,34 +43,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + - - + + true true @@ -98,7 +96,7 @@ - + true true @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj index 21f58efc376..d8e55f46132 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -155,8 +153,6 @@ 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}. - - diff --git a/cpp/test/IceSSL/configuration/msbuild/client/packages.config b/cpp/test/IceSSL/configuration/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj deleted file mode 100644 index f80ef513168..00000000000 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {34135D29-7ABF-416E-80A9-4077BD6A126F} - - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - - - - - - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - - - - - - - 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}. - - - - - - - - \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj.filters b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj.filters deleted file mode 100644 index c18e57d332d..00000000000 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj.filters +++ /dev/null @@ -1,93 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files\x64\Debug - - - Source Files\Win32\Debug - - - Source Files\x64\Release - - - Source Files\Win32\Release - - - - - {08bcf4bb-8da2-42d3-a2e4-4e48275b80d0} - ice - - - {1f195fdb-30ae-41ba-9fc9-760d564bff78} - - - {caa10804-d3fd-4300-afcd-38f17bad5b69} - - - {cff6ff58-cfc7-4ff9-8b6e-983c9eadeeea} - - - {b527d98a-2399-4c39-8963-1619d21e27cc} - - - {9dce4a10-5e39-41c2-9125-d537fcaf0562} - - - {7f2c40d1-5e97-4d10-9d0a-16905ab8ad76} - - - {50206de0-b08c-445c-9e80-58c39cc5278f} - - - {592034df-71c8-4fe2-a3dd-1b0683b74287} - - - {4648dae2-7d22-4cdd-b1cc-be2621e6bae6} - - - {04269c9d-f32a-40b9-937d-f44b065331d4} - - - {506cfce3-3fb6-4bbb-b397-72bc6feff9c6} - - - {37ab9376-8d7d-42b9-aaf3-bcab54ab0688} - - - {c8295b1f-a0c2-4a59-bfeb-da9bd3b79cd3} - - - {39ff1ead-1815-4af9-a2cd-457b6f0ed399} - - - - - Header Files\x64\Debug - - - Header Files\Win32\Debug - - - Header Files\x64\Release - - - Header Files\Win32\Release - - - - - - - - Slice Files - - - \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config deleted file mode 100644 index 5b58e8823dd..00000000000 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/server/packages.config b/cpp/test/IceSSL/configuration/msbuild/server/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/server/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj index bb460b641c2..05331dac05d 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {8A420B3E-C5C5-403B-874A-6D2A5A51783B} - + @@ -46,33 +45,32 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - - + + true true @@ -99,7 +97,7 @@ - + true true @@ -126,17 +124,15 @@ - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config deleted file mode 100644 index 5b58e8823dd..00000000000 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj deleted file mode 100644 index 9b79ab96d1a..00000000000 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {1A83DE5F-3401-4D5D-B9FE-A930D5B15F39} - - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - - - ICE_USE_OPENSSL;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - - - - - - - - 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}. - - - - - - \ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj.filters b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj.filters deleted file mode 100644 index 1ea1bd777ac..00000000000 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj.filters +++ /dev/null @@ -1,96 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files\x64\Debug - - - Source Files\Win32\Debug - - - Source Files\x64\Release - - - Source Files\Win32\Release - - - - - {00922b8a-f9c7-4876-87dc-7e1d5239cb67} - - - {632a0f02-496e-48af-b566-685d2b84964d} - ice - - - {f493b829-501f-4bb7-812e-55f66f4fea51} - - - {d25424dc-4b3f-4dec-a83a-54d4de89fefe} - - - {b2c4157f-5d2d-45fb-b193-c6d7da06190a} - - - {b35ef6e1-7178-4b4e-a992-0ba588b047fd} - - - {9caa42de-c763-47d9-9f4d-e3ae67b23a9d} - - - {f31275fe-6cc1-47c6-bdfd-74984e2ea306} - - - {069e1eb3-2e20-47c2-89a3-083203109449} - - - {250998b2-ec62-41fe-b480-87aecbef67e6} - - - {b575266a-2948-4ee0-8bd0-cede3812b41c} - - - {89df9379-399c-4bfc-9d60-f371b41f3936} - - - {1c318068-a0ce-4ce7-9544-b19709fa509d} - - - {a3c4f295-3c3b-4774-83be-211a3cb1a990} - - - {f5e99acb-dae1-4563-8086-882077ef946f} - - - - - Header Files - - - Header Files\x64\Debug - - - Header Files\Win32\Debug - - - Header Files\x64\Release - - - Header Files\Win32\Release - - - - - - - - Slice Files - - - \ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/publisher/packages.config b/cpp/test/IceStorm/federation/msbuild/publisher/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/federation/msbuild/publisher/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj index 8ee3cabfd0c..d8cbf40a748 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,10 +20,10 @@ - + - + true true @@ -77,12 +76,12 @@ - + {F2FC008C-2972-481A-9E30-2D194E1DBAD7} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config b/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj index 58bd693b05d..39f2967eecb 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,10 +20,10 @@ - + - + true true @@ -77,12 +76,12 @@ - + {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config b/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj index 2da81e39f7c..ccba00a881a 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,10 +20,10 @@ - + - + true true @@ -77,12 +76,12 @@ - + {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config b/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj index c40eac72657..c6e44c8c385 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,10 +20,10 @@ - + - + true true @@ -77,12 +76,12 @@ - + {E879E538-6746-4EEE-8D70-0FC80B8A2FAC} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj b/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj index e54502bcaca..0207525569f 100644 --- a/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj +++ b/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,15 +20,15 @@ - + - + {7D48DD81-247D-467E-B94C-D23EC94BDAB0} - + Application true @@ -50,36 +49,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/persistent/msbuild/client/packages.config b/cpp/test/IceStorm/persistent/msbuild/client/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/persistent/msbuild/client/packages.config +++ b/cpp/test/IceStorm/persistent/msbuild/client/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config b/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj index 68098fa959a..d0bee7c7fb0 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,7 +20,7 @@ - + true true @@ -48,7 +47,7 @@ - + @@ -77,12 +76,12 @@ - + {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/packages.config b/cpp/test/IceStorm/rep1/msbuild/sub/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/sub/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj index 643674dbb3b..1ab2907a3fa 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,10 +20,10 @@ - + - + true true @@ -77,12 +76,12 @@ - + {E6690528-7BB9-4B8E-8F15-4F3C58A736B9} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config b/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj index 11908986de8..d33e937c256 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,7 +20,7 @@ - + true true @@ -48,7 +47,7 @@ - + @@ -77,12 +76,12 @@ - + {CB22725D-1669-4945-83D3-81CA767F0B56} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj index 8334339e610..a550cc94dbb 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj +++ b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,10 +20,10 @@ - + - + true true @@ -77,12 +76,12 @@ - + {C988F9AD-ED3C-4796-A7F5-CE7678FD689A} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/repgrid/msbuild/packages.config b/cpp/test/IceStorm/repgrid/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/packages.config +++ b/cpp/test/IceStorm/repgrid/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj index 8361a7c3dd8..7365cf46b75 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,7 +20,7 @@ - + true true @@ -72,8 +71,8 @@ - - + + @@ -126,12 +125,12 @@ - + {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA} - + Application true @@ -152,36 +151,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/control/packages.config b/cpp/test/IceStorm/repstress/msbuild/control/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/control/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config b/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj index d748a6030ba..d4e01f776d5 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,7 +20,7 @@ - + true true @@ -72,8 +71,8 @@ - - + + @@ -126,12 +125,12 @@ - + {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0} - + Application true @@ -152,36 +151,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config b/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj index b7e0c8bbfbe..77b15b3c651 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,7 +20,7 @@ - + true true @@ -72,8 +71,8 @@ - - + + @@ -126,12 +125,12 @@ - + {6020F924-5846-452A-B704-BA762AC106DD} - + Application true @@ -152,36 +151,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/publisher/packages.config b/cpp/test/IceStorm/single/msbuild/publisher/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/single/msbuild/publisher/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj index cdb6317f274..37653100d89 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,10 +20,10 @@ - + - + true true @@ -77,12 +76,12 @@ - + {83801760-CFF3-4B11-9CA5-4598C0DBC442} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/subscriber/packages.config b/cpp/test/IceStorm/single/msbuild/subscriber/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/single/msbuild/subscriber/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj index ab8dd0ab3eb..7c9f7c4d5b2 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,7 +20,7 @@ - + true true @@ -48,7 +47,7 @@ - + @@ -77,12 +76,12 @@ - + {7186CBA9-18FE-4868-8A2F-2CF50F66132A} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/publisher/packages.config b/cpp/test/IceStorm/stress/msbuild/publisher/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/stress/msbuild/publisher/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj index 57b13aa87ce..07983fdaa4c 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,7 +20,7 @@ - + true true @@ -48,7 +47,7 @@ - + @@ -77,12 +76,12 @@ - + {1F040862-DAB3-4F65-893D-0023BD2BD0E4} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config b/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj index fb8ef68dbc3..7c2d8167788 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -21,7 +20,7 @@ - + true true @@ -48,7 +47,7 @@ - + @@ -77,12 +76,12 @@ - + {529BDB9A-7714-4CC6-A116-189159D8CC4A} - + Application true @@ -103,36 +102,33 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - - + + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj index 95b66485748..688880608ce 100644 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {74127AED-9D17-4789-8B2F-9CCD660E7204} - + @@ -45,36 +44,29 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - - - + - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj.filters b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj.filters index ba01dcaddaa..dffdf7ec6c4 100644 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj.filters +++ b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config b/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj index ed565c285af..ed10b38566e 100644 --- a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {15F7115E-5CD1-4CC9-9B8C-9C9357801302} - + @@ -45,36 +44,29 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - - - + - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj.filters b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj.filters index a3967fd4603..d594c3a7959 100644 --- a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj.filters +++ b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/sha1/msbuild/packages.config b/cpp/test/IceUtil/sha1/msbuild/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/IceUtil/sha1/msbuild/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj index 5f2b6f18008..3ee75dfb85c 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {66CF01A0-7BE5-482E-8D27-6294E691B084} - + @@ -45,24 +44,22 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - + ..;%(AdditionalIncludeDirectories) @@ -96,17 +93,12 @@ - - - - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj.filters b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj.filters index 38999d3e638..cd4596b8f5d 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj.filters +++ b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj.filters @@ -9,7 +9,4 @@ ice - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/msbuild/packages.config b/cpp/test/IceUtil/stacktrace/msbuild/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/IceUtil/stacktrace/msbuild/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/time/msbuild/client.vcxproj b/cpp/test/IceUtil/time/msbuild/client.vcxproj deleted file mode 100644 index e9787c2d4e4..00000000000 --- a/cpp/test/IceUtil/time/msbuild/client.vcxproj +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {B1C09F91-405B-448C-84FE-1BB4E29CA620} - - - - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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}. - - - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/time/msbuild/client.vcxproj.filters b/cpp/test/IceUtil/time/msbuild/client.vcxproj.filters deleted file mode 100644 index 3473916ceeb..00000000000 --- a/cpp/test/IceUtil/time/msbuild/client.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {e0c18e06-ec7e-4c1a-8da1-2afe74a06a99} - - - {7da7fba7-5278-4768-a68d-17f47e6e16b0} - ice - - - - - Source Files - - - - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/time/msbuild/packages.config b/cpp/test/IceUtil/time/msbuild/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/IceUtil/time/msbuild/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/timer/msbuild/client.vcxproj b/cpp/test/IceUtil/timer/msbuild/client.vcxproj index faf2bde99ac..4b15840d3be 100644 --- a/cpp/test/IceUtil/timer/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/timer/msbuild/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {6D50FDCA-D1EB-4C60-9654-BB9FB9EA148B} - + @@ -45,36 +44,29 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - - - + - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/IceUtil/timer/msbuild/client.vcxproj.filters b/cpp/test/IceUtil/timer/msbuild/client.vcxproj.filters index 3473916ceeb..84bf059c64f 100644 --- a/cpp/test/IceUtil/timer/msbuild/client.vcxproj.filters +++ b/cpp/test/IceUtil/timer/msbuild/client.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/timer/msbuild/packages.config b/cpp/test/IceUtil/timer/msbuild/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/IceUtil/timer/msbuild/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj index dcb46c34462..13946632870 100644 --- a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {CFB00773-94A6-411F-A2C1-20BC52772510} - + @@ -45,36 +44,29 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - - - + - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj.filters b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj.filters index 82b944d8035..a1627b57ca2 100644 --- a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj.filters +++ b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/unicode/msbuild/packages.config b/cpp/test/IceUtil/unicode/msbuild/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/IceUtil/unicode/msbuild/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj index 375cbbf0d6e..831e3cd21d3 100644 --- a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -22,7 +21,7 @@ {03ECBDF1-F8FB-40B0-8CC4-7F26D045B894} - + @@ -45,36 +44,29 @@ false $(DefaultPlatformToolset) - - - - - + + + - + - + - + - + - - - - + - + - + 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}. - - \ No newline at end of file diff --git a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj.filters b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj.filters index bd79ae865bb..91f146bfacc 100644 --- a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj.filters +++ b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj.filters @@ -14,7 +14,4 @@ Source Files - - - \ No newline at end of file diff --git a/cpp/test/IceUtil/uuid/msbuild/packages.config b/cpp/test/IceUtil/uuid/msbuild/packages.config deleted file mode 100644 index 71004b51d1b..00000000000 --- a/cpp/test/IceUtil/uuid/msbuild/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cpp/test/Slice/deprecated/msbuild/client.vcxproj b/cpp/test/Slice/deprecated/msbuild/client.vcxproj index 409faeb0f36..8f2d71de4aa 100644 --- a/cpp/test/Slice/deprecated/msbuild/client.vcxproj +++ b/cpp/test/Slice/deprecated/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -132,8 +130,6 @@ 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}. - - diff --git a/cpp/test/Slice/deprecated/msbuild/packages.config b/cpp/test/Slice/deprecated/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Slice/deprecated/msbuild/packages.config +++ b/cpp/test/Slice/deprecated/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Slice/escape/msbuild/client.vcxproj b/cpp/test/Slice/escape/msbuild/client.vcxproj index 876799f455d..39e0a2d8130 100644 --- a/cpp/test/Slice/escape/msbuild/client.vcxproj +++ b/cpp/test/Slice/escape/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC} - + @@ -46,30 +45,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + true true @@ -120,8 +118,8 @@ - - + + @@ -174,16 +172,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Slice/escape/msbuild/packages.config b/cpp/test/Slice/escape/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Slice/escape/msbuild/packages.config +++ b/cpp/test/Slice/escape/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Slice/macros/msbuild/client.vcxproj b/cpp/test/Slice/macros/msbuild/client.vcxproj index e0a906ffde5..1bc4754a372 100644 --- a/cpp/test/Slice/macros/msbuild/client.vcxproj +++ b/cpp/test/Slice/macros/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3} - + @@ -46,30 +45,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + true true @@ -96,7 +94,7 @@ - + @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Slice/macros/msbuild/packages.config b/cpp/test/Slice/macros/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Slice/macros/msbuild/packages.config +++ b/cpp/test/Slice/macros/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Slice/parser/msbuild/client.vcxproj b/cpp/test/Slice/parser/msbuild/client.vcxproj index ec09628fcfa..8db0a3cb1c5 100644 --- a/cpp/test/Slice/parser/msbuild/client.vcxproj +++ b/cpp/test/Slice/parser/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -153,7 +152,6 @@ - @@ -179,9 +177,7 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/Slice/parser/msbuild/packages.config b/cpp/test/Slice/parser/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Slice/parser/msbuild/packages.config +++ b/cpp/test/Slice/parser/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Slice/print/msbuild/client.vcxproj b/cpp/test/Slice/print/msbuild/client.vcxproj index e033152311f..5d9c065c9f8 100644 --- a/cpp/test/Slice/print/msbuild/client.vcxproj +++ b/cpp/test/Slice/print/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -49,7 +48,6 @@ - @@ -153,8 +151,6 @@ 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}. - - diff --git a/cpp/test/Slice/print/msbuild/packages.config b/cpp/test/Slice/print/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Slice/print/msbuild/packages.config +++ b/cpp/test/Slice/print/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Slice/structure/msbuild/client.vcxproj b/cpp/test/Slice/structure/msbuild/client.vcxproj index 54268bc20c2..bd044c92c4f 100644 --- a/cpp/test/Slice/structure/msbuild/client.vcxproj +++ b/cpp/test/Slice/structure/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - + - - + Debug @@ -23,7 +22,7 @@ {24E0F8DA-F197-4E4B-8820-0614713CD8A9} - + @@ -46,30 +45,29 @@ false $(DefaultPlatformToolset) - - + + - - + - + - + - + - + - + - + - + true true @@ -96,7 +94,7 @@ - + @@ -125,16 +123,14 @@ - + - + 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}. - - - - + + \ No newline at end of file diff --git a/cpp/test/Slice/structure/msbuild/packages.config b/cpp/test/Slice/structure/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Slice/structure/msbuild/packages.config +++ b/cpp/test/Slice/structure/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj index eec529ec026..34b746d73bb 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj +++ b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj @@ -1,7 +1,6 @@ - Debug @@ -46,7 +45,6 @@ - @@ -128,9 +126,7 @@ 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}. - - - + \ No newline at end of file diff --git a/cpp/test/Slice/utf8BOM/msbuild/packages.config b/cpp/test/Slice/utf8BOM/msbuild/packages.config index a36cb289a52..fb43e38f42f 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/packages.config +++ b/cpp/test/Slice/utf8BOM/msbuild/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj index 735ae42f730..62e5c91b5f3 100644 --- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj +++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj @@ -40,7 +40,7 @@ "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h", ); runOncePerArchitecture = 0; - script = "#export ICE_BIN_DIST=all\n../../../../scripts/ice-builder-xcode-wrapper --cpp\n"; + script = "../../../../scripts/ice-builder-xcode-wrapper --cpp\n"; }; /* End PBXBuildRule section */ diff --git a/csharp/BUILDING.md b/csharp/BUILDING.md index e2286e6d1e5..b41d0abd621 100644 --- a/csharp/BUILDING.md +++ b/csharp/BUILDING.md @@ -8,7 +8,6 @@ resulting binaries. As an alternative, you can download and install the * [Windows Build Requirements](#windows-build-requirements) * [Compiling Ice for \.NET on Windows](#compiling-ice-for-net-on-windows) * [Authenticode Signatures](#authenticode-signatures) - * [Building only the Test Suite](#building-only-the-test-suite) * [Building on Linux or macOS](#building-on-linux-or-macos) * [Linux and macOS Build Requirements](#linux-and-macos-build-requirements) * [Compiling Ice for \.NET on Linux or macOS](#compiling-ice-for-net-on-linux-or-macos) @@ -63,17 +62,6 @@ environment variables before building these assemblies: *Authenticode can be generated only from Windows builds.* -#### Building only the Test Suite - -You can build only the test suite with this command: - -```shell -msbuild msbuild\ice.proj /p:ICE_BIN_DIST=all -``` - -This build retrieves and installs the `zeroc.ice.net` NuGet package if -necessary. - ## Building on Linux or macOS ### Linux and macOS Build Requirements diff --git a/csharp/msbuild/ice.common.props b/csharp/msbuild/ice.common.props index b6fed74c78b..3bf540b2154 100644 --- a/csharp/msbuild/ice.common.props +++ b/csharp/msbuild/ice.common.props @@ -29,41 +29,37 @@ - + + + $(MSBuildThisFileDirectory)..\.. + $(MSBuildThisFileDirectory)..\lib + - - - $(MSBuildThisFileDirectory)..\.. - $(MSBuildThisFileDirectory)..\lib - + - - - - - $(IceHome)\cpp\bin\$(CppPlatform)\$(Configuration) - - - - - $(IceHome)\cpp\bin\x64\$(Configuration) - - - - - $(IceHome)\cpp\bin\Win32\$(Configuration) - - - + + + $(IceHome)\cpp\bin\$(CppPlatform)\$(Configuration) + - + - $(IceHome)\cpp\bin + $(IceHome)\cpp\bin\x64\$(Configuration) - + + + + $(IceHome)\cpp\bin\Win32\$(Configuration) + + + + + $(IceHome)\cpp\bin + + diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj index d2a344d38b6..b0f38972ad0 100644 --- a/csharp/msbuild/ice.proj +++ b/csharp/msbuild/ice.proj @@ -20,7 +20,7 @@ - + - + Configuration=$(Configuration);Platform=Any CPU;CppPlatform=$(CppPlatform) diff --git a/csharp/msbuild/ice.test.props b/csharp/msbuild/ice.test.props index 1eb6cdaf19b..cf22c03fb67 100644 --- a/csharp/msbuild/ice.test.props +++ b/csharp/msbuild/ice.test.props @@ -1,8 +1,6 @@ - - + diff --git a/csharp/test/Glacier2/router/msbuild/client/client.csproj b/csharp/test/Glacier2/router/msbuild/client/client.csproj index 3e94a4f7471..d1f197d8936 100644 --- a/csharp/test/Glacier2/router/msbuild/client/client.csproj +++ b/csharp/test/Glacier2/router/msbuild/client/client.csproj @@ -21,18 +21,7 @@ + + - - - - - - - - - - - - - diff --git a/csharp/test/Glacier2/router/msbuild/server/server.csproj b/csharp/test/Glacier2/router/msbuild/server/server.csproj index 0a86f5a77f6..9708cca452c 100644 --- a/csharp/test/Glacier2/router/msbuild/server/server.csproj +++ b/csharp/test/Glacier2/router/msbuild/server/server.csproj @@ -22,17 +22,8 @@ - - - - - - - - - - - - - + + + + diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj index c18776d06f7..9d1856f81f8 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj index 70ffb2def48..577d89ddc05 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj @@ -25,16 +25,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj index 3cb83f59e20..2f524fbb1e3 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/admin/msbuild/client/client.csproj b/csharp/test/Ice/admin/msbuild/client/client.csproj index 792cb0f28ae..eedbbe8d248 100644 --- a/csharp/test/Ice/admin/msbuild/client/client.csproj +++ b/csharp/test/Ice/admin/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/admin/msbuild/server/server.csproj b/csharp/test/Ice/admin/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/Ice/admin/msbuild/server/server.csproj +++ b/csharp/test/Ice/admin/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/ami/msbuild/client/client.csproj b/csharp/test/Ice/ami/msbuild/client/client.csproj index 627e0e14fcc..ff455701c67 100644 --- a/csharp/test/Ice/ami/msbuild/client/client.csproj +++ b/csharp/test/Ice/ami/msbuild/client/client.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj b/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj index 24bbe00139e..66cd55d74a4 100644 --- a/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/ami/msbuild/server/server.csproj b/csharp/test/Ice/ami/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/Ice/ami/msbuild/server/server.csproj +++ b/csharp/test/Ice/ami/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/assemblies/msbuild/client/client.csproj b/csharp/test/Ice/assemblies/msbuild/client/client.csproj index 913c0148d0d..102708a10b8 100644 --- a/csharp/test/Ice/assemblies/msbuild/client/client.csproj +++ b/csharp/test/Ice/assemblies/msbuild/client/client.csproj @@ -19,16 +19,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/assemblies/msbuild/core/core.csproj b/csharp/test/Ice/assemblies/msbuild/core/core.csproj index 3aa0364fe24..6b90da46e33 100644 --- a/csharp/test/Ice/assemblies/msbuild/core/core.csproj +++ b/csharp/test/Ice/assemblies/msbuild/core/core.csproj @@ -23,16 +23,7 @@ ../../Core.ice - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/assemblies/msbuild/user/user.csproj b/csharp/test/Ice/assemblies/msbuild/user/user.csproj index e9b08ca61b8..8924b16e69a 100644 --- a/csharp/test/Ice/assemblies/msbuild/user/user.csproj +++ b/csharp/test/Ice/assemblies/msbuild/user/user.csproj @@ -30,16 +30,7 @@ ../../User.ice - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/background/msbuild/client/client.csproj b/csharp/test/Ice/background/msbuild/client/client.csproj index 12dac83c4e8..8e309b93cca 100644 --- a/csharp/test/Ice/background/msbuild/client/client.csproj +++ b/csharp/test/Ice/background/msbuild/client/client.csproj @@ -29,16 +29,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/background/msbuild/server/server.csproj b/csharp/test/Ice/background/msbuild/server/server.csproj index c538ac5985e..2b199c86b46 100644 --- a/csharp/test/Ice/background/msbuild/server/server.csproj +++ b/csharp/test/Ice/background/msbuild/server/server.csproj @@ -30,16 +30,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/binding/msbuild/client/client.csproj b/csharp/test/Ice/binding/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/binding/msbuild/client/client.csproj +++ b/csharp/test/Ice/binding/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/binding/msbuild/server/server.csproj b/csharp/test/Ice/binding/msbuild/server/server.csproj index c746cd8b350..4d27e946576 100644 --- a/csharp/test/Ice/binding/msbuild/server/server.csproj +++ b/csharp/test/Ice/binding/msbuild/server/server.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/defaultServant/msbuild/client/client.csproj b/csharp/test/Ice/defaultServant/msbuild/client/client.csproj index a6782a7ce11..0e3dbf49e0c 100644 --- a/csharp/test/Ice/defaultServant/msbuild/client/client.csproj +++ b/csharp/test/Ice/defaultServant/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/defaultValue/msbuild/client/client.csproj b/csharp/test/Ice/defaultValue/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/defaultValue/msbuild/client/client.csproj +++ b/csharp/test/Ice/defaultValue/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/dictMapping/msbuild/client/client.csproj b/csharp/test/Ice/dictMapping/msbuild/client/client.csproj index c8a0af8b41a..a6a7ac1b2d5 100644 --- a/csharp/test/Ice/dictMapping/msbuild/client/client.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/client/client.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj b/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj index 8c7cc1b3917..9097883239c 100644 --- a/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj @@ -25,16 +25,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/dictMapping/msbuild/server/server.csproj b/csharp/test/Ice/dictMapping/msbuild/server/server.csproj index 8e425fddbab..ea1f4425dbd 100644 --- a/csharp/test/Ice/dictMapping/msbuild/server/server.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj index 629f2426d86..199a6859fdc 100644 --- a/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/echo/msbuild/server/server.csproj b/csharp/test/Ice/echo/msbuild/server/server.csproj index 4e112e36866..3e0fdbd79d3 100644 --- a/csharp/test/Ice/echo/msbuild/server/server.csproj +++ b/csharp/test/Ice/echo/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/enums/msbuild/client/client.csproj b/csharp/test/Ice/enums/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/enums/msbuild/client/client.csproj +++ b/csharp/test/Ice/enums/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/enums/msbuild/server/server.csproj b/csharp/test/Ice/enums/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/Ice/enums/msbuild/server/server.csproj +++ b/csharp/test/Ice/enums/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/exceptions/msbuild/client/client.csproj b/csharp/test/Ice/exceptions/msbuild/client/client.csproj index 83e5de10733..9940e9677f4 100644 --- a/csharp/test/Ice/exceptions/msbuild/client/client.csproj +++ b/csharp/test/Ice/exceptions/msbuild/client/client.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj b/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj index b5e45a34fd2..c99cb24b838 100644 --- a/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj @@ -25,16 +25,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/exceptions/msbuild/server/server.csproj b/csharp/test/Ice/exceptions/msbuild/server/server.csproj index 2d980a50471..437d1f74393 100644 --- a/csharp/test/Ice/exceptions/msbuild/server/server.csproj +++ b/csharp/test/Ice/exceptions/msbuild/server/server.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj index f1a260ef0b6..57ee5e3b2a1 100644 --- a/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/executor/msbuild/client/client.csproj b/csharp/test/Ice/executor/msbuild/client/client.csproj index 0cc2af70e70..42a066ffab3 100644 --- a/csharp/test/Ice/executor/msbuild/client/client.csproj +++ b/csharp/test/Ice/executor/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/executor/msbuild/collocated/collocated.csproj b/csharp/test/Ice/executor/msbuild/collocated/collocated.csproj index 22851072a20..95ca2e131fa 100644 --- a/csharp/test/Ice/executor/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/executor/msbuild/collocated/collocated.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/executor/msbuild/server/server.csproj b/csharp/test/Ice/executor/msbuild/server/server.csproj index 3ccc213f3b3..ca1473c2914 100644 --- a/csharp/test/Ice/executor/msbuild/server/server.csproj +++ b/csharp/test/Ice/executor/msbuild/server/server.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/facets/msbuild/client/client.csproj b/csharp/test/Ice/facets/msbuild/client/client.csproj index d3cef1b930a..fa986c5fc72 100644 --- a/csharp/test/Ice/facets/msbuild/client/client.csproj +++ b/csharp/test/Ice/facets/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj b/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj index 67b2880b3bd..7ac21203785 100644 --- a/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj @@ -31,16 +31,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/facets/msbuild/server/server.csproj b/csharp/test/Ice/facets/msbuild/server/server.csproj index 4d005e8fc0b..2ebd64021d6 100644 --- a/csharp/test/Ice/facets/msbuild/server/server.csproj +++ b/csharp/test/Ice/facets/msbuild/server/server.csproj @@ -30,16 +30,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj b/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj +++ b/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj b/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj +++ b/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/hash/msbuild/client/client.csproj b/csharp/test/Ice/hash/msbuild/client/client.csproj index 746168dff8c..c3cb98fa7ab 100644 --- a/csharp/test/Ice/hash/msbuild/client/client.csproj +++ b/csharp/test/Ice/hash/msbuild/client/client.csproj @@ -21,16 +21,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/hold/msbuild/client/client.csproj b/csharp/test/Ice/hold/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/hold/msbuild/client/client.csproj +++ b/csharp/test/Ice/hold/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/hold/msbuild/server/server.csproj b/csharp/test/Ice/hold/msbuild/server/server.csproj index 051c08af2f4..1c25b1dd294 100644 --- a/csharp/test/Ice/hold/msbuild/server/server.csproj +++ b/csharp/test/Ice/hold/msbuild/server/server.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/idleTimeout/msbuild/client/client.csproj b/csharp/test/Ice/idleTimeout/msbuild/client/client.csproj index 792cb0f28ae..eedbbe8d248 100644 --- a/csharp/test/Ice/idleTimeout/msbuild/client/client.csproj +++ b/csharp/test/Ice/idleTimeout/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/idleTimeout/msbuild/server/server.csproj b/csharp/test/Ice/idleTimeout/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/Ice/idleTimeout/msbuild/server/server.csproj +++ b/csharp/test/Ice/idleTimeout/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/inactivityTimeout/msbuild/client/client.csproj b/csharp/test/Ice/inactivityTimeout/msbuild/client/client.csproj index 792cb0f28ae..eedbbe8d248 100644 --- a/csharp/test/Ice/inactivityTimeout/msbuild/client/client.csproj +++ b/csharp/test/Ice/inactivityTimeout/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/inactivityTimeout/msbuild/server/server.csproj b/csharp/test/Ice/inactivityTimeout/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/Ice/inactivityTimeout/msbuild/server/server.csproj +++ b/csharp/test/Ice/inactivityTimeout/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/info/msbuild/client/client.csproj b/csharp/test/Ice/info/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/info/msbuild/client/client.csproj +++ b/csharp/test/Ice/info/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/info/msbuild/server/server.csproj b/csharp/test/Ice/info/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/Ice/info/msbuild/server/server.csproj +++ b/csharp/test/Ice/info/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/inheritance/msbuild/client/client.csproj b/csharp/test/Ice/inheritance/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/inheritance/msbuild/client/client.csproj +++ b/csharp/test/Ice/inheritance/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj b/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj index 2a878aa3efd..e7b03bcaaa0 100644 --- a/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj @@ -27,16 +27,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/inheritance/msbuild/server/server.csproj b/csharp/test/Ice/inheritance/msbuild/server/server.csproj index 78e935128d0..a93fed7add0 100644 --- a/csharp/test/Ice/inheritance/msbuild/server/server.csproj +++ b/csharp/test/Ice/inheritance/msbuild/server/server.csproj @@ -26,16 +26,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/invoke/msbuild/client/client.csproj b/csharp/test/Ice/invoke/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/invoke/msbuild/client/client.csproj +++ b/csharp/test/Ice/invoke/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/invoke/msbuild/server/server.csproj b/csharp/test/Ice/invoke/msbuild/server/server.csproj index 4e112e36866..3e0fdbd79d3 100644 --- a/csharp/test/Ice/invoke/msbuild/server/server.csproj +++ b/csharp/test/Ice/invoke/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/location/msbuild/client/client.csproj b/csharp/test/Ice/location/msbuild/client/client.csproj index 7cbf91b65d5..730c6e2cfb6 100644 --- a/csharp/test/Ice/location/msbuild/client/client.csproj +++ b/csharp/test/Ice/location/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/location/msbuild/server/server.csproj b/csharp/test/Ice/location/msbuild/server/server.csproj index da59e1f413e..f5218c0751c 100644 --- a/csharp/test/Ice/location/msbuild/server/server.csproj +++ b/csharp/test/Ice/location/msbuild/server/server.csproj @@ -26,16 +26,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/logger/msbuild/client/client.csproj b/csharp/test/Ice/logger/msbuild/client/client.csproj index 2c9a4e208c6..f5d9ae0f56c 100644 --- a/csharp/test/Ice/logger/msbuild/client/client.csproj +++ b/csharp/test/Ice/logger/msbuild/client/client.csproj @@ -16,16 +16,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/maxConnections/msbuild/client/client.csproj b/csharp/test/Ice/maxConnections/msbuild/client/client.csproj index 792cb0f28ae..eedbbe8d248 100644 --- a/csharp/test/Ice/maxConnections/msbuild/client/client.csproj +++ b/csharp/test/Ice/maxConnections/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/maxConnections/msbuild/server/server.csproj b/csharp/test/Ice/maxConnections/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/Ice/maxConnections/msbuild/server/server.csproj +++ b/csharp/test/Ice/maxConnections/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/maxDispatches/msbuild/client/client.csproj b/csharp/test/Ice/maxDispatches/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/maxDispatches/msbuild/client/client.csproj +++ b/csharp/test/Ice/maxDispatches/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/maxDispatches/msbuild/server/server.csproj b/csharp/test/Ice/maxDispatches/msbuild/server/server.csproj index baf76775a13..892e0d399b9 100644 --- a/csharp/test/Ice/maxDispatches/msbuild/server/server.csproj +++ b/csharp/test/Ice/maxDispatches/msbuild/server/server.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/metrics/msbuild/client/client.csproj b/csharp/test/Ice/metrics/msbuild/client/client.csproj index db2b5a5e461..5fe737fbaec 100644 --- a/csharp/test/Ice/metrics/msbuild/client/client.csproj +++ b/csharp/test/Ice/metrics/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj b/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj index a8601262ab5..adb26a20f4a 100644 --- a/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/metrics/msbuild/server/server.csproj b/csharp/test/Ice/metrics/msbuild/server/server.csproj index dfff0012fb4..d2f93386138 100644 --- a/csharp/test/Ice/metrics/msbuild/server/server.csproj +++ b/csharp/test/Ice/metrics/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj index 593d62819e2..b7c518accd8 100644 --- a/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/middleware/msbuild/client/client.csproj b/csharp/test/Ice/middleware/msbuild/client/client.csproj index a6782a7ce11..0e3dbf49e0c 100644 --- a/csharp/test/Ice/middleware/msbuild/client/client.csproj +++ b/csharp/test/Ice/middleware/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/namespacemd/msbuild/client/client.csproj b/csharp/test/Ice/namespacemd/msbuild/client/client.csproj index a09cdba0fe3..81bed49dce9 100644 --- a/csharp/test/Ice/namespacemd/msbuild/client/client.csproj +++ b/csharp/test/Ice/namespacemd/msbuild/client/client.csproj @@ -44,16 +44,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/namespacemd/msbuild/server/server.csproj b/csharp/test/Ice/namespacemd/msbuild/server/server.csproj index 7036ac4bbfa..eaf62bb46e4 100644 --- a/csharp/test/Ice/namespacemd/msbuild/server/server.csproj +++ b/csharp/test/Ice/namespacemd/msbuild/server/server.csproj @@ -44,16 +44,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/networkProxy/msbuild/client/client.csproj b/csharp/test/Ice/networkProxy/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/networkProxy/msbuild/client/client.csproj +++ b/csharp/test/Ice/networkProxy/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/networkProxy/msbuild/server/server.csproj b/csharp/test/Ice/networkProxy/msbuild/server/server.csproj index 9bd14f848ba..51564953361 100644 --- a/csharp/test/Ice/networkProxy/msbuild/server/server.csproj +++ b/csharp/test/Ice/networkProxy/msbuild/server/server.csproj @@ -21,16 +21,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/objects/msbuild/client/client.csproj b/csharp/test/Ice/objects/msbuild/client/client.csproj index cb8265e3712..f360db6af94 100644 --- a/csharp/test/Ice/objects/msbuild/client/client.csproj +++ b/csharp/test/Ice/objects/msbuild/client/client.csproj @@ -29,16 +29,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj b/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj index d48f716764f..d7381cd37d5 100644 --- a/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj @@ -32,16 +32,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/objects/msbuild/server/server.csproj b/csharp/test/Ice/objects/msbuild/server/server.csproj index f2c657fc930..9874277cfce 100644 --- a/csharp/test/Ice/objects/msbuild/server/server.csproj +++ b/csharp/test/Ice/objects/msbuild/server/server.csproj @@ -31,16 +31,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/operations/msbuild/client/client.csproj b/csharp/test/Ice/operations/msbuild/client/client.csproj index 2676e131e67..20ae154a8bc 100644 --- a/csharp/test/Ice/operations/msbuild/client/client.csproj +++ b/csharp/test/Ice/operations/msbuild/client/client.csproj @@ -28,16 +28,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj b/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj index b4363c9bcb9..2db081ec0ac 100644 --- a/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj @@ -29,16 +29,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/operations/msbuild/server/server.csproj b/csharp/test/Ice/operations/msbuild/server/server.csproj index 6b0a7fda233..0541ed34cfe 100644 --- a/csharp/test/Ice/operations/msbuild/server/server.csproj +++ b/csharp/test/Ice/operations/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj index 5e0244a7978..595802fb077 100644 --- a/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/optional/msbuild/client/client.csproj b/csharp/test/Ice/optional/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/optional/msbuild/client/client.csproj +++ b/csharp/test/Ice/optional/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/optional/msbuild/server/server.csproj b/csharp/test/Ice/optional/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/Ice/optional/msbuild/server/server.csproj +++ b/csharp/test/Ice/optional/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj index ffed3fe155c..01431580aeb 100644 --- a/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/plugin/msbuild/client/client.csproj b/csharp/test/Ice/plugin/msbuild/client/client.csproj index 2c9a4e208c6..f5d9ae0f56c 100644 --- a/csharp/test/Ice/plugin/msbuild/client/client.csproj +++ b/csharp/test/Ice/plugin/msbuild/client/client.csproj @@ -16,16 +16,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj b/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj index e293de1b735..814f0cf174f 100644 --- a/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj +++ b/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj @@ -26,16 +26,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/properties/msbuild/client/client.csproj b/csharp/test/Ice/properties/msbuild/client/client.csproj index 2c9a4e208c6..f5d9ae0f56c 100644 --- a/csharp/test/Ice/properties/msbuild/client/client.csproj +++ b/csharp/test/Ice/properties/msbuild/client/client.csproj @@ -16,16 +16,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/proxy/msbuild/client/client.csproj b/csharp/test/Ice/proxy/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/proxy/msbuild/client/client.csproj +++ b/csharp/test/Ice/proxy/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj b/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj index b3fc20373f5..176cafe041c 100644 --- a/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/proxy/msbuild/server/server.csproj b/csharp/test/Ice/proxy/msbuild/server/server.csproj index 6b0a7fda233..0541ed34cfe 100644 --- a/csharp/test/Ice/proxy/msbuild/server/server.csproj +++ b/csharp/test/Ice/proxy/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj index 5e0244a7978..595802fb077 100644 --- a/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/retry/msbuild/client/client.csproj b/csharp/test/Ice/retry/msbuild/client/client.csproj index 6152737a782..f40f48c5146 100644 --- a/csharp/test/Ice/retry/msbuild/client/client.csproj +++ b/csharp/test/Ice/retry/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj b/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj index 4e868f8ef29..b6cfa3cc9c5 100644 --- a/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/retry/msbuild/server/server.csproj b/csharp/test/Ice/retry/msbuild/server/server.csproj index d76d4044392..789ad96df9d 100644 --- a/csharp/test/Ice/retry/msbuild/server/server.csproj +++ b/csharp/test/Ice/retry/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/scope/msbuild/client/client.csproj b/csharp/test/Ice/scope/msbuild/client/client.csproj index e727fd6ccaa..a5e14905fc6 100644 --- a/csharp/test/Ice/scope/msbuild/client/client.csproj +++ b/csharp/test/Ice/scope/msbuild/client/client.csproj @@ -27,16 +27,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/scope/msbuild/server/server.csproj b/csharp/test/Ice/scope/msbuild/server/server.csproj index 932c7443f6b..d657ecbcf11 100644 --- a/csharp/test/Ice/scope/msbuild/server/server.csproj +++ b/csharp/test/Ice/scope/msbuild/server/server.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/seqMapping/msbuild/client/client.csproj b/csharp/test/Ice/seqMapping/msbuild/client/client.csproj index 6f240dff8a6..284eb609315 100644 --- a/csharp/test/Ice/seqMapping/msbuild/client/client.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/client/client.csproj @@ -25,16 +25,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj b/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj index 5cc804ea298..19a11acd92e 100644 --- a/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj @@ -26,16 +26,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/seqMapping/msbuild/server/server.csproj b/csharp/test/Ice/seqMapping/msbuild/server/server.csproj index b37e1e68fb3..ade1756e67b 100644 --- a/csharp/test/Ice/seqMapping/msbuild/server/server.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/server/server.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj index 0c9ae5a67cc..fd224c91f76 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/servantLocator/msbuild/client/client.csproj b/csharp/test/Ice/servantLocator/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/servantLocator/msbuild/client/client.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj b/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj index 9bf4eb071d5..55f48e037ce 100644 --- a/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj @@ -26,16 +26,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/servantLocator/msbuild/server/server.csproj b/csharp/test/Ice/servantLocator/msbuild/server/server.csproj index 27d9d2d62d4..3f9646aa4fe 100644 --- a/csharp/test/Ice/servantLocator/msbuild/server/server.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/server/server.csproj @@ -25,16 +25,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj index 287a5920552..30050a96076 100644 --- a/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj @@ -25,16 +25,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj index e79c9b3b05d..040be2aa105 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj @@ -27,16 +27,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj index 0271555ec0b..b5be27bb7a6 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj @@ -31,16 +31,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj index 752339342ee..55eba77f030 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj @@ -31,16 +31,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj b/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj index 05f7a1fadd8..17b0c07f65d 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj @@ -31,16 +31,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj b/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj index 0271555ec0b..b5be27bb7a6 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj @@ -31,16 +31,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj index 752339342ee..55eba77f030 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj @@ -31,16 +31,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/stream/msbuild/client/client.csproj b/csharp/test/Ice/stream/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/stream/msbuild/client/client.csproj +++ b/csharp/test/Ice/stream/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj index 746168dff8c..c3cb98fa7ab 100644 --- a/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj +++ b/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj @@ -21,16 +21,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj index 654fe134a76..9b7aee8d16f 100644 --- a/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj +++ b/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/timeout/msbuild/client/client.csproj b/csharp/test/Ice/timeout/msbuild/client/client.csproj index 792cb0f28ae..eedbbe8d248 100644 --- a/csharp/test/Ice/timeout/msbuild/client/client.csproj +++ b/csharp/test/Ice/timeout/msbuild/client/client.csproj @@ -23,16 +23,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/timeout/msbuild/server/server.csproj b/csharp/test/Ice/timeout/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/Ice/timeout/msbuild/server/server.csproj +++ b/csharp/test/Ice/timeout/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/udp/msbuild/client/client.csproj b/csharp/test/Ice/udp/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/Ice/udp/msbuild/client/client.csproj +++ b/csharp/test/Ice/udp/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Ice/udp/msbuild/server/server.csproj b/csharp/test/Ice/udp/msbuild/server/server.csproj index 98c2cd55289..29a1600776c 100644 --- a/csharp/test/Ice/udp/msbuild/server/server.csproj +++ b/csharp/test/Ice/udp/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/IceBox/admin/msbuild/client/client.csproj b/csharp/test/IceBox/admin/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/IceBox/admin/msbuild/client/client.csproj +++ b/csharp/test/IceBox/admin/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj b/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj index 86dcbe9b1d5..66975e55fba 100644 --- a/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj +++ b/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj @@ -20,17 +20,8 @@ - - - - - - - - - - - - - + + + + diff --git a/csharp/test/IceBox/configuration/msbuild/client/client.csproj b/csharp/test/IceBox/configuration/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/IceBox/configuration/msbuild/client/client.csproj +++ b/csharp/test/IceBox/configuration/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj b/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj index 86dcbe9b1d5..66975e55fba 100644 --- a/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj +++ b/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj @@ -20,17 +20,8 @@ - - - - - - - - - - - - - + + + + diff --git a/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj b/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj index 565058a4d68..2c94b86905f 100644 --- a/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj +++ b/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj b/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj +++ b/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/IceGrid/simple/msbuild/client/client.csproj b/csharp/test/IceGrid/simple/msbuild/client/client.csproj index a4da877bf0d..28a71025cd8 100644 --- a/csharp/test/IceGrid/simple/msbuild/client/client.csproj +++ b/csharp/test/IceGrid/simple/msbuild/client/client.csproj @@ -22,20 +22,11 @@ - - - - - - - - - - - - - - - - + + + + + + + diff --git a/csharp/test/IceGrid/simple/msbuild/server/server.csproj b/csharp/test/IceGrid/simple/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/IceGrid/simple/msbuild/server/server.csproj +++ b/csharp/test/IceGrid/simple/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/IceSSL/configuration/msbuild/client/client.csproj b/csharp/test/IceSSL/configuration/msbuild/client/client.csproj index 2bad7562247..4e1d4d9a617 100644 --- a/csharp/test/IceSSL/configuration/msbuild/client/client.csproj +++ b/csharp/test/IceSSL/configuration/msbuild/client/client.csproj @@ -24,16 +24,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/IceSSL/configuration/msbuild/server/server.csproj b/csharp/test/IceSSL/configuration/msbuild/server/server.csproj index 1fa58915ad3..2dd803487df 100644 --- a/csharp/test/IceSSL/configuration/msbuild/server/server.csproj +++ b/csharp/test/IceSSL/configuration/msbuild/server/server.csproj @@ -22,16 +22,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj b/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj index 2c9a4e208c6..f5d9ae0f56c 100644 --- a/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj +++ b/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj @@ -16,16 +16,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Slice/escape/msbuild/client/client.csproj b/csharp/test/Slice/escape/msbuild/client/client.csproj index a5f95ae9c27..8effe684f77 100644 --- a/csharp/test/Slice/escape/msbuild/client/client.csproj +++ b/csharp/test/Slice/escape/msbuild/client/client.csproj @@ -25,16 +25,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Slice/macros/msbuild/client/client.csproj b/csharp/test/Slice/macros/msbuild/client/client.csproj index 746168dff8c..c3cb98fa7ab 100644 --- a/csharp/test/Slice/macros/msbuild/client/client.csproj +++ b/csharp/test/Slice/macros/msbuild/client/client.csproj @@ -21,16 +21,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/Slice/structure/msbuild/client/client.csproj b/csharp/test/Slice/structure/msbuild/client/client.csproj index 746168dff8c..c3cb98fa7ab 100644 --- a/csharp/test/Slice/structure/msbuild/client/client.csproj +++ b/csharp/test/Slice/structure/msbuild/client/client.csproj @@ -21,16 +21,7 @@ - - - - - - - - - - - - + + + diff --git a/csharp/test/TestCommon/msbuild/testcommon/testcommon.csproj b/csharp/test/TestCommon/msbuild/testcommon/testcommon.csproj index 45a771a8a98..2fcceb2997b 100644 --- a/csharp/test/TestCommon/msbuild/testcommon/testcommon.csproj +++ b/csharp/test/TestCommon/msbuild/testcommon/testcommon.csproj @@ -12,16 +12,7 @@ - - - - - - - - - - - - + + + diff --git a/java/BUILDING.md b/java/BUILDING.md index 17eb35dfa19..4b8f944962d 100644 --- a/java/BUILDING.md +++ b/java/BUILDING.md @@ -110,27 +110,10 @@ groupId=com.panayotis, version=1.1.0, artifactId=appbundler ## Building Ice for Java -The build system requires the Slice to Java compiler from Ice for C++. If you -have not built Ice for C++ in this source distribution, you must set the -`ICE_BIN_DIST` environment variable to `cpp` and the `ICE_HOME` environment -variable with the path name of your Ice installation. For example, on Linux with -an RPM installation: +The build system requires the Slice to Java compiler from Ice for C++. -```shell -export ICE_BIN_DIST=cpp -export ICE_HOME=/usr -``` - -On Windows with an MSI installation: - -```shell -set ICE_BIN_DIST=cpp -set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.10 -``` - -If you are using Ice for C++ from a source build on Windows, you must set -the `CPP_PLATFORM` and `CPP_CONFIGURATION` environment variables to match the -platform and configuration used in your C++ build: +On Windows, you must set the `CPP_PLATFORM` and `CPP_CONFIGURATION` environment +variables to match the platform and configuration used in your C++ build: ```shell set CPP_PLATFORM=x64 @@ -140,8 +123,7 @@ set CPP_CONFIGURATION=Debug The supported values for `CPP_PLATFORM` are `Win32` and `x64` and the supported values for `CPP_CONFIGURATION` are `Debug` and `Release`. -Before building Ice for Java, review the settings in the file -`gradle.properties` and edit as necessary. +Before building Ice for Java, review the settings in the file `gradle.properties` and edit as necessary. To build Ice, all services, and tests, run @@ -238,9 +220,6 @@ for instructions, then follow these steps: 3. Navigate to and select the "java/test/android/controller" subdirectory 4. Click OK and wait for the project to open and build -To build the tests against the Ice binary distribution you must set `ICE_BIN_DIST` environment -variable to `all` before starting Android Studio. - ### Running the Android Test Suite The Android Studio project contains a `controller` app for the Ice test diff --git a/java/build.gradle b/java/build.gradle index 20d793e58cd..74096511118 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -10,11 +10,6 @@ subprojects { apply from: "$rootProject.projectDir/gradle/ice.gradle" repositories { - if(this.devRepo) { - maven { - url this.devRepo - } - } mavenCentral() } @@ -42,20 +37,18 @@ task clean(type: Delete) { delete rootProject.buildDir } -if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')}) { - task dist() - dist.dependsOn(project(":ice").assemble) - dist.dependsOn(project(":glacier2").assemble) - dist.dependsOn(project(":icegrid").assemble) - dist.dependsOn(project(":icebox").assemble) - dist.dependsOn(project(":icebt").assemble) - dist.dependsOn(project(":icediscovery").assemble) - dist.dependsOn(project(":icelocatordiscovery").assemble) - dist.dependsOn(project(":icestorm").assemble) - dist.dependsOn(project(":IceGridGUI").assemble) +task dist() +dist.dependsOn(project(":ice").assemble) +dist.dependsOn(project(":glacier2").assemble) +dist.dependsOn(project(":icegrid").assemble) +dist.dependsOn(project(":icebox").assemble) +dist.dependsOn(project(":icebt").assemble) +dist.dependsOn(project(":icediscovery").assemble) +dist.dependsOn(project(":icelocatordiscovery").assemble) +dist.dependsOn(project(":icestorm").assemble) +dist.dependsOn(project(":IceGridGUI").assemble) - project(":test").compileJava.dependsOn(dist) -} +project(":test").compileJava.dependsOn(dist) def exportedProjects = [ ":glacier2", diff --git a/java/gradle.properties b/java/gradle.properties index 1086c15eb68..1c82e1a2688 100644 --- a/java/gradle.properties +++ b/java/gradle.properties @@ -47,30 +47,6 @@ openjfxVersion = 11.0.2 // icegridguiProguard = true -// -// Set the version of the Ice Builder to use for building. It must be set -// to debian when using the gradle-ice-builder-plugin package on Debian. -// -iceBuilderVersion = 1.5.0 - -// -// Set the builder artifact class path. It must be set to -// com.zeroc.gradle.ice-builder when using the gradle-ice-builder-plugin -// package. -// -iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder - -// -// Set the location of a local Ice Builder for Gradle source directory -// -iceBuilderHome = - -// -// If the dev repository is set it will be used as the first repository when -// resolving dependencies -// -devRepo = - // // Windows specific options // diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle index 81f08bf52a2..8c8b17f5618 100644 --- a/java/gradle/ice.gradle +++ b/java/gradle/ice.gradle @@ -1,27 +1,6 @@ // Copyright (c) ZeroC, Inc. buildscript { - // - // If iceBuilderHome is set add its lib directory it to the local maven repositories - // so we can build using a local plugin version - // - if (iceBuilderHome) { - def builder = new File([iceBuilderHome, "build", "libs"].join(File.separator)) - if(builder.exists()) { - repositories { - flatDir dirs: "file://${builder.getCanonicalPath()}" - } - } - } - - if(new File("/usr/share/maven-repo").exists()){ - repositories { - maven { - url "file:///usr/share/maven-repo" - } - } - } - repositories { mavenCentral() @@ -30,7 +9,7 @@ buildscript { } } dependencies { - classpath group: "${iceBuilderClassPath}", name: 'slice', version: "${iceBuilderVersion}" + classpath group: "gradle.plugin.com.zeroc.gradle.ice-builder", name: 'slice', version: "1.5.0" classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0" } } @@ -41,10 +20,7 @@ apply plugin: com.diffplug.gradle.spotless.SpotlessPlugin slice { cppConfiguration = project.cppConfiguration cppPlatform = project.cppPlatform - if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')}) { - iceHome = project.hasProperty('iceHome') ? project.iceHome - : System.getenv("ICE_HOME") != null ? System.env.ICE_HOME : new File(project.ext.topSrcDir).getCanonicalPath() - } + iceHome = new File(project.ext.topSrcDir).getCanonicalPath() } spotless { @@ -122,10 +98,5 @@ ext.libDir = "$rootProject.projectDir/lib" // Used for the tests ext.localDependency = { artifactId -> - def useBinDist = System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')} - if(useBinDist) { - return "com.zeroc:${artifactId}:${project.version}" - } else { - return project(":${artifactId}") - } + return project(":${artifactId}") } diff --git a/java/settings.gradle b/java/settings.gradle index 8ad0ac699c0..97c6a5d0841 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -1,26 +1,24 @@ // Copyright (c) ZeroC, Inc. -if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')}) { - // Main source - include ':ice' - project(':ice').projectDir = new File('src/com.zeroc.ice') - include ':icediscovery' - project(':icediscovery').projectDir = new File('src/com.zeroc.icediscovery') - include ':icelocatordiscovery' - project(':icelocatordiscovery').projectDir = new File('src/com.zeroc.icelocatordiscovery') - include ':icebt' - project(':icebt').projectDir = new File('src/com.zeroc.icebt') - include ':icebox' - project(':icebox').projectDir = new File('src/com.zeroc.icebox') - include ':glacier2' - project(':glacier2').projectDir = new File('src/com.zeroc.glacier2') - include ':icestorm' - project(':icestorm').projectDir = new File('src/com.zeroc.icestorm') - include ':icegrid' - project(':icegrid').projectDir = new File('src/com.zeroc.icegrid') - include ':IceGridGUI' - project(':IceGridGUI').projectDir = new File('src/IceGridGUI') -} +// Source projects +include ':ice' +project(':ice').projectDir = new File('src/com.zeroc.ice') +include ':icediscovery' +project(':icediscovery').projectDir = new File('src/com.zeroc.icediscovery') +include ':icelocatordiscovery' +project(':icelocatordiscovery').projectDir = new File('src/com.zeroc.icelocatordiscovery') +include ':icebt' +project(':icebt').projectDir = new File('src/com.zeroc.icebt') +include ':icebox' +project(':icebox').projectDir = new File('src/com.zeroc.icebox') +include ':glacier2' +project(':glacier2').projectDir = new File('src/com.zeroc.glacier2') +include ':icestorm' +project(':icestorm').projectDir = new File('src/com.zeroc.icestorm') +include ':icegrid' +project(':icegrid').projectDir = new File('src/com.zeroc.icegrid') +include ':IceGridGUI' +project(':IceGridGUI').projectDir = new File('src/IceGridGUI') // Tests include ':test' diff --git a/java/test/android/controller/build.gradle b/java/test/android/controller/build.gradle index 6c1576f9e04..2345914f431 100644 --- a/java/test/android/controller/build.gradle +++ b/java/test/android/controller/build.gradle @@ -20,28 +20,15 @@ slice { output = file("${project.buildDir}/generated/source/ice") cppConfiguration = project.cppConfiguration cppPlatform = project.cppPlatform - if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')}) { - iceHome = project.hasProperty('iceHome') ? project.iceHome - : System.getenv("ICE_HOME") != null ? System.env.ICE_HOME : new File("$rootProject.projectDir/../../../..").getCanonicalPath() - } + iceHome = new File("$rootProject.projectDir/../../../..").getCanonicalPath() java { files = fileTree(dir: "$rootProject.projectDir/../../../../scripts/", includes: ['*.ice']) } } -project.ext.srcDist = new File([project.slice.iceHome, "java", "src"].join(File.separator)).exists() - repositories { - if(this.devRepo) { - maven { - url this.devRepo - } - } - - if(project.ext.srcDist) { - repositories { - flatDir dirs: "file://${project.slice.iceHome}/java/lib" - } + repositories { + flatDir dirs: "file://${project.slice.iceHome}/java/lib" } google() @@ -97,20 +84,11 @@ clean { delete("src/main/res/raw/server.bks") } -ext.localDependency = { artifactId -> - def useBinDist = System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')} - if(useBinDist) { - return "com.zeroc:${artifactId}:${project.iceVersion}" - } else { - return ":${artifactId}-${project.iceVersion}" - } -} - dependencies { - implementation localDependency("glacier2") - implementation localDependency("ice") - runtimeOnly localDependency("icediscovery") - runtimeOnly localDependency("icebt") + implementation ":glacier2-${project.iceVersion}" + implementation ":ice-${project.iceVersion}" + runtimeOnly ":icediscovery-${project.iceVersion}" + runtimeOnly ":icebt-${project.iceVersion}" implementation files("${rootProject.projectDir}/../../../lib/test.jar") runtimeOnly "org.apache.commons:commons-compress:1.20" diff --git a/java/test/android/controller/gradle.properties b/java/test/android/controller/gradle.properties index 210e172eaa0..615083893bb 100644 --- a/java/test/android/controller/gradle.properties +++ b/java/test/android/controller/gradle.properties @@ -13,10 +13,6 @@ iceVersion = 3.8.0-alpha.0 org.gradle.daemon = true org.gradle.configureondemand=false -# If the dev repository is set it will be used as the first repository when -# resolving dependencies -devRepo = - # Windows specific options # The platform used by the C++ build. Supported values are `x64` and `Win32`. diff --git a/java/test/build.gradle b/java/test/build.gradle index a92d2730596..309f985ed69 100644 --- a/java/test/build.gradle +++ b/java/test/build.gradle @@ -15,13 +15,13 @@ sourceSets { } dependencies { - implementation localDependency('ice') - runtimeOnly localDependency('icediscovery') - runtimeOnly localDependency('icelocatordiscovery') - implementation localDependency('icebox') - implementation localDependency('glacier2') - implementation localDependency('icestorm') - implementation localDependency('icegrid') + implementation project(':ice') + runtimeOnly project(':icediscovery') + runtimeOnly project(':icelocatordiscovery') + implementation project(':icebox') + implementation project(':glacier2') + implementation project(':icestorm') + implementation project(':icegrid') implementation project(':testPlugins') } diff --git a/js/gulpfile.js b/js/gulpfile.js index ff73945273f..b5d541a55d5 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -19,9 +19,6 @@ import tsc from "gulp-typescript"; const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const iceBinDist = (process.env.ICE_BIN_DIST || "").split(" "); -const useBinDist = iceBinDist.find(v => v == "js" || v == "all") !== undefined; - const optimize = (process.env.OPTIMIZE || "no") == "yes"; function parseArg(argv, key) { @@ -41,28 +38,21 @@ const configuration = parseArg(process.argv, "--cppConfiguration") || process.en function slice2js(options) { const defaults = {}; const opts = options || {}; - if (!useBinDist) { - if (process.platform == "win32") { - if (!platform || (platform.toLowerCase() != "win32" && platform.toLowerCase() != "x64")) { - console.log("Error: --cppPlatform must be set to `Win32' or `x64', in order to locate slice2js.exe"); - process.exit(1); - } + if (process.platform == "win32") { + if (!platform || (platform.toLowerCase() != "win32" && platform.toLowerCase() != "x64")) { + console.log("Error: --cppPlatform must be set to `Win32' or `x64', in order to locate slice2js.exe"); + process.exit(1); + } - if ( - !configuration || - (configuration.toLowerCase() != "debug" && configuration.toLowerCase() != "release") - ) { - console.log( - "Error: --cppConfiguration must be set to `Debug' or `Release', in order to locate slice2js.exe", - ); - process.exit(1); - } - defaults.iceToolsPath = path.resolve("../cpp/bin", platform, configuration); + if (!configuration || (configuration.toLowerCase() != "debug" && configuration.toLowerCase() != "release")) { + console.log( + "Error: --cppConfiguration must be set to `Debug' or `Release', in order to locate slice2js.exe", + ); + process.exit(1); } - defaults.iceHome = path.resolve(__dirname, ".."); - } else if (process.env.ICE_HOME) { - defaults.iceHome = process.env.ICE_HOME; + defaults.iceToolsPath = path.resolve("../cpp/bin", platform, configuration); } + defaults.iceHome = path.resolve(__dirname, ".."); defaults.include = opts.include || []; defaults.args = opts.args || []; defaults.jsbundle = opts.jsbundle; @@ -122,27 +112,20 @@ for (const lib of libs) { gulp.task(libTask(lib, "clean"), gulp.series(libTask(lib, "clean:js"), libTask(lib, "clean:d.ts"))); } -if (useBinDist) { - gulp.task("ice:module", cb => cb()); - gulp.task("ice:module:clean", cb => cb()); - gulp.task("dist", cb => cb()); - gulp.task("dist:clean", cb => cb()); -} else { - gulp.task("dist", gulp.parallel(libs.map(libName => libTask(libName, "generate")))); +gulp.task("dist", gulp.parallel(libs.map(libName => libTask(libName, "generate")))); - gulp.task("dist:clean", gulp.parallel(libs.map(libName => libTask(libName, "clean")))); +gulp.task("dist:clean", gulp.parallel(libs.map(libName => libTask(libName, "clean")))); - gulp.task("ice:module:package", () => gulp.src(["package.json"]).pipe(gulp.dest("node_modules/ice"))); +gulp.task("ice:module:package", () => gulp.src(["package.json"]).pipe(gulp.dest("node_modules/ice"))); - gulp.task( - "ice:module", - gulp.series("ice:module:package", cb => { - pump([gulp.src([`${root}/src/**/*`]), gulp.dest(`${root}/node_modules/ice/src`)], cb); - }), - ); +gulp.task( + "ice:module", + gulp.series("ice:module:package", cb => { + pump([gulp.src([`${root}/src/**/*`]), gulp.dest(`${root}/node_modules/ice/src`)], cb); + }), +); - gulp.task("ice:module:clean", () => deleteAsync("node_modules/ice")); -} +gulp.task("ice:module:clean", () => deleteAsync("node_modules/ice")); const tests = [ "test/Ice/adapterDeactivation", diff --git a/matlab/BUILDING.md b/matlab/BUILDING.md index 75d946d00c3..97ead7e3dd7 100644 --- a/matlab/BUILDING.md +++ b/matlab/BUILDING.md @@ -56,14 +56,7 @@ Upon completion, a build in release mode generates the following components: - MATLAB code for core Slice files, located in `matlab\lib\generated` - MATLAB code for test Slice files, located in `matlab\test\**\generated` -The MATLAB extension depends on Ice for C++ components from the `cpp` -subdirectory, and those are built if required. It is also possible to build the -MATLAB extension using Ice C++ NuGet packages by setting the `ICE_BIN_DIST` -MSBuild property to `cpp`: - -```shell -msbuild msbuild\ice.proj /p:ICE_BIN_DIST=cpp -``` +The MATLAB extension depends on Ice for C++ components from the `cpp` subdirectory, and those are built if required. ### Packaging the Ice Toolbox @@ -114,10 +107,6 @@ make This creates the toolbox package `toolbox/ice---linux.mltbx`. You can install the toolbox from within MATLAB by double-clicking on the file. -To build the Ice for MATLAB toolbox using the C++ binary distribution, set `ICE_BIN_DIST=cpp`, note this is only possible -with the MATLAB 2019b builds, because MATLAB 2017b needs to use the g++-4.9 that is not compatible with the Xenial -binary distribution. - When building for MATALB 2017b you must set `CC` and `CXX` variables to use the `gcc-4.9` and `g++-4.9` compilers respectively. diff --git a/matlab/Makefile b/matlab/Makefile index 7632988c204..6ddff780802 100644 --- a/matlab/Makefile +++ b/matlab/Makefile @@ -18,8 +18,6 @@ $(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceLocato # include $(lang_srcdir)/config/Make.rules -ifeq ($(filter all matlab,$(ICE_BIN_DIST)),) - # # Load Makefile.mk fragments # @@ -54,8 +52,8 @@ icethunk_builddir = $(lang_srcdir)/src/build icethunk_cflags = $(matlab_cflags) -I$(lang_srcdir)/src -m64 -fPIC -shared -pthread -Wl,--no-undefined icethunk_target = $(icethunk_libdir)/icethunk.so icethunk_proto = $(icethunk_libdir)/iceproto.m -cpp_libdir = $(if $(filter all cpp,$(ICE_BIN_DIST)),$(ice_home)/lib/x86_64-linux-gnu,$(top_srcdir)/cpp/lib/x86_64-linux-gnu) -cpp_bindir = $(if $(filter all cpp,$(ICE_BIN_DIST)),$(ice_home)/bin,$(top_srcdir)/cpp/bin) +cpp_libdir = $(top_srcdir)/cpp/lib/x86_64-linux-gnu +cpp_bindir = $(top_srcdir)/cpp/bin .PRECIOUS: $(icethunk_proto) @@ -129,8 +127,6 @@ clean:: toolbox:: $(icetoolbox_file) -endif - # # Translate the Slice files from test directories # diff --git a/matlab/config/Make.rules b/matlab/config/Make.rules index b8c6e2cee2b..90453c063cb 100644 --- a/matlab/config/Make.rules +++ b/matlab/config/Make.rules @@ -43,8 +43,6 @@ install-shared-matlab-module = $(call install-shared-module,$(call mkmatlabmodul # define make-matlab-package -ifeq ($(filter all matlab, $(ICE_BIN_DIST)),) - $2/+$3/.depend/%.ice.d: | $2/+$3/.depend ; $2/+$3/.depend: @@ -69,8 +67,6 @@ distclean clean:: $(icetoolbox_file) generate-srcs srcs all:: $(patsubst $1/$3/%.ice,$2/+$3/%.m,$(filter-out $4,$(wildcard $1/$3/*.ice))) -endif - endef # diff --git a/matlab/msbuild/ice.matlab.props b/matlab/msbuild/ice.matlab.props index 3620e7ef07d..7340cd05b5a 100644 --- a/matlab/msbuild/ice.matlab.props +++ b/matlab/msbuild/ice.matlab.props @@ -3,24 +3,7 @@ Release + $(MSBuildThisFileDirectory)..\.. + $(IceHome)\cpp\bin\$(Platform)\$(Configuration) - - - - $(IceHome)\bin - - - - - $(MSBuildThisFileDirectory)\packages\zeroc.ice.v143.$(IceVersion) - $(IceHome)\tools - - - - - $(MSBuildThisFileDirectory)..\.. - $(IceHome)\cpp\bin\$(Platform)\$(Configuration) - - - diff --git a/matlab/msbuild/ice.proj b/matlab/msbuild/ice.proj index 768c4f3a1f3..59f4028d5c3 100644 --- a/matlab/msbuild/ice.proj +++ b/matlab/msbuild/ice.proj @@ -37,20 +37,17 @@ - - + - + - + @@ -61,7 +58,7 @@ Properties="Platform=$(Platform);Configuration=$(Configuration);MatlabHome=$(MatlabHome)" /> - + - + Release x64 $(MSBuildThisFileDirectory)..\.. $(IceHome)\cpp\bin\$(Platform)\$(Configuration) - - $(MSBuildThisFileDirectory)packages\zeroc.ice.v143.$(IceJSOnVersion) - $(IceHome)\tools - - $(IceHome)\slice diff --git a/matlab/msbuild/ice.toolbox.targets b/matlab/msbuild/ice.toolbox.targets index bd4345730ff..073c2368291 100644 --- a/matlab/msbuild/ice.toolbox.targets +++ b/matlab/msbuild/ice.toolbox.targets @@ -3,14 +3,10 @@ $(MSBuildThisFileDirectory)..\ - + $(RootDir)..\cpp\bin\$(Platform)\$(Configuration) - - $(MSBuildThisFileDirectory)packages\zeroc.ice.v143.3.8a0\tools - - - Debug @@ -82,14 +81,10 @@ - - - d - ..\..\..\..\cpp\bin\$(Platform)\$(Configuration) - ..\..\..\msbuild\packages\zeroc.ice.v143.3.8.0-alpha0\build\native\bin\$(Platform)\$(Configuration) + ..\..\..\..\cpp\bin\$(Platform)\$(Configuration) @@ -106,11 +101,4 @@ - - - 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}. - - - - diff --git a/matlab/test/lib/runTest.m b/matlab/test/lib/runTest.m index 77da6987d33..d495f51540c 100644 --- a/matlab/test/lib/runTest.m +++ b/matlab/test/lib/runTest.m @@ -13,11 +13,9 @@ function runTest(varargin) rootDir = fileparts(mfilename('fullpath')); rootDir = fullfile(rootDir, '..', '..'); - if ~strcmp(getenv('ICE_BIN_DIST'), 'all') - addpath(fullfile(rootDir, 'lib')); - addpath(fullfile(rootDir, 'lib', 'generated')); - addpath(fullfile(libsubdir)); - end + addpath(fullfile(rootDir, 'lib')); + addpath(fullfile(rootDir, 'lib', 'generated')); + addpath(fullfile(libsubdir)); addpath(fullfile(rootDir, 'test', 'lib')); cd(testdir); diff --git a/php/Makefile b/php/Makefile index 4051ad39639..070816606b8 100644 --- a/php/Makefile +++ b/php/Makefile @@ -16,8 +16,6 @@ $(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceDiscov # include $(lang_srcdir)/config/Make.rules -ifeq ($(filter all php,$(ICE_BIN_DIST)),) - # # Load Makefile.mk fragments # @@ -37,8 +35,6 @@ install:: | $(DESTDIR)$(install_phpdir) $(eval $(call make-php-package,$(slicedir),lib,Ice)) -endif - # # Translate the Slice files from test directories # diff --git a/php/config/Make.rules b/php/config/Make.rules index 34a867dd444..94522e8cb93 100644 --- a/php/config/Make.rules +++ b/php/config/Make.rules @@ -42,7 +42,6 @@ tests generate-srcs srcs all:: $(patsubst $1/%.ice,$1/%.php,$(wildcard $1/*.ice) endef # Configuration for building IcePHP sources -ifeq ($(filter all php,$(ICE_BIN_DIST)),) ifneq ($(shell type $(PHP_CONFIG) > /dev/null 2>&1 && echo 0),0) $(error $(PHP_CONFIG) not found review your PHP installation and ensure $(PHP_CONFIG) is in your PATH) @@ -94,8 +93,6 @@ installdirs += $(install_phpdir) # define make-php-package -ifeq ($(filter all php, $(ICE_BIN_DIST)),) - $2/$3/.depend/%.ice.d: | $2/$3/.depend ; $2/$3/.depend: @@ -123,8 +120,4 @@ generate-srcs srcs all:: $(patsubst $1/$3/%.ice,$2/$3/%.php,$(wildcard $1/$3/*.i $$(eval $$(call install-data-files,$(patsubst $1/$3/%.ice,$2/$3/%.php,$(wildcard $1/$3/*.ice)),$2,$(install_phpdir),install)) -endif - endef - -endif diff --git a/python/Makefile b/python/Makefile index 2e152da9e9e..e48ee3f9343 100644 --- a/python/Makefile +++ b/python/Makefile @@ -15,8 +15,6 @@ $(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceLocato # include $(lang_srcdir)/config/Make.rules -ifeq ($(filter all python,$(ICE_BIN_DIST)),) - # # Load Makefile.mk fragments # @@ -34,5 +32,3 @@ $(call make-projects,$(projects)) # all generate-srcs clean distclean install:: +$(Q)$(MAKE) -C python $@ - -endif diff --git a/ruby/Makefile b/ruby/Makefile index 7fad950aae5..f8f9638e9a3 100644 --- a/ruby/Makefile +++ b/ruby/Makefile @@ -16,8 +16,6 @@ $(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2rb)) # include $(lang_srcdir)/config/Make.rules -ifeq ($(filter all ruby,$(ICE_BIN_DIST)),) - # # Load Makefile.mk fragments # @@ -34,5 +32,3 @@ install:: | $(DESTDIR)$(install_rubydir) $(Q)$(INSTALL) -m 644 $(lang_srcdir)/ruby/*.rb $(DESTDIR)$(install_rubydir) $(eval $(call make-ruby-package,$(slicedir),$(lang_srcdir)/ruby,Ice)) - -endif diff --git a/scripts/Component.py b/scripts/Component.py index 3b20d761eac..343cf200b34 100644 --- a/scripts/Component.py +++ b/scripts/Component.py @@ -36,9 +36,6 @@ class Ice(Util.Component): "mx": [True], } - def useBinDist(self, mapping, current): - return Util.Component._useBinDist(self, mapping, current, "ICE_BIN_DIST") - def getInstallDir(self, mapping, current): # On Windows, the Ice MSI installation can only be used for C++ envHomeName = ( @@ -140,17 +137,6 @@ def canRun(self, testId, mapping, current): # if parent in ["Glacier2", "IceStorm", "IceGrid"]: return False - elif isinstance(Util.platform, Util.Windows): - # - # On Windows, if testing with a binary distribution, don't test Glacier2/IceBridge services - # with the Debug configurations since we don't provide binaries for them. - # - if self.useBinDist(mapping, current): - if ( - parent in ["Glacier2", "IceBridge"] - and current.config.buildConfig.find("Debug") >= 0 - ): - return False return True diff --git a/scripts/Util.py b/scripts/Util.py index 759c7233167..0071af3586d 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -87,29 +87,20 @@ def escapeXml(s, attribute=False): return xml.sax.saxutils.quoteattr(s) if attribute else xml.sax.saxutils.escape(s) -""" -Component abstract class. The driver and mapping classes rely on the component -class to provide component specific information. -""" - - class Component(object): - def __init__(self): - self.nugetVersion = {} - """ - Returns whether or not to use the binary distribution. + Component abstract class. The driver and mapping classes rely on the component + class to provide component specific information. """ - def useBinDist(self, mapping, current): - return True - - """ - Returns the component installation directory if using a binary distribution - or the mapping directory if using a source distribution. - """ + def __init__(self): + self.nugetVersion = {} def getInstallDir(self, mapping, current): + """ + Returns the component installation directory if using a binary distribution + or the mapping directory if using a source distribution. + """ raise Exception("must be overridden") def getSourceDir(self): @@ -218,32 +209,11 @@ def getLibDir(self, process, mapping, current): def getPhpIncludePath(self, mapping, current): return "{0}/{1}".format( self.getInstallDir(mapping, current), - "php" if self.useBinDist(mapping, current) else "lib", + "lib", ) - def _useBinDist(self, mapping, current, envName): - env = os.environ.get(envName, "").split() - return "all" in env or mapping.name in env - def _getInstallDir(self, mapping, current, envHomeName): - if self.useBinDist(mapping, current): - # On Windows or for the C# mapping we first look for Nuget packages rather than the binary installation - if isinstance(platform, Windows) or isinstance(mapping, CSharpMapping): - packageDir = platform.getNugetPackageDir(self, mapping, current) - if envHomeName and not os.path.exists(packageDir): - home = os.environ.get(envHomeName, "") - if not home or not os.path.exists(home): - raise RuntimeError( - "Cannot detect a valid distribution in `" - + envHomeName - + "'" - ) - return home - else: - return packageDir - else: - return os.environ.get(envHomeName, platform.getInstallDir()) - elif mapping: + if mapping: return mapping.getPath() else: return self.getSourceDir() @@ -326,14 +296,9 @@ def getDefaultBuildConfig(self): def _getBinDir(self, component, process, mapping, current): installDir = component.getInstallDir(mapping, current) if isinstance(mapping, CSharpMapping): - if component.useBinDist(mapping, current): - return os.path.join( - installDir, "tools", mapping.getTargetFramework(current) - ) - else: - return os.path.join( - installDir, "bin", mapping.getTargetFramework(current) - ) + return os.path.join( + installDir, "bin", mapping.getTargetFramework(current) + ) return os.path.join(installDir, "bin") def _getLibDir(self, component, process, mapping, current): @@ -497,40 +462,22 @@ def _getBinDir(self, component, process, mapping, current): if current.driver.configs[mapping].buildConfig.find("Debug") >= 0 else "Release" ) - if component.useBinDist(mapping, current): - if installDir != self.getNugetPackageDir(component, mapping, current): - return os.path.join(installDir, "bin") - elif isinstance(process, SliceTranslator): - return os.path.join(installDir, "tools") - elif isinstance(mapping, CSharpMapping): - return os.path.join( - installDir, "tools", mapping.getTargetFramework(current) - ) - elif process.isReleaseOnly(): - # Some services are only available in release mode in the Nuget package - return os.path.join( - installDir, "build", "native", "bin", platform, "Release" - ) - else: - return os.path.join( - installDir, "build", "native", "bin", platform, config - ) + + if isinstance(mapping, CSharpMapping): + return os.path.join( + installDir, "bin", mapping.getTargetFramework(current) + ) + elif isinstance(mapping, PhpMapping): + return os.path.join( + self.getNugetPackageDir(component, mapping, current), + "build", + "native", + "bin", + platform, + config, + ) else: - if isinstance(mapping, CSharpMapping): - return os.path.join( - installDir, "bin", mapping.getTargetFramework(current) - ) - elif isinstance(mapping, PhpMapping): - return os.path.join( - self.getNugetPackageDir(component, mapping, current), - "build", - "native", - "bin", - platform, - config, - ) - else: - return os.path.join(installDir, "bin", platform, config) + return os.path.join(installDir, "bin", platform, config) def _getLibDir(self, component, process, mapping, current): installDir = component.getInstallDir(mapping, current) @@ -553,10 +500,6 @@ def _getLibDir(self, component, process, mapping, current): ) if isinstance(mapping, MatlabMapping): return os.path.join(installDir, "lib", platform, config) - elif component.useBinDist(mapping, current): - return os.path.join( - installDir, "build", "native", "bin", platform, config - ) else: return os.path.join(installDir, "bin", platform, config) @@ -3908,21 +3851,18 @@ def getPluginEntryPoint(self, plugin, process, current): def getEnv(self, process, current): env = {} if isinstance(platform, Windows): - if self.component.useBinDist(self, current): - env["PATH"] = self.component.getBinDir(process, self, current) - else: - env["PATH"] = os.path.join( - self.component.getSourceDir(), - "cpp", - "msbuild", - "packages", - "bzip2.{0}.1.0.6.10".format(platform.getPlatformToolset()), - "build", - "native", - "bin", - "x64", - "Release", - ) + env["PATH"] = os.path.join( + self.component.getSourceDir(), + "cpp", + "msbuild", + "packages", + "bzip2.{0}.1.0.6.10".format(platform.getPlatformToolset()), + "build", + "native", + "bin", + "x64", + "Release", + ) return env def _getDefaultSource(self, processType): @@ -4142,9 +4082,7 @@ def getCommandLine(self, current, process, exe, args): # configuration arguments. # if ( - isinstance(platform, Windows) - and not self.component.useBinDist(self, current) - or platform.getInstallDir() + platform.getInstallDir() and self.component.getInstallDir(self, current) != platform.getInstallDir() ): phpArgs += ["-n"] # Do not load any php.ini files diff --git a/scripts/ice-builder-xcode-wrapper b/scripts/ice-builder-xcode-wrapper index 75e189cc68c..d0481bfa17b 100755 --- a/scripts/ice-builder-xcode-wrapper +++ b/scripts/ice-builder-xcode-wrapper @@ -4,13 +4,7 @@ # This is a wrapper around Ice Builder for Xcode which is used by the # iOS C++ Xcode projects to help find binary and source distributions. -if [[ "$ICE_BIN_DIST" =~ ^(all|cpp)$ ]]; then - if [ -n "$ICE_HOME" ]; then - FLAGS="--ice-home \"$ICE_HOME\"" - fi -else - FLAGS="--ice-home ../../../.." -fi +FLAGS="--ice-home ../../../.." if [ -f "/usr/local/bin/icebuilder" ]; then ICEBUILDER="/usr/local/bin/icebuilder"