diff --git a/.gitignore b/.gitignore index 0390c0b..a4871eb 100644 --- a/.gitignore +++ b/.gitignore @@ -411,4 +411,5 @@ ASALocalRun/ NuGetScratch/ VBCSCompiler/ -.dotnet/ \ No newline at end of file +.dotnet/ +release/ \ No newline at end of file diff --git a/VBCSCompiler/AnalyzerAssemblyLoader/7bc7b217dd2441498aea1618f3920780/1/xunit.analyzers.dll b/VBCSCompiler/AnalyzerAssemblyLoader/7bc7b217dd2441498aea1618f3920780/1/xunit.analyzers.dll deleted file mode 100755 index 19bc9d5..0000000 Binary files a/VBCSCompiler/AnalyzerAssemblyLoader/7bc7b217dd2441498aea1618f3920780/1/xunit.analyzers.dll and /dev/null differ diff --git a/ZDragon.NET.sln b/ZDragon.NET.sln index bee9e43..16244d0 100644 --- a/ZDragon.NET.sln +++ b/ZDragon.NET.sln @@ -16,8 +16,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .travis.yml = .travis.yml release.sh = release.sh github_release.sh = github_release.sh - local_release.sh = local_release.sh clean.sh = clean.sh + local_release_TEMP.sh = local_release_TEMP.sh + local_release.sh = local_release.sh EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mapper.XSD", "Mapper.XSD\Mapper.XSD.csproj", "{CC0033CB-E0DD-435D-B3E6-84C2A33DFBFC}" diff --git a/dotnet-installer/.dotnet/3.1.100_IsDockerContainer.dotnetUserLevelCache b/dotnet-installer/.dotnet/3.1.100_IsDockerContainer.dotnetUserLevelCache deleted file mode 100644 index 4791ed5..0000000 --- a/dotnet-installer/.dotnet/3.1.100_IsDockerContainer.dotnetUserLevelCache +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/dotnet-installer/.dotnet/3.1.100_MachineId.dotnetUserLevelCache b/dotnet-installer/.dotnet/3.1.100_MachineId.dotnetUserLevelCache deleted file mode 100644 index 4ba158f..0000000 --- a/dotnet-installer/.dotnet/3.1.100_MachineId.dotnetUserLevelCache +++ /dev/null @@ -1 +0,0 @@ -fdcc52e69f406c74634d0ffcc06184c238a4400bc4315169e7b4aeafe868fd08 \ No newline at end of file diff --git a/dotnet-installer/.dotnet/TelemetryStorageService/20191224090059_bfdd99fe65144527818638ce048431bd.trn b/dotnet-installer/.dotnet/TelemetryStorageService/20191224090059_bfdd99fe65144527818638ce048431bd.trn deleted file mode 100644 index 06693b3..0000000 --- a/dotnet-installer/.dotnet/TelemetryStorageService/20191224090059_bfdd99fe65144527818638ce048431bd.trn +++ /dev/null @@ -1,5 +0,0 @@ -https://dc.services.visualstudio.com/v2/track -Content-Type:application/x-json-stream -Content-Encoding:gzip - -H4sIAAAAAAAAA0yTTW/bMAyG/4rgXWNXX5al3IZmwLq2WNFmO+ymD6oR6tiBLQctiv73UdmyxT75FfmIL0m/V4PdQ7Wu7pOfxnmMufl8OPTJ25zG4WaY0/Muz00nvWfegAAFMtDWiehDAMMoC5S3svlyhCFXqyqnE41TZmrGay631KwpXbemoYJLQfUvjEq38IZRZ2pdsHXh1gVcX5IL0z7P1fq9sqmZYZ6xriYFTJet117SUHdCx1oKq2rHJKutoFEJxYzyFNMxLcAxeWjG+SdMJR+TF7cMeflznIYM02D7Zg4v/yN4Q/EVVHWs+lhVwWZbqnB2hu3bobg8md4UfXWSN39DjjBVa746tzaMeYB85ft0lcdDD0foD3aaYbry435vh4Dph2k8wJQTnJx+fyL/62CqoaUNKD70Nsdx2qN6l4bltahLPiyZPEJIE/gMpTHbaQE8ekSHOA5yE/75bU6w+lUV4MM0hsXni6tEwxpGS9M2o3+BiVyPQ7ZpKH7O1OtlmtA2ebB5R77aeYdH2rYQrOOaKxyyFJwZoC0DaQPwwELrnMc2+k4zlF1kUnTadN6FCJZGhth763d4EbnZIC8G71sOykRJle+kErgcMXpPFdPSc6GtlJQ6LwVrmTLQOWnBRtBKx0A18m5xotBfeDs1jMjGNIio+/L1kjL5xMjT/QPZLkC+LT3hhPN1q9dMkR/ba1L2GGF3yXlscQ84ZETN2boezvrlxnCBKo7f4RftOt4JyliwoaXBRGHBGY3unbKgsHongzIK2lZTFYLHX8pKL7noIuWqLBWUBSOnZQfLdBTe1CoCLruMotbAYx2DAYiCGt/F6gOf3wAAAP//AwCJg4LC0gMAAA== \ No newline at end of file diff --git a/dotnet-installer/.dotnet/TelemetryStorageService/20191224090059_ea39affe05a249a6a3020d4ba1df833b.trn b/dotnet-installer/.dotnet/TelemetryStorageService/20191224090059_ea39affe05a249a6a3020d4ba1df833b.trn deleted file mode 100644 index 6023154..0000000 --- a/dotnet-installer/.dotnet/TelemetryStorageService/20191224090059_ea39affe05a249a6a3020d4ba1df833b.trn +++ /dev/null @@ -1,5 +0,0 @@ -https://dc.services.visualstudio.com/v2/track -Content-Type:application/x-json-stream -Content-Encoding:gzip - -H4sIAAAAAAAAA0ySTU/cMBCG/4qVXknwZ2LvrWIrlQItgm0PvdnjMWsRklXiIBDqf+9kKYUkh+SdmSd+Z+alGvwDVpvqKsM0zmMqzefDoc/gSx6H82HOd/syN50GEOBQYYs6chNUghjRCS4il0Y3Xx5xKNVJVfKRJrlwtZC11DvuNpxvjGu4Np1r1W/Kyhf4TFlv1HrF1iu3XsH1R/LK9HdztXmpfG5mnGc6V5MjlYOQIRkQtYI21FpwrL02qtbGQApBeCk9lVNZxMcM2IzzL5zWeipewjKU5TWch4LT4PtmjvfvGbLhdCvedqL6c1JFX/x6iuBn3D0fVpdH09tVPznK238pjzhVG3ny1to4lgHLKfT5NA9z8X1/OuFhnMq8AJAhqj5M4wGnkvFo9Mctez+GaKlzlELide9LGqcHUi/zsDyt6lIOS2E3GPOEUHDty25akEI3ZJCmwc7jf7vNEVY/tSvwehrjAuXDr1QjGsE5xbYj3OPEzsah+Dysdt6oZ8s0kWt27cueffXznkLWG4w+SCtbJbVWUjjkRqD2EWUU0YQA1EXorCA5JKFVZ10HISb0PAnCXnnY04/Y+ZZ4KQIYia1LmrfQ6VbRbqQEwFthNUhlvdacB9BKGNE67IL26BPa1qbILfEuaKDYf/B2bBjTjWsIUffr130u7JNgt1fXbLcg+7b0TDIpN8ZuRMt+7s7YusYEu8wBqMU90owJRSMMPb7pHxdGKlLxCb+/Dr61CoXvfEDw0nUqBWk6G4XWYKyVMbZKqM45yZN3LlpyKHVKUjqgB9Yh4bpi7LjuVkSQ5K/W6DWte7J1SI7egjKBWsCTpUWl6y8AAAD//wMAKZtqgdQDAAA= \ No newline at end of file diff --git a/dotnet-installer/.dotnet/optimizationdata/3.1.100/ubuntu.16.04-x64/dotnet b/dotnet-installer/.dotnet/optimizationdata/3.1.100/ubuntu.16.04-x64/dotnet deleted file mode 100644 index 9a74717..0000000 Binary files a/dotnet-installer/.dotnet/optimizationdata/3.1.100/ubuntu.16.04-x64/dotnet and /dev/null differ diff --git a/local_release.sh b/local_release.sh old mode 100755 new mode 100644 index 45f420b..793961d --- a/local_release.sh +++ b/local_release.sh @@ -1,26 +1,12 @@ -#!/bin/bash -i -RED='\033[0;31m' -NOCOLOR='\033[0m' -if [ -z ${ZDRAGON_PATH} ]; then - read -p "Please enter your ZDragon.NET source path (folder with the dotnet solution): `echo $'\n'`" -e - if [ ! $(ls -a $REPLY | grep .sln) ] || [ ! $(ls -a $REPLY | grep CLI) ] ; then - echo "This is not a valid dotnet solution, or it does not contain the ZDragon.NET solution. Exiting." - exit 1; - fi - ZDRAGON_PATH=$REPLY - read -p "Would you like to add this path to your bash profile to be re-used in the next start? (y/n) `echo $'\n'`" -n 1 -r -e - if [[ $REPLY =~ ^[Yy]$ ]]; then - echo -e "export ZDRAGON_PATH=$ZDRAGON_PATH\n" >> $HOME/.bash_profile - echo -e "${RED}Please run 'source ~/.bash_profile'. This will prevent you from needing to re-do this the next run.${NOCOLOR}" - fi -fi +# The following variables are defaults, but can be overwritten as cli arguments, such as by running zdragon_release /usr/local/tempBinForDev +# This can be useful for one-time changes, but it is recommended to just edit the file if you want to do this often. +# Default bin location for mac OUTPUT_DIR="${1:-/usr/local/bin/}" # Defaults to mac OS="${2:-osx-x64}" -# assumes that the path ends with / -CLI_PATH=${ZDRAGON_PATH}CLI -SOURCE_DIR="${3:-$CLI_PATH}" +# If your zdragon source location differs from this, edit this variable. +SOURCE_DIR="${3:-$HOME/Projects/dotnet/ZDragon.NET/CLI}" APP_NAME="${4:-ckc}" dotnet publish "$SOURCE_DIR" -c Release --runtime "$OS" /p:PublishSingleFile=true -o "$OUTPUT_DIR" mv -v "$OUTPUT_DIR"CLI "$OUTPUT_DIR""$APP_NAME" \ No newline at end of file diff --git a/local_release_TEMP.sh b/local_release_TEMP.sh new file mode 100755 index 0000000..45f420b --- /dev/null +++ b/local_release_TEMP.sh @@ -0,0 +1,26 @@ +#!/bin/bash -i +RED='\033[0;31m' +NOCOLOR='\033[0m' +if [ -z ${ZDRAGON_PATH} ]; then + read -p "Please enter your ZDragon.NET source path (folder with the dotnet solution): `echo $'\n'`" -e + if [ ! $(ls -a $REPLY | grep .sln) ] || [ ! $(ls -a $REPLY | grep CLI) ] ; then + echo "This is not a valid dotnet solution, or it does not contain the ZDragon.NET solution. Exiting." + exit 1; + fi + ZDRAGON_PATH=$REPLY + read -p "Would you like to add this path to your bash profile to be re-used in the next start? (y/n) `echo $'\n'`" -n 1 -r -e + if [[ $REPLY =~ ^[Yy]$ ]]; then + echo -e "export ZDRAGON_PATH=$ZDRAGON_PATH\n" >> $HOME/.bash_profile + echo -e "${RED}Please run 'source ~/.bash_profile'. This will prevent you from needing to re-do this the next run.${NOCOLOR}" + fi +fi + +OUTPUT_DIR="${1:-/usr/local/bin/}" +# Defaults to mac +OS="${2:-osx-x64}" +# assumes that the path ends with / +CLI_PATH=${ZDRAGON_PATH}CLI +SOURCE_DIR="${3:-$CLI_PATH}" +APP_NAME="${4:-ckc}" +dotnet publish "$SOURCE_DIR" -c Release --runtime "$OS" /p:PublishSingleFile=true -o "$OUTPUT_DIR" +mv -v "$OUTPUT_DIR"CLI "$OUTPUT_DIR""$APP_NAME" \ No newline at end of file