Commit Graph
100 Commits
Author SHA1 Message Date
Andrew Schwartzmeyer 6a4a2bcf07 Teach Git to ignore indicationlog
Test output from OMI
2015-10-19 17:11:12 -07:00
Andrew Schwartzmeyer db5bf0fc14 Update omi's gitignore 2015-10-19 17:09:29 -07:00
Andrew Schwartzmeyer 8ee52313d2 Update OMI build so Make is always called 2015-10-19 17:06:16 -07:00
Andy Schwartzmeyer 13ff064f68 Merge pull request 186 from dev/console into develop 2015-10-19 19:33:56 +00:00
Andrew Schwartzmeyer 1c067b2017 Remove Console.WriteLine(HandleControlC)
Ctrl-C works. If a command is running, it stops it and returns. If one
is not running, it seems to "suspend" the readline until enter is
pressed again.
2015-10-16 17:02:59 -07:00
Andrew Schwartzmeyer 06ea0b50c8 Remove deprecated init() function 2015-10-16 16:21:18 -07:00
Andrew Schwartzmeyer 556bdda1c7 Change console prompt 2015-10-16 16:17:44 -07:00
Andrew Schwartzmeyer a1009ffd4a Fix build of monad-native
Moved recursive make into phony target. This is okay because the called
make does not rebuild things. The calling make no longer flails about
when trying to make the three monad-native targets.
2015-10-16 14:37:46 -07:00
Andrew Schwartzmeyer 9d832b4b6d Fix TypeCatalogGen.exe dependencies
NuGet packages referenced as dependencies needed to depend on buildtemp
as well.
2015-10-16 14:37:18 -07:00
Andrew Schwartzmeyer 61222055a6 Ignore errors from clean targets 2015-10-16 12:28:59 -07:00
Andrew Schwartzmeyer f724203825 Add cleaning targets for PSRP 2015-10-16 12:25:17 -07:00
Andrew Schwartzmeyer 39a89925e0 Fix OMI dependency for provider 2015-10-16 12:24:48 -07:00
Andrew Schwartzmeyer 36ff3d0678 Add OMI targets to Makefile
Recursively builds OMI and the TestShell provider. The OMI tests
currently do not pass and so have not been added to `make test`.
2015-10-16 11:43:28 -07:00
Andrew Schwartzmeyer 714f5e5fe3 Update readme 2015-10-15 16:28:40 -07:00
Andy Schwartzmeyer f988e7ba3a Merge pull request 178 from develop into master 2015-10-15 22:50:59 +00:00
Andy Schwartzmeyer 23628d7710 Merge pull request 183 from dev/omi into develop 2015-10-15 22:50:17 +00:00
Andrew Schwartzmeyer 2473bf0ce4 Add src/omi submodule at OMI-Shell/OMI-PSRP-Support 2015-10-15 13:53:42 -07:00
Andrew Schwartzmeyer f6e6a75cf5 Add src/monad-omi-provider 2015-10-15 13:50:03 -07:00
Andy Schwartzmeyer 0496ff3cd2 Merge pull request 182 from dev/select-object into develop 2015-10-15 20:12:36 +00:00
Andy Schwartzmeyer 461008b0ba Merge pull request 181 from dev/rebuild into develop 2015-10-15 17:11:20 +00:00
Andrew Schwartzmeyer 49a2b29b03 Clean up cruft 2015-10-14 22:41:00 -07:00
Andrew Schwartzmeyer 6c47d78821 Refactor exec_env setup, can now build in parallel
With dependencies setup correctly, `make -j` now works as
expected. `prepare` target came back under a new role, to setup the
application base and CoreCLR in the execution environment.

Note that `$(APP_BASE)` is a phony target because we always want a clean
deployment. Cannot `rm -rf exec_env` because it conflicts with
`$(CORECLR)` when run in parallel.
2015-10-14 22:40:52 -07:00
Andrew Schwartzmeyer c8f76b6281 Factor out relative paths in Makefile
They make for terrible headaches.
2015-10-14 19:31:22 -07:00
Andrew Schwartzmeyer f5fcc96562 Fix missing dependency for PowerShell.Security.dll 2015-10-14 19:13:45 -07:00
Andrew Schwartzmeyer 504d2c327e Refactor xUnit build
`ps_test.dll` is now built in dotnetlibs, and copied along with xUnit
libraries during `internal-prepare-exec_env`.

Build process now creates things only as needed.
2015-10-14 14:17:34 -07:00
Andrew Schwartzmeyer a6006be854 Move libps build out of buildtemp 2015-10-14 14:05:52 -07:00
Andrew Schwartzmeyer 304df08fd7 Refactor use of dotnetlibs for reduced rebuilding
Also cleaned up Makefiles.  Added `scripts/dotnetlibs` back to Git so
Make doesn't ever have to create it (now I understand Peter's reasoning
here).
2015-10-14 14:03:01 -07:00
Andrew Schwartzmeyer 5d9c7c6d5f Refactor prepare target for non-phony buildtemp
- buildtemp, being non-phony, won't cause a recompilation every run
- rearranged where appropriate for better use of $<
2015-10-14 09:59:11 -07:00
Andrew Schwartzmeyer 3f82f7a4fb Remove PRODUCT_BASE_REFS 2015-10-14 08:58:16 -07:00
Andrew Schwartzmeyer 2657db7278 Fix IMPERSONATE=false 2015-10-14 08:58:01 -07:00
Andy Schwartzmeyer 41e67ea486 Merge pull request 180 from dev/tests into develop 2015-10-14 03:14:38 +00:00
Andrew Schwartzmeyer 8f39b0a809 Rename XML test results 2015-10-13 19:57:51 -07:00
Andrew Schwartzmeyer 34dcc5c059 Enable XML output for native tests 2015-10-13 19:48:58 -07:00
Andrew Schwartzmeyer 72e9a1fed0 Add pestertests.xml to cleanall target 2015-10-13 19:46:05 -07:00
Andy Schwartzmeyer fcaca3ac7c Merge pull request 179 from dev/pester-xml into develop 2015-10-14 01:49:11 +00:00
Andrew Schwartzmeyer 87988c7bea Enable XML output for Pester
- Taught Git to ignore XML output
- Updated Pester submodule with fixes
- Enabled reporting in Pester Makefile target
2015-10-13 15:25:39 -07:00
Andy Schwartzmeyer f98303d2bb Merge pull request 176 from dev/make into develop 2015-10-13 21:24:17 +00:00
Andrew Schwartzmeyer acce65c680 Add basic Hello World program for easier testing
We can use this to assert simple things about .NET Core (our build in
particular) for easier debugging.
2015-10-13 14:19:20 -07:00
Andrew Schwartzmeyer 3284c33f85 Fix "Hello World" target 2015-10-13 13:45:27 -07:00
Andrew Schwartzmeyer e483e449ad Add build.sh back as wrapper to monad-run
Fixes CI and lets us remove it at a later date.
2015-10-13 13:39:52 -07:00
Andrew Schwartzmeyer 16db74fb3e Build from scripts again 2015-10-13 13:37:06 -07:00
Andrew Schwartzmeyer e95b3dc801 Fix mkdir 2015-10-13 13:35:06 -07:00
Andrew Schwartzmeyer 9b0ef11e2f Add "Hello World" exe target
Compile with monad-run make HelloWorld.exe, given a HelloWorld.cs. Will
compile with our .NET Core, and output how to run. Does not support
multiple files.
2015-10-13 12:55:38 -07:00
Andy Schwartzmeyer 0b755aa906 Merge pull request 177 from dev/runtime into develop 2015-10-13 16:58:59 +00:00
Andrew Schwartzmeyer 487f7a5034 Remove workaround for missing Reflection.Metadata
- monad-ext updated to contain missing libraries
- monad updated to remove workaround
2015-10-12 21:26:53 -07:00
Andrew Schwartzmeyer 53cb7f8ffa Alias shell to run-interactive 2015-10-12 20:49:03 -07:00
Andrew Schwartzmeyer 80bc66eaaa Remove deprecated scripts 2015-10-12 20:49:03 -07:00
Andrew Schwartzmeyer 0d4ebb38b8 Replace docker build scripts
Import the functions into your shell, `source scripts/monad-docker.sh`,
then run `monad-run make test` or `monad-tty make run-interactive` from
`monad-linux`. Top level `Makefile` passes to `scripts/Makefile`.
2015-10-12 20:49:03 -07:00
Andy Schwartzmeyer 1f63da09a4 Merge pull request 175 from dev/clean-cliargv into develop 2015-10-09 23:10:35 +00:00
Andrew Schwartzmeyer 9270e0b9eb Implement simpler use of CommandLineToArgv
Reduced code churn from monad's master branch (aka Source Depot)
2015-10-09 16:02:11 -07:00
Andrew Schwartzmeyer 4fbb772ecf Some readme cleanups 2015-10-08 13:44:37 -07:00
Andrew Schwartzmeyer 5f57f76a6a Update readme 2015-10-08 13:25:59 -07:00
Andy Schwartzmeyer 9152a8bc60 Merge pull request 169 from dev/cache-nuget into develop 2015-10-07 22:49:34 +00:00
Andrew Schwartzmeyer 9124e4a328 Cache nuget.exe in scripts
Rather than downloading nuget.exe on every run, we can cache it, just
not in monad-ext with a rule to copy it. Instead, there's a rule to
refresh it from its canonical home.

See http://dist.nuget.org/index.html
2015-10-07 15:36:40 -07:00
Andy Schwartzmeyer 4682b26c08 Merge pull request 168 from dev/clean-up-makefile into develop 2015-10-07 20:34:28 +00:00
Andrew Schwartzmeyer 008f1ac4a3 Clean up Makefile
- Use explicit versions of NuGet packages
- Removed cruft
- Use MONO_PATH over cp
- Remove nuget.exe on cleanall
- Patch version bump of Reflection.Metadata and Collections.Immutable
2015-10-07 13:05:58 -07:00
Andrew Schwartzmeyer bbdc3de691 Use nuget -restore functionality
- Download nuget.exe from its official home
- Remove beta nuget.exe from monad-ext
- Specify dependencies in packages.config and use nuget.exe -restore
- Add prepare dependency to package libraries
- No more manual prepare step
- Update .gitignore
2015-10-06 21:55:21 -07:00
Andrew Schwartzmeyer 0c6a7616fc Update Roslyn compiler
Prior package was last updated 2015-05-20 and was prerelease. New
package is stable at 1.0.0 from 2015-07-13.

https://www.nuget.org/packages/Microsoft.Net.Compilers/
2015-10-06 21:26:48 -07:00
Andrew Schwartzmeyer 1b1cfe4602 Improve lipbs build
- Use $(MAKE) -C like the good developers intended
- Use -j flag for practically instant libps compilation
- DRY the dependencies and copies
2015-10-06 21:16:59 -07:00
Andrew Schwartzmeyer 26a1bfb696 Improve make clean, cleanall, clean-native
- Use clean-native to clean the native library
- Remove buildtemp and dotnetlibs from Git, mkdir on demand
2015-10-06 21:16:34 -07:00
Andrew Schwartzmeyer bf930abb96 Update CoreCLR/CoreFX to TFS build 23214
- Repins monad-ext to master, which was reset to the CoreCLR/FX update.
- Fixes Makefile for restructuring of monad-ext/coreclr
- Repins monad with fix for lack of System.Reflection.Metadata
- Updates build mapping for repin of monad
2015-10-06 18:38:48 -07:00
Andrew Schwartzmeyer 9421c0f3a5 Update monad submodule to master
Includes updated .gitignore
2015-10-06 15:10:18 -07:00
Andrew Schwartzmeyer 5f8196cca6 Ignore .bash_history from Docker 2015-10-06 15:09:44 -07:00
Andrew Schwartzmeyer b9e313a3ba Use bash, not sh 2015-10-02 12:08:12 -07:00
Andrew Schwartzmeyer 374e8a9f17 Merge branch 'develop' into dev/263-set-variable 2015-10-02 11:56:34 -07:00
Andrew Schwartzmeyer 781a2dad79 Merge branch 'develop' into dev/115-get-psdrive 2015-10-01 22:03:14 -07:00
Andrew Schwartzmeyer bf5909f26c Merge branch 'develop' into dev/188-get-content-add-tests 2015-10-01 20:30:54 -07:00
Andrew Schwartzmeyer 7d44959188 Merge branch 'develop' into dev/240-getrandom 2015-10-01 20:18:52 -07:00
Andrew Schwartzmeyer e31b3b5f3b Merge branch 'develop' into dev/208-select-string-pester 2015-10-01 15:34:08 -07:00
Andy Schwartzmeyer 48efe36603 Merge pull request 162 from repin into develop 2015-10-01 20:13:47 +00:00
Andrew Schwartzmeyer e9a1b5aaf0 Repin monad-native with updated gitignore 2015-10-01 13:05:33 -07:00
Andrew Schwartzmeyer 0e744caaa1 Repin monad-ext with System.Console patch 2015-10-01 13:04:58 -07:00
Andrew Schwartzmeyer c40bae356a Repin monad to 2015-10-01 2015-10-01 11:45:49 -07:00
Andrew Schwartzmeyer c8c05b23fb Run sudo with --set-home 2015-10-01 10:36:23 -07:00
Andrew Schwartzmeyer 86ebb7efb8 Ignore NuGet folders 2015-10-01 10:18:10 -07:00
Andrew Schwartzmeyer be7932155a Make impersonation switchable
Useful when debugging issues with root vs non-root
2015-10-01 10:18:10 -07:00
Andrew Schwartzmeyer 3ea6e96663 Run as local user inside Docker container 2015-10-01 10:18:10 -07:00
Andrew Schwartzmeyer d0e93b6b7f Refactor build.sh
- build.sh runs non-interactively
- build-tty.sh runs interactively with a pseudo tty
- both are shims to build-run.sh
- monad-native no longer depends on a tty
2015-10-01 10:18:10 -07:00
Andrew Schwartzmeyer b14a455343 Create TypeCatalogGen.exe input, powershell.inc
Previous attempt at this failed because it is not actually a Makefile.
2015-09-30 18:41:02 -07:00
Andy Schwartzmeyer 503dec41dc Merge pull request 151 from dev/248-cleanup into develop 2015-09-21 18:21:01 +00:00
Andrew Schwartzmeyer 88aefa5f40 Refactor to use $(APP_BASE)
Now that everything is run from exec_env/app_base, we can reuse it and
remove TESTRUN_FOLDER.
2015-09-21 11:20:30 -07:00
Andrew Schwartzmeyer 77b5569385 Fix rm 2015-09-18 14:18:05 -07:00
Andrew Schwartzmeyer bb4739db78 Refactor NuGet install step 2015-09-18 13:19:45 -07:00
Andrew Schwartzmeyer 050206ff8a Delete xunittests.xml on make clean 2015-09-18 12:59:59 -07:00
Andrew Schwartzmeyer 94f3fef288 Remove unneeded strings folders 2015-09-18 12:59:59 -07:00
Andrew Schwartzmeyer c6ca50c618 Remove src/linux
It was a deprecated experiment
2015-09-18 12:59:59 -07:00
Andrew Schwartzmeyer 8145ea26a4 Refactor Makefile
- Update variable names
- Remove no longer used variables
- Include coreref and tests directly (now that they're short)
2015-09-18 12:59:59 -07:00
Andy Schwartzmeyer 78ca62d573 Merge pull request 150 from dev/242-noinlining into develop 2015-09-18 19:06:17 +00:00
Andrew Schwartzmeyer 234f03fd69 Repin monad with removal of NoInlining attributes
Switching to Roslyn from Mono in PR 17 made this possible.
2015-09-18 12:04:56 -07:00
Andy Schwartzmeyer 4acc7c0e60 Merge pull request 149 from dev/updates into develop 2015-09-15 23:47:53 +00:00
Andrew Schwartzmeyer c2787fdaca Repin monad and build mapping
Monad submodule has been squashed and rebased to new PowerShell branch,
th2_srv1_mgmt_dev. Build system has been updated to include upstream
changes, as well as the addition of CorePsPlatform.cs to the PowerShell
build system (so it longer needs to be added automatically).
2015-09-15 16:46:06 -07:00
Andrew Schwartzmeyer e5e9e30347 Ignore CS170{1,2} C# compiler warnings 2015-09-15 16:45:31 -07:00
Andy Schwartzmeyer 323d6798e7 Merge pull request 144 from dev/repin-monad into develop 2015-09-04 23:04:26 +00:00
Andrew Schwartzmeyer 4dc037cc4e Repin monad to latest fixes
Resolves all approved work items prior to resubmission of a code review
to the PowerShell team.
2015-09-04 16:04:11 -07:00
Andrew Schwartzmeyer 70914a35ac Merge branch 'develop' into dev/repin-monad 2015-09-04 15:19:10 -07:00
Andrew Schwartzmeyer 962e3671b1 Update xUnit tests for AMSI and repin monad
Includes lots of fixes to monad.
2015-09-03 16:04:12 -07:00
Andy Schwartzmeyer c071f5882c Merge pull request 143 from dev/228-braces into develop 2015-09-03 22:23:26 +00:00
Andrew Schwartzmeyer f70f004238 Missed a pair 2015-09-03 15:23:16 -07:00
Andrew Schwartzmeyer f163808eac Swap {} for () in Makefile
Parentheses are more portable. There was an inconsistent mix of
parentheses and curly braces.
2015-09-03 14:55:21 -07:00
Andy Schwartzmeyer 54b2435811 Merge pull request 142 from dev/199-security into develop 2015-09-03 21:34:59 +00:00