Fix build by not triming (#469)

* Fix build by not triming

* Fix build by not triming

* Fix build by not triming

* Fix build by not triming

* Fix build by not triming

* Fix build by not triming

* Fix build by not triming

* Fix build by not triming

Author: yangpanMS

VERSION

@@ -1 +1 @@
-1.16.36
+1.16.37

build.cmd

@@ -5,6 +5,7 @@ set SCRIPT_DIR=%~dp0
 set SCRIPT_DIR=%SCRIPT_DIR:~0,-1%
 set BUILD_CONFIGURATION=
 set BUILD_FLAGS=-p:PublishTrimmed=true
+set BUILD_FLAGS=
 set BUILD_VERSION=
 set VC_SOLUTION_DIR=%SCRIPT_DIR%\src\VirtualClient
 
@@ -16,7 +17,7 @@ for %%a in (%*) do (
 
     rem Pass in the --notrim flag to opt out of trimming the project 
     rem assemblies during build.
-    if /i "%%a" == "--notrim" set BUILD_FLAGS=
+    if /i "%%a" == "--trim" set BUILD_FLAGS=-p:PublishTrimmed=true
 )
 
 rem The default build version is defined in the repo VERSION file.

build.sh

@@ -1,30 +1,27 @@
 #!/bin/bash
 
 EXIT_CODE=0
-BUILD_CONFIGURATION=""
-BUILD_FLAGS="-p:PublishTrimmed=true"
+BUILD_CONFIGURATION="Release"
+BUILD_FLAGS=""
 BUILD_VERSION=""
 SCRIPT_DIR="$(dirname $(readlink -f "${BASH_SOURCE}"))"
 
 Usage() {
     echo ""
-    echo "Builds the source code in the repo."
+    echo "Builds the source code in the repo. "
+    echo ""
+    echo "Options:"
+    echo "---------------------"
+    echo "--trim   - Enables trimming for publish output."
     echo ""
     echo "Usage:"
     echo "---------------------"
-    echo "build.sh"
+    echo "build.sh [--trim]"
     echo ""
     echo "Examples"
     echo "---------------------"
-    echo "# Use defaults"
-    echo "user@system:~/repo$ chmod +x *.sh"
-    echo "user@system:~/repo$ ./build.sh"
-    echo ""
-    echo "# Set specific version and configuration"
-    echo "user@system:~/repo$ export VCBuildVersion=\"1.16.25\""
-    echo "user@system:~/repo$ export VCBuildConfiguration=\"Debug\""
-    echo "user@system:~/repo$ chmod +x *.sh"
     echo "user@system:~/repo$ ./build.sh"
+    echo "user@system:~/repo$ ./build.sh --trim"
     echo ""
     Finish
 }
@@ -45,23 +42,23 @@ Finish() {
     exit $EXIT_CODE
 }
 
-for ((i=1; i<=$#; i++)); do
-    arg="${!i}"
-  
-    if [ "$arg" == "/?" ] || [ "$arg" == "-?" ] || [ "$arg" == "--help" ]; then
-        Usage
-    fi
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+    case "${1,,}" in
+        "/?"|"-?"|"--help")
+            Usage
+            ;;
+        "--trim")
+            BUILD_FLAGS="-p:PublishTrimmed=true"
+            ;;
+        *)
+            echo "Unknown option: $1"
+            Usage
+            ;;
+    esac
+    shift
 done
 
-# The default build version is defined in the repo VERSION file.
-BUILD_VERSION=$(cat "$SCRIPT_DIR/VERSION")
-
-# The default build version can be overridden by the 'VCBuildVersion' 
-# environment variable
-if [[ -v "VCBuildVersion" && -n "$VCBuildVersion" ]]; then
-    BUILD_VERSION=$VCBuildVersion
-fi
-
 # The default build configuration is 'Release'.
 BUILD_CONFIGURATION="Release"
 
@@ -71,6 +68,14 @@ if [[ -v "VCBuildConfiguration" && -n "$VCBuildConfiguration" ]]; then
     BUILD_CONFIGURATION=$VCBuildConfiguration
 fi
 
+# The default build version is defined in the repo VERSION file.
+BUILD_VERSION=$(cat "$SCRIPT_DIR/VERSION" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+
+# The default build version can be overridden by the 'VCBuildVersion' environment variable
+if [[ -v "VCBuildVersion" && -n "$VCBuildVersion" ]]; then
+    BUILD_VERSION=$VCBuildVersion
+fi
+
 echo ""
 echo "**********************************************************************"
 echo "Build Version : $BUILD_VERSION"
@@ -79,6 +84,7 @@ echo "Configuration : $BUILD_CONFIGURATION"
 echo "Flags         : $BUILD_FLAGS"
 echo "**********************************************************************"
 
+
 echo ""
 echo "[Build Solution]"
 echo "----------------------------------------------------------------------"
@@ -102,7 +108,7 @@ if [ $result -ne 0 ]; then
 fi
 
 echo ""
-echo "Build Virtual Client: linux-arm64]"
+echo "[Build Virtual Client: linux-arm64]"
 echo "----------------------------------------------------------------------"
 dotnet publish "$SCRIPT_DIR/src/VirtualClient/VirtualClient.Main/VirtualClient.Main.csproj" -r linux-arm64 -c $BUILD_CONFIGURATION --self-contained \
 -p:AssemblyVersion=$BUILD_VERSION $BUILD_FLAGS
@@ -113,7 +119,7 @@ if [ $result -ne 0 ]; then
 fi
 
 echo ""
-echo "Build Virtual Client: win-x64]"
+echo "[Build Virtual Client: win-x64]"
 echo "----------------------------------------------------------------------"
 dotnet publish "$SCRIPT_DIR/src/VirtualClient/VirtualClient.Main/VirtualClient.Main.csproj" -r win-x64 -c $BUILD_CONFIGURATION --self-contained \
 -p:AssemblyVersion=$BUILD_VERSION $BUILD_FLAGS
@@ -134,4 +140,4 @@ if [ $result -ne 0 ]; then
     Error
 fi
 
-End
+End

src/VirtualClient/VirtualClient.Core.UnitTests/VirtualClient.Core.UnitTests.csproj

@@ -48,10 +48,6 @@
         </Content>
     </ItemGroup>
 
-    <ItemGroup>
-      <Content Include="S:\microsoft\virtualclient2\src\VirtualClient\TestResources\Results_CtsTraffic.csv" Link="Results_CtsTraffic.csv" />
-    </ItemGroup>
-
     <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Module.props))\Module.props" />
 
 </Project>