Skip to content

Commit

Permalink
Revert "Rework System.DateTime (nanoframework#553)"
Browse files Browse the repository at this point in the history
This reverts commit 7bf591d.

Signed-off-by: José Simões <[email protected]>
  • Loading branch information
josesimoes committed Jan 3, 2018
1 parent 0d24e1f commit 07d58a3
Show file tree
Hide file tree
Showing 16 changed files with 185 additions and 381 deletions.
4 changes: 3 additions & 1 deletion CMake/Modules/FindNF_CoreCLR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,15 @@ set(NF_CoreCLR_SRCS
corlib_native_System_Collections_Stack.cpp
corlib_native_System_Console.cpp
corlib_native_System_Convert.cpp
corlib_native_System_DateTime.cpp
corlib_native_System_Delegate.cpp
corlib_native_System_Diagnostics_Debugger.cpp
corlib_native_System_Double.cpp
corlib_native_System_Enum.cpp
corlib_native_System_Exception.cpp
corlib_native_System_GC.cpp
corlib_native_System_Globalization_CultureInfo.cpp
corlib_native_System_Globalization_DateTimeFormat.cpp
corlib_native_System_Guid.cpp
corlib_native_System_MarshalByRefObject.cpp
corlib_native_System_Math.cpp
Expand Down Expand Up @@ -131,7 +133,7 @@ set(NF_CoreCLR_SRCS
nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp
nf_rt_native_nanoFramework_Runtime_Native_Debug.cpp
nf_rt_native_nanoFramework_Runtime_Native_ExecutionConstraint.cpp

# Core stubs
Hardware_stub.cpp
Heap_Persistence_stub.cpp
Expand Down
46 changes: 0 additions & 46 deletions CMake/Modules/FindSystem.DateTime.cmake

This file was deleted.

12 changes: 2 additions & 10 deletions CMake/Modules/NF_API_Namespaces.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ option(API_Windows.Devices.Pwm "option for Windows.Devices.Pwm API")
option(API_Windows.Devices.Adc "option for Windows.Devices.Adc API")
option(API_nanoFramework.Runtime.Events "option for nanoFramework.Runtime.Events API")

# options for base class library flavours
option(API_System.DateTime "option for System.DateTime API")


#################################################################
# macro to perform individual settings to add an API to the build
Expand Down Expand Up @@ -60,19 +57,14 @@ endmacro()
############################################################################################

macro(ParseApiOptions)

# System.DateTime
if(API_System.DateTime)
##### API name here (doted name)
PerformSettingsForApiEntry("System.DateTime")
endif()


# Windows.Devices.Gpio
if(API_Windows.Devices.Gpio)
##### API name here (doted name)
PerformSettingsForApiEntry("Windows.Devices.Gpio")
endif()


# Windows.Devices.Spi
if(API_Windows.Devices.Spi)
##### API name here (doted name)
Expand Down
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -357,12 +357,6 @@ include(NF_API_Namespaces)
# and/or manage other APIs that are required


if(API_System.DateTime)
# this API requires RTC
set(NF_FEATURE_RTC ON CACHE INTERNAL "enable NF_FEATURE_RTC from System.DateTime")
endif()


if(API_Windows.Devices.Gpio)
set(HAL_USE_GPIO_OPTION TRUE CACHE INTERNAL "HAL GPIO for Windows.Devices.Gpio")

Expand Down
42 changes: 21 additions & 21 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@

matrix:
- BOARD_NAME: 'ST_STM32F4_DISCOVERY'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
- BOARD_NAME: 'ST_STM32F429I_DISCOVERY'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
- BOARD_NAME: 'ST_NUCLEO64_F091RC'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F0xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=OFF -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F0xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=OFF'
- BOARD_NAME: 'ST_NUCLEO144_F746ZG'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
- BOARD_NAME: 'MBN_QUAIL'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
NEEDS_DFU: 'True'
- BOARD_NAME: 'ST_STM32F769I_DISCOVERY'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
- BOARD_NAME: 'NETDUINO3_WIFI'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
NEEDS_DFU: 'True'

matrix:
Expand Down Expand Up @@ -186,20 +186,20 @@

matrix:
- BOARD_NAME: 'ST_STM32F4_DISCOVERY'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
- BOARD_NAME: 'ST_STM32F429I_DISCOVERY'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
- BOARD_NAME: 'ST_NUCLEO64_F091RC'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F0xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=OFF -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F0xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=OFF'
- BOARD_NAME: 'ST_NUCLEO144_F746ZG'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
- BOARD_NAME: 'MBN_QUAIL'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
NEEDS_DFU: 'True'
- BOARD_NAME: 'ST_STM32F769I_DISCOVERY'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
- BOARD_NAME: 'NETDUINO3_WIFI'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON'
NEEDS_DFU: 'True'
- BOARD_NAME: 'NANOCLR_WINDOWS'

Expand Down Expand Up @@ -372,20 +372,20 @@

matrix:
- BOARD_NAME: 'ST_STM32F4_DISCOVERY'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
- BOARD_NAME: 'ST_STM32F429I_DISCOVERY'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
- BOARD_NAME: 'ST_NUCLEO64_F091RC'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F0xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F0xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
- BOARD_NAME: 'ST_NUCLEO144_F746ZG'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=OFF -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=OFF'
- BOARD_NAME: 'MBN_QUAIL'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON'
NEEDS_DFU: 'True'
- BOARD_NAME: 'ST_STM32F769I_DISCOVERY'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
- BOARD_NAME: 'NETDUINO3_WIFI'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_System.DateTime=ON'
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
NEEDS_DFU: 'True'

matrix:
Expand Down
2 changes: 0 additions & 2 deletions cmake-variants.TEMPLATE.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"NF_FEATURE_USE_APPDOMAINS" : "OFF-default-ON-to-enable-support-for-Application-Domains",
"NF_FEATURE_USE_FILESYSTEM" : "OFF-default-ON-to-enable-support",
"NF_FEATURE_USE_NETWORKING" : "OFF-default-ON-to-enable-support",
"API_System.DateTime" : "OFF-default-ON-to-add-this-API",
"API_Windows.Devices.Gpio" : "OFF-default-ON-to-add-this-API",
"API_Windows.Devices.Spi" : "OFF-default-ON-to-add-this-API",
"API_Windows.Devices.I2c" : "OFF-default-ON-to-add-this-API",
Expand Down Expand Up @@ -80,7 +79,6 @@
"NF_FEATURE_USE_APPDOMAINS" : "OFF-default-ON-to-enable-support-for-Application-Domains",
"NF_FEATURE_USE_FILESYSTEM" : "OFF-default-ON-to-enable-support",
"NF_FEATURE_USE_NETWORKING" : "OFF-default-ON-to-enable-support",
"API_System.DateTime" : "OFF-default-ON-to-add-this-API",
"API_Windows.Devices.Gpio" : "OFF-default-ON-to-add-this-API",
"API_Windows.Devices.Spi" : "OFF-default-ON-to-add-this-API",
"API_Windows.Devices.I2c" : "OFF-default-ON-to-add-this-API",
Expand Down
2 changes: 2 additions & 0 deletions src/CLR/CorLib/CorLib.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@
<ClCompile Include="corlib_native_System_Collections_Stack.cpp" />
<ClCompile Include="corlib_native_System_Console.cpp" />
<ClCompile Include="corlib_native_System_Convert.cpp" />
<ClCompile Include="corlib_native_System_DateTime.cpp" />
<ClCompile Include="corlib_native_System_Delegate.cpp" />
<ClCompile Include="corlib_native_System_Diagnostics_Debugger.cpp" />
<ClCompile Include="corlib_native_System_Double.cpp" />
<ClCompile Include="corlib_native_System_Enum.cpp" />
<ClCompile Include="corlib_native_System_Exception.cpp" />
<ClCompile Include="corlib_native_System_GC.cpp" />
<ClCompile Include="corlib_native_System_Globalization_CultureInfo.cpp" />
<ClCompile Include="corlib_native_System_Globalization_DateTimeFormat.cpp" />
<ClCompile Include="corlib_native_System_Guid.cpp" />
<ClCompile Include="corlib_native_System_MarshalByRefObject.cpp" />
<ClCompile Include="corlib_native_System_Math.cpp" />
Expand Down
6 changes: 6 additions & 0 deletions src/CLR/CorLib/CorLib.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
<ClCompile Include="corlib_native_System_Threading_Thread.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_DateTime.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_TimeSpan.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -83,6 +86,9 @@
<ClCompile Include="corlib_native_System_Globalization_CultureInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_Globalization_DateTimeFormat.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_Math.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
80 changes: 79 additions & 1 deletion src/CLR/CorLib/corlib_native.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,53 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
Library_corlib_native_System_Convert::FromBase64CharArray___STATIC__SZARRAY_U1__SZARRAY_CHAR__I4,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
Library_corlib_native_System_DateTime::_ctor___VOID__I4__I4__I4__I4__I4__I4__I4,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
Library_corlib_native_System_DateTime::get_Day___I4,
Library_corlib_native_System_DateTime::get_DayOfWeek___SystemDayOfWeek,
Library_corlib_native_System_DateTime::get_DayOfYear___I4,
Library_corlib_native_System_DateTime::get_Hour___I4,
NULL,
Library_corlib_native_System_DateTime::get_Millisecond___I4,
Library_corlib_native_System_DateTime::get_Minute___I4,
Library_corlib_native_System_DateTime::get_Month___I4,
Library_corlib_native_System_DateTime::get_Second___I4,
NULL,
NULL,
Library_corlib_native_System_DateTime::get_Year___I4,
NULL,
NULL,
NULL,
NULL,
Library_corlib_native_System_DateTime::DaysInMonth___STATIC__I4__I4__I4,
NULL,
Library_corlib_native_System_DateTime::get_UtcNow___STATIC__SystemDateTime,
Library_corlib_native_System_DateTime::get_Today___STATIC__SystemDateTime,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
Library_corlib_native_System_Diagnostics_Debugger::get_IsAttached___STATIC__BOOLEAN,
Library_corlib_native_System_Diagnostics_Debugger::Break___STATIC__VOID,
NULL,
Expand All @@ -317,8 +364,38 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
Library_corlib_native_System_Globalization_CultureInfo::get_CurrentUICultureInternal___STATIC__SystemGlobalizationCultureInfo,
Library_corlib_native_System_Globalization_CultureInfo::set_CurrentUICultureInternal___STATIC__VOID__SystemGlobalizationCultureInfo,
Library_corlib_native_System_Globalization_DateTimeFormat::FormatDigits___STATIC__STRING__I4__I4,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
Expand Down Expand Up @@ -823,6 +900,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =
{
"mscorlib",
0x3B1E14F1,
0x7D73728E,
method_lookup
};

Loading

0 comments on commit 07d58a3

Please sign in to comment.