admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update CoreCLR/CoreFX to TFS build 23214

Browse Source 
- 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
This commit is contained in:
Andrew Schwartzmeyer
2015-10-06 18:38:48 -07:00
parent 9421c0f3a5
commit bf930abb96
6 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/Makefile
+12 -16
View File
@@ -7,7 +7,7 @@ include assembly-load-context.mk
MONAD_EXT=../src/monad-ext
TARGETING_PACK=$(MONAD_EXT)/coreclr/TargetingPack
COREREF=$(addprefix -r:, $(shell ls $(TARGETING_PACK)/*.dll))
CORECLR_ASSEMBLY_BASE=$(MONAD_EXT)/coreclr/Release
CORECLR_ASSEMBLY_BASE=$(MONAD_EXT)/coreclr/Runtime
# powershell-run is the main powershell executable
include powershell-run.mk
@@ -168,28 +168,24 @@ internal-prepare-exec_env: runps.sh $(POWERSHELL_RUN_TARGETS)
cp -r ../ext-src/pester $(APP_BASE)/Modules/Pester
cp runps*.sh $(APP_BASE)
internal-prepare-release-clr:
cp -r $(MONAD_EXT)/coreclr/Release/* exec_env/coreclr/
internal-prepare-clr:
cp -r $(CORECLR_ASSEMBLY_BASE)/* exec_env/coreclr/
# this is an internal target, it's not intended to be called manually
internal-prepare-debug-clr:
cp -r $(MONAD_EXT)/coreclr/Debug/* exec_env/coreclr/
run: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
run: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr
# execute a cmdlet, this will auto-load the utility module and print a, b and c in 3 lines
$(APP_BASE)/runps-simple.sh '"a","b","c","a","a" | Select-Object -Unique'
run-interactive: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
run-interactive: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr
$(APP_BASE)/runps.sh
run-file: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
run-file: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr
$(APP_BASE)/runps.sh --file $(PSSCRIPT)
# easy way to run individual PowerShell scripts, `make script.ps1` where the path is relative to monad-linux/scripts (with TEMP set for Pester)
%.ps1: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
%.ps1: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr
TEMP=/tmp $(APP_BASE)/runps.sh --file ../../$@
run-debugclr: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-debug-clr
run-debugclr: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr
PAL_DBG_CHANNELS="+LOADER.TRACE" $(APP_BASE)/runps-simple.sh get-location
native-tests: dotnetlibs/monad_native
@@ -206,11 +202,11 @@ $(APP_BASE)/xunit%: $(MONAD_EXT)/xunit/xunit%
$(APP_BASE)/ps_test.dll: $(TEST_SRCS) $(addprefix $(APP_BASE)/, xunit.core.dll xunit.assert.dll) $(addprefix dotnetlibs/, System.Management.Automation.dll Microsoft.PowerShell.Commands.Management.dll $(ASSEMBLY_LOAD_CONTEXT_TARGET))
$(CSC) $(CSCOPTS_LIB) -out:$@ $(addprefix -r:$(APP_BASE)/, xunit.core.dll xunit.assert.dll) $(addprefix -r:dotnetlibs/, System.Management.Automation.dll $(ASSEMBLY_LOAD_CONTEXT_TARGET)) $(COREREF) $(TEST_SRCS)
xunit-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr $(addprefix $(APP_BASE)/, ps_test.dll xunit.console.netcore.exe xunit.runner.utility.dll xunit.abstractions.dll xunit.execution.dll)
xunit-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr $(addprefix $(APP_BASE)/, ps_test.dll xunit.console.netcore.exe xunit.runner.utility.dll xunit.abstractions.dll xunit.execution.dll)
# execute the xUnit runner, with XML output
$(APP_BASE)/runps-test.sh ps_test.dll -xml ../../xunittests.xml
pester-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
pester-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr
# execute the Pester tests, which needs a TEMP environment variable to be set
$(APP_BASE)/runps-simple.sh 'cd ../../../src/pester-tests; $$env:TEMP="/tmp"; invoke-pester'
@@ -220,10 +216,10 @@ hashbang-tests:
test: native-tests xunit-tests pester-tests hashbang-tests
trace: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
trace: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr
$(APP_BASE)/runps-simple-trace.sh get-location
debug: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr
debug: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr
# quoting here is a bit special if strings are passed in, because lldb seems to forward arguments strangely
$(APP_BASE)/runps-simple-debug.sh get-location
scripts/commands-utility.mk
-6
View File
@@ -54,7 +54,6 @@ COMMANDS_UTILITY_SRCS_WIN=\
../../../jws/pswin/admin/monad/src/commands/utility/WriteProgressCmdlet.cs \
../../../jws/pswin/admin/monad/src/commands/utility/Update-Data.cs \
../../../jws/pswin/admin/monad/src/commands/utility/Update-TypeData.cs \
../../../jws/pswin/admin/monad/src/commands/utility/AddAssembly.cs \
../../../jws/pswin/admin/monad/src/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs \
../../../jws/pswin/admin/monad/src/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs \
../../../jws/pswin/admin/monad/src/commands/utility/FormatAndOutput/format-list/Format-List.cs \
@@ -127,7 +126,6 @@ COMMANDS_UTILITY_SRCS=\
$(ADMIN_GIT_ROOT)/monad/src/commands/utility/WriteProgressCmdlet.cs \
$(ADMIN_GIT_ROOT)/monad/src/commands/utility/Update-Data.cs \
$(ADMIN_GIT_ROOT)/monad/src/commands/utility/Update-TypeData.cs \
$(ADMIN_GIT_ROOT)/monad/src/commands/utility/AddAssembly.cs \
$(ADMIN_GIT_ROOT)/monad/src/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs \
$(ADMIN_GIT_ROOT)/monad/src/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs \
$(ADMIN_GIT_ROOT)/monad/src/commands/utility/FormatAndOutput/format-list/Format-List.cs \
@@ -173,7 +171,6 @@ COMMANDS_UTILITY_RESX_SRCS=\
../../../jws/pswin/admin/monad/src/commands/utility/resources/UpdateDataStrings.resx \
../../../jws/pswin/admin/monad/src/commands/utility/resources/ImportLocalizedDataStrings.resx \
../../../jws/pswin/admin/monad/src/commands/utility/resources/WriteProgressResourceStrings.resx \
../../../jws/pswin/admin/monad/src/commands/utility/resources/AddAssemblyStrings.resx \
../../../jws/pswin/admin/monad/src/commands/utility/resources/AliasCommandStrings.resx \
@@ -198,7 +195,6 @@ COMMANDS_UTILITY_RES_SRCS=\
gen/COMMANDS_UTILITY/UpdateDataStrings.resources \
gen/COMMANDS_UTILITY/ImportLocalizedDataStrings.resources \
gen/COMMANDS_UTILITY/WriteProgressResourceStrings.resources \
gen/COMMANDS_UTILITY/AddAssemblyStrings.resources \
gen/COMMANDS_UTILITY/AliasCommandStrings.resources \
@@ -223,7 +219,6 @@ COMMANDS_UTILITY_RES_CS_SRCS=\
gen/COMMANDS_UTILITY/UpdateDataStrings.cs \
gen/COMMANDS_UTILITY/ImportLocalizedDataStrings.cs \
gen/COMMANDS_UTILITY/WriteProgressResourceStrings.cs \
gen/COMMANDS_UTILITY/AddAssemblyStrings.cs \
gen/COMMANDS_UTILITY/AliasCommandStrings.cs \
@@ -248,7 +243,6 @@ COMMANDS_UTILITY_RES_REF=\
-resource:gen/COMMANDS_UTILITY/UpdateDataStrings.resources \
-resource:gen/COMMANDS_UTILITY/ImportLocalizedDataStrings.resources \
-resource:gen/COMMANDS_UTILITY/WriteProgressResourceStrings.resources \
-resource:gen/COMMANDS_UTILITY/AddAssemblyStrings.resources \
-resource:gen/COMMANDS_UTILITY/AliasCommandStrings.resources \
scripts/gen/SYS_AUTO/RemotingErrorIdStrings.cs
+24 -6
View File
@@ -1638,6 +1638,24 @@ internal class RemotingErrorIdStrings {
}
}
/// <summary>
/// Looks up a localized string similar to The input ContainerName {0} does not resolve to a single container..
/// </summary>
internal static string InvalidContainerNameMultiple {
get {
return ResourceManager.GetString("InvalidContainerNameMultiple", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The input ContainerName {0} does not exist..
/// </summary>
internal static string InvalidContainerNameNotExist {
get {
return ResourceManager.GetString("InvalidContainerNameNotExist", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The credential is invalid..
/// </summary>
@@ -1765,20 +1783,20 @@ internal class RemotingErrorIdStrings {
}
/// <summary>
/// Looks up a localized string similar to The input VMGuid parameter does not resolve to a single virtual machine..
/// Looks up a localized string similar to The input VMId parameter does not resolve to a single virtual machine..
/// </summary>
internal static string InvalidVMGuid {
internal static string InvalidVMId {
get {
return ResourceManager.GetString("InvalidVMGuid", resourceCulture);
return ResourceManager.GetString("InvalidVMId", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The input VMGuid {0} does not resolve to a single virtual machine..
/// Looks up a localized string similar to The input VMId {0} does not resolve to a single virtual machine..
/// </summary>
internal static string InvalidVMGuidNotSingle {
internal static string InvalidVMIdNotSingle {
get {
return ResourceManager.GetString("InvalidVMGuidNotSingle", resourceCulture);
return ResourceManager.GetString("InvalidVMIdNotSingle", resourceCulture);
}
}
scripts/gen/SYS_AUTO/RemotingErrorIdStrings.resources
BIN
View File
Binary file not shown.
src/monad
+1 -1
Submodule src/monad updated: a4db8beb6e...9330fdf4ce
src/monad-ext
+1 -1
Submodule src/monad-ext updated: 8b20276170...90a7b37cd7