Update nanoCLR project (#542)

nanoframework · Dec 13, 2017 · 880f335 · 880f335
1 parent d1bd5aa
commit 880f335
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 57 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -26,6 +26,7 @@
     - MinSizeRel
 
   environment:
+    APPVEYOR_SAVE_CACHE_ON_ERROR: true
     GNU_GCC_TOOLCHAIN_PATH: 'C:\GNU_Tools_ARM_Embedded\6-2017-q2-update1'
     NINJA_PATH: 'C:\mytools\ninja'
     HEX2DFU_PATH: 'C:\mytools\hex2dfu'
@@ -59,9 +60,9 @@
     fast_finish: true
 
   cache:
-    - '%GNU_GCC_TOOLCHAIN_PATH% -> appveyor.yml'
-    - '%NINJA_PATH% -> appveyor.yml'
-    - '%HEX2DFU_PATH% -> appveyor.yml'
+    - C:\GNU_Tools_ARM_Embedded\6-2017-q2-update1
+    - C:\mytools\ninja
+    - C:\mytools\hex2dfu
 
   install:
     - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
@@ -173,6 +174,7 @@
     - Debug
 
   environment:
+    APPVEYOR_SAVE_CACHE_ON_ERROR: true
     GNU_GCC_TOOLCHAIN_PATH: 'C:\GNU_Tools_ARM_Embedded\6-2017-q2-update1'
     NINJA_PATH: 'C:\mytools\ninja'
     HEX2DFU_PATH: 'C:\mytools\hex2dfu'
@@ -185,35 +187,31 @@
       secure: WOqlCsnwTzfDPJFoNV/h8mEESIpG/9uFn1u6oE8hGZtXwIQQlsY+NyyLt9Y5xoFn
 
     matrix:
-      - BOARD_NAME: 'ST_STM32F4_DISCOVERY'
-        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 -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 -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 -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
-      - BOARD_NAME: 'MBN_QUAIL'
-        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 -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 -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
-        NEEDS_DFU: 'True'
+      # - BOARD_NAME: 'ST_STM32F4_DISCOVERY'
+      #   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 -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 -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 -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
+      # - BOARD_NAME: 'MBN_QUAIL'
+      #   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 -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 -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
+      #   NEEDS_DFU: 'True'
       - BOARD_NAME: 'NANOCLR_WINDOWS'
 
   matrix:
     fast_finish: true
 
-    exclude:
-      - BOARD_NAME: 'NANOCLR_WINDOWS'
-        configuration: Debug
-
   cache:
-    - '%GNU_GCC_TOOLCHAIN_PATH% -> appveyor.yml'
-    - '%NINJA_PATH% -> appveyor.yml'
-    - '%HEX2DFU_PATH% -> appveyor.yml'
+    - C:\GNU_Tools_ARM_Embedded\6-2017-q2-update1
+    - C:\mytools\ninja
+    - C:\mytools\hex2dfu
 
   install:
     - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
@@ -225,7 +223,9 @@
     - ps: |
         If($env:BOARD_NAME -eq "NANOCLR_WINDOWS")
         {
+
           .\install-vsix-appveyor.ps1
+
         }
         Else
         {
@@ -243,7 +243,9 @@
 
         If($env:BOARD_NAME -eq "NANOCLR_WINDOWS")
         {
+
           nuget restore targets\os\win32\nanoCLR.sln
+        
         }
         Else
         {
@@ -271,7 +273,11 @@
 
         If($env:BOARD_NAME -eq "NANOCLR_WINDOWS")
         {
-          msbuild targets\os\win32\nanoCLR.sln /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+          
+          msbuild targets\os\win32\netnf\TestApplication\TestApplication.sln /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+          
+          msbuild targets\os\win32\nanoCLR.sln /p:Configuration=Release /p:Platform=x86 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+        
         }
         Else
         {
@@ -343,6 +349,7 @@
     - MinSizeRel
 
   environment:
+    APPVEYOR_SAVE_CACHE_ON_ERROR: true
     GNU_GCC_TOOLCHAIN_PATH: 'C:\GNU_Tools_ARM_Embedded\6-2017-q2-update1'
     NINJA_PATH: 'C:\mytools\ninja'
     HEX2DFU_PATH: 'C:\mytools\hex2dfu'
@@ -376,9 +383,9 @@
     fast_finish: true
 
   cache:
-    - '%GNU_GCC_TOOLCHAIN_PATH% -> appveyor.yml'
-    - '%NINJA_PATH% -> appveyor.yml'
-    - '%HEX2DFU_PATH% -> appveyor.yml'
+    - C:\GNU_Tools_ARM_Embedded\6-2017-q2-update1
+    - C:\mytools\ninja
+    - C:\mytools\hex2dfu
 
   install:
     - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%

diff --git a/src/PAL/Include/nanoPAL_COM.h b/src/PAL/Include/nanoPAL_COM.h
@@ -10,7 +10,7 @@
 #include <nanoWeak.h>
 #include <nanoHAL_v2.h>
 
-#define COM_MAX_RETRIES  99;
+#define COM_MAX_RETRIES  99
 #define NATIVE_PROFILE_PAL_COM()
 
 

diff --git a/targets/os/win32/nanoCLR.sln b/targets/os/win32/nanoCLR.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.10
+VisualStudioVersion = 15.0.27130.2003
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nanoCLR", "nanoCLR\nanoCLR.vcxproj", "{B5515C8A-B056-4320-8EA4-8CACE21A7D2E}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -290,7 +290,6 @@ Global
 		{247F9798-E240-4D5B-956D-35E5EAD21CE2}.Release|x64.ActiveCfg = Release|Any CPU
 		{247F9798-E240-4D5B-956D-35E5EAD21CE2}.Release|x64.Build.0 = Release|Any CPU
 		{247F9798-E240-4D5B-956D-35E5EAD21CE2}.Release|x86.ActiveCfg = Release|Any CPU
-		{247F9798-E240-4D5B-956D-35E5EAD21CE2}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/targets/os/win32/nanoCLR/CLRStartup.cpp b/targets/os/win32/nanoCLR/CLRStartup.cpp
@@ -140,28 +140,28 @@ struct Settings
 		// just need to update the path on the package folder as the version changes //
 		// ************************************************************************* //
 		vec.push_back(L"-load");
-		vec.push_back(L"..\\packages\\nanoFramework.CoreLibrary.1.0.0-preview027\\lib\\mscorlib.pe");
+		vec.push_back(L"..\\packages\\nanoFramework.CoreLibrary.1.0.0-preview038\\lib\\mscorlib.pe");
 
 		// grab Windows.Devices.Gpio.pe from the packages folder (it has to be there because the NF.TestApplication has just build)
 		// ************************************************************************* //
 		// just need to update the path on the package folder as the version changes //
 		// ************************************************************************* //
 		vec.push_back(L"-load");
-		vec.push_back(L"..\\packages\\nanoFramework.Windows.Devices.Gpio.1.0.0-preview023\\lib\\Windows.Devices.Gpio.pe");
+		vec.push_back(L"..\\packages\\nanoFramework.Windows.Devices.Gpio.1.0.0-preview164\\lib\\Windows.Devices.Gpio.pe");
 
 		// grab nanoFramework.Runtime.Events.pe from the packages folder (it has to be there because the NF.TestApplication has just build)
 		// ************************************************************************* //
 		// just need to update the path on the package folder as the version changes //
 		// ************************************************************************* //
 		vec.push_back(L"-load");
-		vec.push_back(L"..\\packages\\nanoFramework.Runtime.Events.1.0.0-preview014\\lib\\nanoFramework.Runtime.Events.pe");
+		vec.push_back(L"..\\packages\\nanoFramework.Runtime.Events.1.0.0-preview165\\lib\\nanoFramework.Runtime.Events.pe");
 
 		// grab Windows.Devices.Spi.pe from the packages folder (it has to be there because the NF.TestApplication has just build)
 		// ************************************************************************* //
 		// just need to update the path on the package folder as the version changes //
 		// ************************************************************************* //
 		vec.push_back(L"-load");
-		vec.push_back(L"..\\packages\\nanoFramework.Windows.Devices.Spi.1.0.0-preview015\\lib\\Windows.Devices.Spi.pe");
+		vec.push_back(L"..\\packages\\nanoFramework.Windows.Devices.Spi.1.0.0-preview164\\lib\\Windows.Devices.Spi.pe");
 
 
         //vec.push_back(L"-load");

diff --git a/targets/os/win32/nanoCLR/nanoCLR.vcxproj b/targets/os/win32/nanoCLR/nanoCLR.vcxproj
@@ -126,7 +126,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;VERSION_MAJOR=0;VERSION_MINOR=0;VERSION_BUILD=0;VERSION_REVISION=0;OEMSYSTEMINFOSTRING="WIN_32";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..\Include;..\..\..\..\src\CLR\Include;..\..\..\..\src\HAL\Include;..\..\..\..\src\PAL\Include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\Include;..\..\..\..\src\CLR\Include;..\..\..\..\src\HAL\Include;..\..\..\..\src\PAL\Include;nanoFramework.Runtime.Events</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/targets/os/win32/netnf/TestApplication/NF.TestApplication.nfproj b/targets/os/win32/netnf/TestApplication/NF.TestApplication.nfproj
@@ -7,13 +7,14 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectGuid>247f9798-e240-4d5b-956d-35e5ead21ce2</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>
     <RootNamespace>TestApplication</RootNamespace>
     <AssemblyName>TestApplication</AssemblyName>
-    <NFTargetVersion>v1.0</NFTargetVersion>
+    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
     <Name>TestApplication</Name>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
@@ -22,23 +23,23 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="mscorlib, Version=1.0.0.27, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview027\lib\mscorlib.dll</HintPath>
+    <Reference Include="mscorlib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview038\lib\mscorlib.dll</HintPath>
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
     </Reference>
-    <Reference Include="nanoFramework.Runtime.Events, Version=1.0.0.14, Culture=neutral, PublicKeyToken=72027bbd7f714be2">
-      <HintPath>..\..\packages\nanoFramework.Runtime.Events.1.0.0-preview014\lib\nanoFramework.Runtime.Events.dll</HintPath>
+    <Reference Include="nanoFramework.Runtime.Events, Version=1.0.0.0, Culture=neutral, PublicKeyToken=72027bbd7f714be2">
+      <HintPath>..\..\packages\nanoFramework.Runtime.Events.1.0.0-preview165\lib\nanoFramework.Runtime.Events.dll</HintPath>
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
     </Reference>
-    <Reference Include="Windows.Devices.Gpio, Version=1.0.0.23, Culture=neutral, PublicKeyToken=6df87852110734f7">
-      <HintPath>..\..\packages\nanoFramework.Windows.Devices.Gpio.1.0.0-preview023\lib\Windows.Devices.Gpio.dll</HintPath>
+    <Reference Include="Windows.Devices.Gpio, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6df87852110734f7">
+      <HintPath>..\..\packages\nanoFramework.Windows.Devices.Gpio.1.0.0-preview164\lib\Windows.Devices.Gpio.dll</HintPath>
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
     </Reference>
-    <Reference Include="Windows.Devices.Spi, Version=1.0.0.15, Culture=neutral, PublicKeyToken=6df87852110734f7">
-      <HintPath>..\..\packages\nanoFramework.Windows.Devices.Spi.1.0.0-preview015\lib\Windows.Devices.Spi.dll</HintPath>
+    <Reference Include="Windows.Devices.Spi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6df87852110734f7">
+      <HintPath>..\..\packages\nanoFramework.Windows.Devices.Spi.1.0.0-preview164\lib\Windows.Devices.Spi.dll</HintPath>
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
     </Reference>

diff --git a/targets/os/win32/netnf/TestApplication/TestApplication.sln b/targets/os/win32/netnf/TestApplication/TestApplication.sln
@@ -1,22 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+VisualStudioVersion = 15.0.27130.2003
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NF.TestApplication", "NF.TestApplication.nfproj", "{407043B5-F029-46BC-AABA-3CFB4BC510A8}"
+Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NF.TestApplication", "NF.TestApplication.nfproj", "{247F9798-E240-4D5B-956D-35E5EAD21CE2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{407043B5-F029-46BC-AABA-3CFB4BC510A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{407043B5-F029-46BC-AABA-3CFB4BC510A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{407043B5-F029-46BC-AABA-3CFB4BC510A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{407043B5-F029-46BC-AABA-3CFB4BC510A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{247F9798-E240-4D5B-956D-35E5EAD21CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{247F9798-E240-4D5B-956D-35E5EAD21CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{247F9798-E240-4D5B-956D-35E5EAD21CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{247F9798-E240-4D5B-956D-35E5EAD21CE2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {62117BDC-3FD8-42D4-9171-A4B4F12F46BB}
+	EndGlobalSection
 EndGlobal
diff --git a/targets/os/win32/netnf/TestApplication/packages.config b/targets/os/win32/netnf/TestApplication/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="nanoFramework.CoreLibrary" version="1.0.0-preview027" targetFramework="net46" />
-  <package id="nanoFramework.Runtime.Events" version="1.0.0-preview014" targetFramework="net46" />
-  <package id="nanoFramework.Windows.Devices.Gpio" version="1.0.0-preview023" targetFramework="net46" />
-  <package id="nanoFramework.Windows.Devices.Spi" version="1.0.0-preview015" targetFramework="net46" />
+  <package id="nanoFramework.CoreLibrary" version="1.0.0-preview038" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.Runtime.Events" version="1.0.0-preview165" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.Windows.Devices.Gpio" version="1.0.0-preview164" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.Windows.Devices.Spi" version="1.0.0-preview164" targetFramework="netnanoframework10" />
 </packages>