Remove entry point helper scripts (#33756)

* Remove entry point helper scripts

The entry point helper scripts were useful during the consolidation of
the repositories. This work is mostly done and the build.cmd/sh script
should be used, going forward.

diff --git a/coreclr.cmd b/coreclr.cmd
deleted file mode 100644 (file)
index 4cb16d4..0000000
--- a/coreclr.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-setlocal
-
-set _args=-subsetCategory coreclr %*
-if "%~1"=="-?" set _args=-help
-
-"%~dp0build.cmd" %_args%

diff --git a/coreclr.sh b/coreclr.sh
deleted file mode 100755 (executable)
index 45680ed..0000000
--- a/coreclr.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-source="${BASH_SOURCE[0]}"
-
-# resolve $SOURCE until the file is no longer a symlink
-while [[ -h $source ]]; do
-  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-  source="$(readlink "$source")"
-
-  # if $source was a relative symlink, we need to resolve it relative to the path where the
-  # symlink file was located
-  [[ $source != /* ]] && source="$scriptroot/$source"
-done
-
-scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-"$scriptroot/build.sh" --subsetCategory coreclr $@

diff --git a/docs/workflow/building/mono/README.md b/docs/workflow/building/mono/README.md
index b6cfcd3..020173a 100644 (file)
--- a/docs/workflow/building/mono/README.md
+++ b/docs/workflow/building/mono/README.md
@@ -12,7 +12,7 @@ build.cmd
 Note that the debug configuration is the default option. It generates a 'debug' output and that includes asserts, fewer code optimizations, and is easier for debugging. If you want to make performance measurements, or just want tests to execute more quickly, you can also build the 'release' version which does not have these checks by adding the flag `-configuration release` (or `-c release`).
  
 
-Once you've built the whole runtime and assuming you want to work with just mono, we have provided `$/mono.sh` that only builds mono and is short hand for:
+Once you've built the whole runtime and assuming you want to work with just mono, you want to use the following command:
 
 ```bash
 ./build.sh --subsetCategory mono
@@ -24,9 +24,7 @@ build.cmd -subsetCategory mono
 When the build completes, product binaries will be dropped in the `artifacts\bin\mono\<OS>.<arch>.<flavor>` folder.
 
 ### Useful Build Arguments
-Here are a list of build arguments that may be of use.  These apply to both `build.sh` and `mono.sh`:
-
-For both `build.sh` and `mono.sh`
+Here are a list of build arguments that may be of use:
 
 `/p:MonoEnableLlvm=true` - Builds mono w/ LLVM
 

diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index 274928c..ba2472d 100644 (file)
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -106,7 +106,7 @@ jobs:
 
     - name: BaseJobBuildCommand
       value: >-
-        installer.cmd -restore -build -ci -test
+        build.cmd -subsetcategory installer -restore -build -test -ci
         -configuration $(_BuildConfig)
         $(LiveOverridePathArgs)
         $(CommonMSBuildArgs)
@@ -121,7 +121,7 @@ jobs:
 
     - name: BaseJobBuildCommand
       value: >-
-        $(Build.SourcesDirectory)/installer.sh --restore --build --ci --test
+        $(Build.SourcesDirectory)/build.sh -subsetcategory installer -restore -build -test -ci
         -configuration $(_BuildConfig)
         $(LiveOverridePathArgs)
         $(CommonMSBuildArgs)
@@ -136,7 +136,7 @@ jobs:
 
     - name: BaseJobBuildCommand
       value: >-
-        $(Build.SourcesDirectory)/installer.sh --restore --build --ci --test
+        $(Build.SourcesDirectory)/build.sh -subsetcategory installer --restore --build --ci --test
         -configuration $(_BuildConfig)
         -os ${{ parameters.osGroup }}
         -arch ${{ parameters.archType }}
@@ -169,7 +169,7 @@ jobs:
         value: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&
 
     - name: BuildScript
-      value: ./installer.sh
+      value: ./build.sh
     - name: MSBuildScript
       value: /root/runtime/eng/common/msbuild.sh
 
@@ -198,7 +198,7 @@ jobs:
 
     - name: BuildArguments
       value: >-
-        --restore --build --ci --test
+        -subsetcategory installer -restore -build -test -ci
         /p:CrossBuild=${{ ne(parameters.crossrootfsDir, '') }}
         /p:PortableBuild=$(_PortableBuild)
         /p:SkipTests=$(SkipTests)

diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml
index c84cd3e..af50bb8 100644 (file)
--- a/eng/pipelines/libraries/base-job.yml
+++ b/eng/pipelines/libraries/base-job.yml
@@ -36,7 +36,7 @@ jobs:
       helixRepo: dotnet/runtime
       pool: ${{ parameters.pool }}
       variables:
-        - _buildScriptFileName: libraries
+        - _buildScriptFileName: build
         - _BuildConfig: ${{ parameters.buildConfig }}
 
         - _msbuildCommonParameters: ''
@@ -115,7 +115,7 @@ jobs:
         - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
           - _buildScript: ./$(_buildScriptFileName)$(scriptExt)
 
-        - _buildArguments: -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testScopeArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
+        - _buildArguments: -subsetcategory libraries -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testScopeArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
         - ${{ parameters.variables }}
 
       dependsOn:

diff --git a/eng/pipelines/libraries/enterprise/linux.yml b/eng/pipelines/libraries/enterprise/linux.yml
index 017ca39..f2f2db1 100644 (file)
--- a/eng/pipelines/libraries/enterprise/linux.yml
+++ b/eng/pipelines/libraries/enterprise/linux.yml
@@ -26,7 +26,7 @@ variables:
   - name: enterpriseTestsSetup
     value: $(sourcesRoot)/Common/tests/System/Net/EnterpriseTests/setup
   - name: containerRunTestsCommand
-    value: /repo/.dotnet/dotnet build /t:test
+    value: /repo/dotnet.sh build /t:test
   - name: containerLibrariesRoot
     value: /repo/src/libraries
 

diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml
index cae5110..9beb7e4 100644 (file)
--- a/eng/pipelines/mono/templates/build-job.yml
+++ b/eng/pipelines/mono/templates/build-job.yml
@@ -89,10 +89,10 @@ jobs:
 
     # Build
     - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
-      - script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) $(osOverride) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
+      - script: ./build$(scriptExt) -subsetcategory mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
         displayName: Build product
     - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
-      - script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) $(osOverride) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
+      - script: build$(scriptExt) -subsetcategory mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
         displayName: Build product
 
     # Publish product output directory for consumption by tests.
@@ -108,10 +108,10 @@ jobs:
 
     # Build packages
     - ${{ if and(ne(parameters.llvm, true), ne(parameters.osGroup, 'Windows_NT')) }}:
-      - script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }} -pack $(OutputRidArg)
+      - script: ./build$(scriptExt) -subsetcategory mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }} -pack $(OutputRidArg)
         displayName: Build nupkg
     - ${{ if and(ne(parameters.llvm, true), eq(parameters.osGroup, 'Windows_NT')) }}:
-      - script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }} -pack $(OutputRidArg)
+      - script: build$(scriptExt) -subsetcategory mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }} -pack $(OutputRidArg)
         displayName: Build nupkg
 
     # Save packages using the prepare-signed-artifacts format.

diff --git a/installer.cmd b/installer.cmd
deleted file mode 100644 (file)
index dbe665d..0000000
--- a/installer.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-setlocal
-
-set _args=-subsetCategory installer %*
-if "%~1"=="-?" set _args=-help
-
-"%~dp0build.cmd" %_args%

diff --git a/installer.sh b/installer.sh
deleted file mode 100755 (executable)
index 3809d7d..0000000
--- a/installer.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-source="${BASH_SOURCE[0]}"
-
-# resolve $SOURCE until the file is no longer a symlink
-while [[ -h $source ]]; do
-  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-  source="$(readlink "$source")"
-
-  # if $source was a relative symlink, we need to resolve it relative to the path where the
-  # symlink file was located
-  [[ $source != /* ]] && source="$scriptroot/$source"
-done
-
-scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-"$scriptroot/build.sh" --subsetCategory installer $@

diff --git a/libraries.cmd b/libraries.cmd
deleted file mode 100644 (file)
index bfbb059..0000000
--- a/libraries.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-setlocal
-
-set _args=-subsetCategory libraries %*
-if "%~1"=="-?" set _args=-help
-
-"%~dp0build.cmd" %_args%

diff --git a/libraries.sh b/libraries.sh
deleted file mode 100755 (executable)
index 4e1d477..0000000
--- a/libraries.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-source="${BASH_SOURCE[0]}"
-
-# resolve $SOURCE until the file is no longer a symlink
-while [[ -h $source ]]; do
-  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-  source="$(readlink "$source")"
-
-  # if $source was a relative symlink, we need to resolve it relative to the path where the
-  # symlink file was located
-  [[ $source != /* ]] && source="$scriptroot/$source"
-done
-
-scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-"$scriptroot/build.sh" --subsetCategory libraries $@

diff --git a/mono.cmd b/mono.cmd
deleted file mode 100644 (file)
index e72570f..0000000
--- a/mono.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-"%~dp0build.cmd" -subsetCategory mono %*

diff --git a/mono.sh b/mono.sh
deleted file mode 100755 (executable)
index 39ee1d2..0000000
--- a/mono.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-source="${BASH_SOURCE[0]}"
-
-# resolve $SOURCE until the file is no longer a symlink
-while [[ -h $source ]]; do
-  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-  source="$(readlink "$source")"
-
-  # if $source was a relative symlink, we need to resolve it relative to the path where the
-  # symlink file was located
-  [[ $source != /* ]] && source="$scriptroot/$source"
-done
-
-scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-"$scriptroot/build.sh" --subsetCategory mono $@