Skip to content

Instantly share code, notes, and snippets.

View kangaroo's full-sized avatar

Geoff Norton kangaroo

View GitHub Profile
diff --git a/package.json b/package.json
index 347024e..164987b 100644
--- a/package.json
+++ b/package.json
@@ -299,6 +299,25 @@
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "2F6657B3D3C1044E9293F9C7E498AF283600DEAAF052975EBFBDD1296C8C6C05"
},
+ {
+ "id": "Debugger",
diff --git a/Netduino_2_and_3_NETMF/Solutions/Netduino3Ethernet/TinyCLR/TinyCLR.proj b/Netduino_2_and_3_NETMF/Solutions/Netduino3Ethernet/TinyCLR/TinyCLR.proj
index 2c1c46d..ada6f5e 100755
--- a/Netduino_2_and_3_NETMF/Solutions/Netduino3Ethernet/TinyCLR/TinyCLR.proj
+++ b/Netduino_2_and_3_NETMF/Solutions/Netduino3Ethernet/TinyCLR/TinyCLR.proj
@@ -62,7 +62,6 @@
<Import Project="$(SPOCLIENT)\Solutions\Netduino3Ethernet\DeviceCode\Netduino_IP_LinkLayers_AX88796C\Netduino.IP.LinkLayers.AX88796C.featureproj" />
<Import Project="$(SPOCLIENT)\Solutions\Netduino3Ethernet\DeviceCode\SecretLabs_NETMF_Diagnostics\SecretLabs.NETMF.Diagnostics.featureproj" />
<Import Project="$(SPOCLIENT)\Solutions\Netduino3Ethernet\DeviceCode\GoBus\GoBus.featureproj" />
- <Import Project="$(SPOCLIENT)\Solutions\Netduino2\DeviceCode\GoBus\GoBus.featureproj" />
<Import Project="$(SPOCLIENT)\Solutions\Netduino3Ethernet\DeviceCode\SecretLabs_NETMF_Hardware_Netduino\SecretLabs.NETMF.Hardware.Netduino.featureproj" />
diff --git a/Netduino_2_and_3_NETMF/setenv_base.cmd b/Netduino_2_and_3_NETMF/setenv_base.cmd
index fa6e059..9074342 100755
--- a/Netduino_2_and_3_NETMF/setenv_base.cmd
+++ b/Netduino_2_and_3_NETMF/setenv_base.cmd
@@ -79,18 +79,26 @@ rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
rem set tool-chains variables
IF /I NOT "%COMPILER_TOOL%" == "VS" (
- IF NOT "%VS110COMNTOOLS%" == "" (
- CALL "%VS110COMNTOOLS%vsvars32.bat"
Process: vmx [1050]
Path: /Applications/Veertu.app/Contents/MacOS/vmx.app/Contents/MacOS/vmx
Identifier: com.veertu.Veertu
Version: 1.0 (1)
Code Type: X86-64 (Native)
Parent Process: Veertu [800]
Responsible: vmx [1050]
User ID: 501
Date/Time: 2016-07-13 10:09:58.031 -0700
NuGet Config files used:
/home/plasma/.config/NuGet/NuGet.Config
Feeds used:
https://www.myget.org/F/dotnet-buildtools/
Installed:
1 package(s) to /home/plasma/src/corefx/packages/Microsoft.DotNet.BuildTools/1.0.25-prerelease-00157/lib/portableTargets/packages/
/home/plasma/src/corefx/dir.props(58,3): error MSB4019: The imported project "/home/plasma/src/corefx/packaging.props" was not found. Confirm that the path in the <Import> declaration is correct, and that the file exists on disk. [/home/plasma/src/corefx/build.proj]
diff --git a/src/scripts/install-cli.ps1 b/src/scripts/install-cli.ps1
index 58357fc..a4f1036 100644
--- a/src/scripts/install-cli.ps1
+++ b/src/scripts/install-cli.ps1
@@ -16,7 +16,7 @@ $ProgressPreference="SilentlyContinue"
$Feed="https://dotnetcli.blob.core.windows.net/dotnet"
$Channel="dev"
-$DotNetFileName="dotnet-win-" + $TargetPlatform + ".$Version.zip"
+$DotNetFileName="dotnet-win-" + $TargetPlatform + "." + $Version.ToLower() + ".zip"
diff --git a/src/pal/src/exception/seh-unwind.cpp b/src/pal/src/exception/seh-unwind.cpp
index 9cc2112..c53e93b 100644
--- a/src/pal/src/exception/seh-unwind.cpp
+++ b/src/pal/src/exception/seh-unwind.cpp
@@ -169,7 +169,7 @@ static void GetContextPointer(unw_cursor_t *cursor, unw_context_t *unwContext, i
{
SIZE_T *pLoc = (SIZE_T *)saveLoc.u.addr;
// Filter out fake save locations that point to unwContext
- if ((pLoc < (SIZE_T *)unwContext) || ((SIZE_T *)(unwContext + 1) <= pLoc))
+ if (unwContext == NULL || (pLoc < (SIZE_T *)unwContext) || ((SIZE_T *)(unwContext + 1) <= pLoc))
diff --git a/src/ToolBox/SOS/Strike/CMakeLists.txt b/src/ToolBox/SOS/Strike/CMakeLists.txt
index 78ada33..18fd0b1 100644
--- a/src/ToolBox/SOS/Strike/CMakeLists.txt
+++ b/src/ToolBox/SOS/Strike/CMakeLists.txt
@@ -76,10 +76,6 @@ if(WIN32)
ntdll.lib
)
else(WIN32)
- if(NOT CLR_CMAKE_PLATFORM_ARCH_AMD64)
- clr_unknown_arch()
# This is the CMakeCache file.
# For build in directory: /home/coreclr/coreclr/bin/obj/Linux.arm64.Debug
# It was generated by CMake: /usr/bin/cmake
# You can edit this file to change values found and used by cmake.
# If you do not want to change any of the values, simply exit the editor.
# If you do want to change a value, simply edit, save, and exit the editor.
# The syntax for the file is as follows:
# KEY:TYPE=VALUE
# KEY is the name of a variable in the cache.
# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!.