Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master

13 files changed, 195 insertions, 154 deletions

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index d1bca0dcc75..fba3cd47194 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -40,7 +40,7 @@ jobs:
             CXX: g++-10
             PackageDeps: g++-10
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-20.04
+            os: ubuntu-18.04
           - CC: clang-5.0
             CXX: clang++-5.0
             PackageDeps: clang-5.0
@@ -73,8 +73,40 @@ jobs:
             Repo: llvm-toolchain-$(lsb_release -cs)-10
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
             os: ubuntu-20.04
+          - feature: CORBA/e micro
+            CC: gcc-10
+            CXX: g++-10
+            PackageDeps: g++-10
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-18.04
+            optional_feature: corba_e_micro=1
+            optional_macros: corba_e_micro=1
+          - feature: CORBA/e compact
+            CC: gcc-10
+            CXX: g++-10
+            PackageDeps: g++-10
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-18.04
+            optional_feature: corba_e_compact=1
+            optional_macros: corba_e_compact=1
+          - feature: ACE for TAO
+            CC: gcc-10
+            CXX: g++-10
+            PackageDeps: g++-10
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-20.04
+            optional_feature: ace_for_tao=1
+            optional_macros: ace_for_tao=1
+          - feature: wchar
+            CC: gcc-10
+            CXX: g++-10
+            PackageDeps: g++-10
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-20.04
+            optional_feature: uses_wchar=1
+            optional_macros: inline=0
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }} ${{ matrix.CXX }}
+    name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }}
     env:
       ACE_ROOT: ${{ github.workspace }}/ACE
       TAO_ROOT: ${{ github.workspace }}/TAO
@@ -107,6 +139,14 @@ jobs:
         'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
         'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
         'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
+    - name: add optional optional macros
+      run: |
+        '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
+      if: matrix.optional_macros != ''
+    - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
+      run: |
         '${{ matrix.platform_file }}' >>  ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
       shell: pwsh
     - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
@@ -116,6 +156,11 @@ jobs:
         'ssl=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
         'versioned_namespace=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
       shell: pwsh
+    - name: add optional optional feature
+      run: |
+        '${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      if: matrix.optional_feature != ''
+      shell: pwsh
     - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
       run: |
         perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 00000000000..9e43a5802c8
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,135 @@
+name: windows
+
+on:
+  pull_request:
+  schedule:
+    - cron: '0 7 * * SUN'
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - name: VS2017WChar
+            vmimage: windows-2016
+            mpctype: vs2017
+            BuildPlatform: x64
+            BuildConfiguration: Debug
+            vcpkgarch: x64-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: 'openssl xerces-c[xmlch-wchar]'
+            OptionalFeatures: uses_wchar=1
+          - name: VS2017Debug64
+            vmimage: windows-2016
+            mpctype: vs2017
+            BuildPlatform: x64
+            BuildConfiguration: Debug
+            vcpkgarch: x64-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: openssl xerces-c
+          - name: VS2017Release64
+            vmimage: windows-2016
+            mpctype: vs2017
+            BuildPlatform: x64
+            BuildConfiguration: Release
+            vcpkgarch: x64-windows
+            vcpkglibdir: lib
+            vcpkgpackages: openssl xerces-c
+          - name: VS2019WChar
+            vmimage: windows-2019
+            mpctype: vs2019
+            BuildPlatform: x64
+            BuildConfiguration: Debug
+            vcpkgarch: x64-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: 'openssl xerces-c[xmlch-wchar]'
+            OptionalFeatures: uses_wchar=1
+          - name: VS2019Debug64
+            vmimage: windows-2019
+            mpctype: vs2019
+            BuildPlatform: x64
+            BuildConfiguration: Debug
+            vcpkgarch: x64-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: openssl xerces-c
+          - name: VS2019Release64
+            vmimage: windows-2019
+            mpctype: vs2019
+            BuildPlatform: x64
+            BuildConfiguration: Release
+            vcpkgarch: x64-windows
+            vcpkglibdir: lib
+            vcpkgpackages: openssl xerces-c
+          - name: VS2019Debug32
+            vmimage: windows-2019
+            mpctype: vs2019
+            BuildPlatform: Win32
+            BuildConfiguration: Debug
+            vcpkgarch: x86-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: openssl xerces-c
+          - name: VS2019Release32
+            vmimage: windows-2019
+            mpctype: vs2019
+            BuildPlatform: Win32
+            BuildConfiguration: Release
+            vcpkgarch: x86-windows
+            vcpkglibdir: lib
+            vcpkgpackages: openssl xerces-c
+    runs-on: ${{ matrix.vmimage }}
+    name: ${{ matrix.name }}
+    env:
+      ACE_ROOT: ${{ github.workspace }}/ACE
+      TAO_ROOT: ${{ github.workspace }}/TAO
+      MPC_ROOT: ${{ github.workspace }}/MPC
+      VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+      XERCESC_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
+      XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
+      SSL_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
+      SSL_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
+    steps:
+    - name: checkout ACE/TAO
+      uses: actions/checkout@v2
+    - name: checkout MPC
+      uses: actions/checkout@v2
+      with:
+        repository: DOCGroup/MPC
+        path: MPC
+    - name: Install vcpkg
+      uses: lukka/run-vcpkg@v3
+      with:
+        vcpkgGitCommitId: f6948aeb686c015d7b582aa4d76702a2f92602b1
+        vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }}
+        vcpkgTriplet: ${{ matrix.vcpkgarch }}
+        appendedCacheKey: ${{ matrix.name }}
+    - name: create $ACE_ROOT/ace/config.h
+      run: |
+        '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h
+      shell: pwsh
+    - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+      run: |
+        echo "ipv6=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        echo "xerces3=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        echo "openssl11=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      shell: pwsh
+    - name: Add optional features ${{ matrix.OptionalFeatures }}
+      run: |
+        echo "${{ matrix.OptionalFeatures }}" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+      shell: pwsh
+      if: matrix.OptionalFeatures != ''
+    - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4
+      shell: pwsh
+    - name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:ACE_ROOT}/tests/tests.mwc -workers 4
+      shell: pwsh
+    - name: Setup msbuild
+      uses: microsoft/setup-msbuild@v1.0.1
+    - name: Build solution TAO/TAO_ACE.sln
+      run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln
+    - name: Build solution ACE/tests/tests.sln
+      run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} ACE/tests/tests.sln
diff --git a/.travis.yml b/.travis.yml
index 536f8d02bcc..4aaf37865f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,6 @@ compiler:
 
 env:
   matrix:
-    - CORBAEMICRO=1 ACEFORTAO=0 TAO=1
-    - CORBAECOMPACT=1 ACEFORTAO=0 TAO=1
-    - ACEFORTAO=1 TAO=1
-    - USES_WCHAR=1 TAO=1
     - ACETESTS=1 FACE=1 ACE=1 TAO=0
   global:
     - ACE_ROOT=$TRAVIS_BUILD_DIR/ACE
diff --git a/ACE/ace/Cleanup.h b/ACE/ace/Cleanup.h
index 86044c85c2b..afc23f2e419 100644
--- a/ACE/ace/Cleanup.h
+++ b/ACE/ace/Cleanup.h
@@ -146,7 +146,6 @@ private:
   ACE_Cleanup_Info_Node_List registered_objects_;
 };
 
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 # if defined (ACE_HAS_INLINED_OSCALLS)
diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp
index 8151097896e..39aa918d2fb 100644
--- a/ACE/ace/DLL_Manager.cpp
+++ b/ACE/ace/DLL_Manager.cpp
@@ -157,7 +157,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
                     }
                   open_mode |= RTLD_MEMBER;
 
-                  if (this->open_i (aix_pathname, open_mode))
+                  if (this->open_i (aix_pathname, open_mode, errors))
                     break;
                 }
 #endif /* AIX */
diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h
index dca3054c81f..50c52309ec6 100644
--- a/ACE/ace/Object_Manager_Base.h
+++ b/ACE/ace/Object_Manager_Base.h
@@ -117,9 +117,7 @@ private:
 };
 
 extern "C"
-void
-ACE_OS_Object_Manager_Internal_Exit_Hook (void);
-
+void ACE_OS_Object_Manager_Internal_Exit_Hook (void);
 
 // @@ This forward declaration should go away.
 class ACE_Log_Msg;
diff --git a/ACE/tests/Bug_4189_Regression_Test.cpp b/ACE/tests/Bug_4189_Regression_Test.cpp
index e55f3fa52f7..bff5a9297e7 100644
--- a/ACE/tests/Bug_4189_Regression_Test.cpp
+++ b/ACE/tests/Bug_4189_Regression_Test.cpp
@@ -9,7 +9,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index b989cb0f010..7277368fffb 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -63,7 +63,7 @@ Bug_3912_Regression_Test: !STATIC
 Bug_3943_Regression_Test: !ACE_FOR_TAO
 Bug_3974_Regression_Test
 Bug_4055_Regression_Test: !ST
-Bug_4189_Regression_Test: !ST
+Bug_4189_Regression_Test: !ST !ACE_FOR_TAO
 CDR_Array_Test: !ACE_FOR_TAO
 CDR_File_Test: !ACE_FOR_TAO
 CDR_Fixed_Test: !ACE_FOR_TAO
@@ -283,4 +283,4 @@ Wild_Match_Test
 SSL/Bug_2912_Regression_Test: SSL !ACE_FOR_TAO !BAD_AIO
 SSL/SSL_Asynch_Stream_Test: SSL !ACE_FOR_TAO !BAD_AIO !FIXED_BUGS_ONLY
 SSL/Thread_Pool_Reactor_SSL_Test: SSL
-UNIX_Addr_Test
+UNIX_Addr_Test: !ACE_FOR_TAO
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 3789283e13d..35feb43db0f 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -475,6 +475,7 @@ project(Bug_4055_Regression_Test) : acetest, threads {
 }
 
 project(Bug_4189_Regression_Test) : acetest, threads {
+  avoids += ace_for_tao
   exename = Bug_4189_Regression_Test
   Source_Files {
     Bug_4189_Regression_Test.cpp
@@ -2284,6 +2285,7 @@ project(Missing_Svc_Conf_Test) : acetest {
 }
 
 project(UNIX Addr Test) : acetest {
+  avoids += ace_for_tao
   exename = UNIX_Addr_Test
   Source_Files {
     UNIX_Addr_Test.cpp
diff --git a/README.md b/README.md
index 6cae93f9649..bc8ddd192af 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@
 [![Lastest release](https://img.shields.io/github/release/docgroup/ace_tao.svg)](https://github.com/DOCGroup/ACE_TAO/releases/latest)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9a20abe6590a4b3ca946d7634d9f51af)](https://www.codacy.com/app/DOCGroup/ACE_TAO?utm_source=github.com&utm_medium=referral&utm_content=DOCGroup/ACE_TAO&utm_campaign=badger)
 [![Build Status](https://travis-ci.com/DOCGroup/ACE_TAO.svg?branch=master)](https://travis-ci.com/DOCGroup/ACE_TAO)
+[![Linux CI](https://github.com/DOCGroup/ACE_TAO/workflows/linux/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Alinux)
+[![Windows CI](https://github.com/DOCGroup/ACE_TAO/workflows/windows/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Awindows)
+[![Fuzz CI](https://github.com/DOCGroup/ACE_TAO/workflows/fuzz/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Afuzz)
+[![MacOSX CI](https://github.com/DOCGroup/ACE_TAO/workflows/macosx/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Amacosx)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/1/badge.svg)](https://scan.coverity.com/projects/1)
-[![Azure DevOps](https://dev.azure.com/docgroup/ACE_TAO/_apis/build/status/DOCGroup.ACE_TAO?branchName=master)](https://dev.azure.com/docgroup/ACE_TAO/_build/latest?definitionId=7&branchName=master)
 [![CodeFactor](https://www.codefactor.io/repository/github/docgroup/ace_tao/badge)](https://www.codefactor.io/repository/github/docgroup/ace_tao)
 
+
 # ACE/TAO #
 
 See [Douglas C. Schmidt website](https://www.dre.vanderbilt.edu/~schmidt)  for more information about ACE/TAO. The quality of ACE/TAO is monitored through our distributed [scoreboard](https://www.dre.vanderbilt.edu/scoreboard/)
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 005f514c9b0..b2df4e6925a 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -28,7 +28,7 @@
  * A template server definition. This template can be used by
  * single server/client projects for definition of their
  * server/clients.  See the directories time, bank, echo for
- * further details of implemenatation.
+ * further details of implementation.
  */
 template <class Servant>
 class Server
diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl
index 13f9a99095c..884119168eb 100755
--- a/TAO/tests/AMI/run_test.pl
+++ b/TAO/tests/AMI/run_test.pl
@@ -63,7 +63,7 @@ if ($client->PutFile ($iorbase) == -1) {
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
 }
-# copy the configruation file.
+# copy the configuration file.
 if ($client->PutFile ($conf_file) == -1) {
     print STDERR "ERROR: cannot set file <$client_conf>\n";
     $SV->Kill (); $SV->TimedWait (1);
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index 24f2ceecd80..00000000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-variables:
-   ACE_ROOT: $(Build.SourcesDirectory)/ACE
-   TAO_ROOT: $(Build.SourcesDirectory)/TAO
-   MPC_ROOT: $(Build.SourcesDirectory)/ACE/MPC
-   system.prefergit: true
-
-schedules:
-- cron: "0 7 * * SUN"
-  displayName: Weekly Sunday
-  branches:
-    include:
-    - master
-  always: true
-
-resources:
-- repo: self
-  fetchDepth: 1
-
-jobs:
-- job: Windows
-  timeoutInMinutes: 120
-  strategy:
-    matrix:
-      VS2019WChar:
-        vmimage: windows-2019
-        mpctype: vs2019
-        BuildPlatform: x64
-        BuildConfiguration: Debug
-        vcpkgarch: x64-windows
-        vcpkglibdir: debug\lib
-        vcpkgpackages: 'openssl xerces-c[xmlch-wchar]'
-        OptionalFeatures: uses_wchar=1
-      VS2019Debug64:
-        vmimage: windows-2019
-        mpctype: vs2019
-        BuildPlatform: x64
-        BuildConfiguration: Debug
-        vcpkgarch: x64-windows
-        vcpkglibdir: debug\lib
-        vcpkgpackages: openssl xerces-c
-      VS2019Release64:
-        vmimage: windows-2019
-        mpctype: vs2019
-        BuildPlatform: x64
-        BuildConfiguration: Release
-        vcpkgarch: x64-windows
-        vcpkglibdir: lib
-        vcpkgpackages: openssl xerces-c
-      VS2019Debug32:
-        vmimage: windows-2019
-        mpctype: vs2019
-        BuildPlatform: Win32
-        BuildConfiguration: Debug
-        vcpkgarch: x86-windows
-        vcpkglibdir: debug\lib
-        vcpkgpackages: openssl xerces-c
-      VS2019Release32:
-        vmimage: windows-2019
-        mpctype: vs2019
-        BuildPlatform: Win32
-        BuildConfiguration: Release
-        vcpkgarch: x86-windows
-        vcpkglibdir: lib
-        vcpkgpackages: openssl xerces-c
-      VS2017WChar:
-        vmimage: vs2017-win2016
-        mpctype: vs2017
-        BuildPlatform: x64
-        BuildConfiguration: Debug
-        vcpkgarch: x64-windows
-        vcpkglibdir: debug\lib
-        vcpkgpackages: 'openssl xerces-c[xmlch-wchar]'
-        OptionalFeatures: uses_wchar=1
-      VS2017Debug64:
-        vmimage: vs2017-win2016
-        mpctype: vs2017
-        BuildPlatform: x64
-        BuildConfiguration: Debug
-        vcpkgarch: x64-windows
-        vcpkglibdir: debug\lib
-        vcpkgpackages: openssl xerces-c
-      VS2017Release64:
-        vmimage: vs2017-win2016
-        mpctype: vs2017
-        BuildPlatform: x64
-        BuildConfiguration: Release
-        vcpkgarch: x64-windows
-        vcpkglibdir: lib
-        vcpkgpackages: openssl xerces-c
-  pool:
-    vmImage: $(vmimage)
-  variables:
-    VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg
-    XERCESC_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
-    XERCESC_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
-    SSL_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
-    SSL_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
-  steps:
-  - powershell: |
-      git clone -q --depth 1 git://github.com/Microsoft/vcpkg.git $(VCPKG_ROOT)
-      $(VCPKG_ROOT)\bootstrap-vcpkg.bat
-      $(VCPKG_ROOT)\vcpkg install --recurse --triplet $(vcpkgarch) $(vcpkgpackages)
-    displayName: Install additional packages using vcpkg
-  - powershell: |
-      '#include "ace/config-win32.h"' > $(ACE_ROOT)/ace/config.h
-    displayName: Create config.h file
-  - powershell: |
-      echo "ipv6=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "openssl11=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-      echo "versioned_namespace=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-    displayName: Create default.features file
-  - powershell: |
-      echo $(OptionalFeatures) | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
-    displayName: Add optional features ($(OptionalFeatures))
-    condition: and(succeeded(), ne(variables['OptionalFeatures'], ''))
-  - powershell: git clone -q --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT)
-    displayName: git clone MPC
-  - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type $(mpctype) $(TAO_ROOT)/TAO_ACE.mwc -workers 4
-    displayName: Run script mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
-  - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type $(mpctype) $(ACE_ROOT)/tests/tests.mwc -workers 4
-    displayName: Run script mwc.pl on $(ACE_ROOT)/tests/tests.mwc
-  - task: VSBuild@1
-    displayName: Build solution TAO/TAO_ACE.sln
-    inputs:
-      solution: TAO/TAO_ACE.sln
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true
-  - task: VSBuild@1
-    displayName: Build solution ACE/tests/tests.sln
-    inputs:
-      solution: ACE/tests/tests.sln
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true