Merge pull request NETMF#187 from smaillet-ms/Add-WindowsDevices-SDK

Updated SDK installer to include Windows.Devices support
nealjack · Jun 18, 2015 · 8d1e5cf · 8d1e5cf
2 parents 0adaed4 + f2649d9
commit 8d1e5cf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 29 deletions.
diff --git a/Framework/IDE/Targets/v4.4/MicroFramework_v4_4.wixproj b/Framework/IDE/Targets/v4.4/MicroFramework_v4_4.wixproj
@@ -6,8 +6,12 @@
     <!--<DirectoryRef>AssembliesDir_V$(PRODVER_MAJOR)_$(PRODVER_MINOR)</DirectoryRef> -->
     <_curdir>$(BUILD_TREE_CLIENT)\dll</_curdir>
   </PropertyGroup>
-
+
+  <!-- Reference assemblies -->
   <ItemGroup>
+    <WiXComponentFiles Include="$(_curdir)\Windows.Devices.dll" />
+    <WiXComponentFiles Include="$(_curdir)\Windows.Devices.pdb" />
+
     <WiXComponentFiles Include="$(_curdir)\Microsoft.SPOT.Graphics.dll" />
     <WiXComponentFiles Include="$(_curdir)\Microsoft.SPOT.Graphics.pdb" />
 

diff --git a/setup/Features/CorePlatformEndian.wxs b/setup/Features/CorePlatformEndian.wxs
@@ -5,6 +5,7 @@
              Description="A set of managed assemblies that comprise the core of the .NET MF"
              Display="hidden"
              Level="1">
+      <ComponentRef Id="Component_le_Windows.Devices" />
       <ComponentRef Id="Component_le_Microsoft.SPOT.Hardware" />
       <ComponentRef Id="Component_le_Microsoft.SPOT.Hardware.PWM" />
       <ComponentRef Id="Component_le_Microsoft.SPOT.Hardware.SerialPort" />
@@ -47,6 +48,7 @@
              Description="A set of managed assemblies that comprise the core of the .NET MF"
              Display="hidden"
              Level="1">
+      <ComponentRef Id="Component_be_Windows.Devices" />
       <ComponentRef Id="Component_be_Microsoft.SPOT.Hardware"/>
       <ComponentRef Id="Component_be_Microsoft.SPOT.Hardware.PWM" />
       <ComponentRef Id="Component_be_Microsoft.SPOT.Hardware.SerialPort"/>
@@ -81,5 +83,5 @@
       <ComponentRef Id="Component_be_Microsoft.SPOT.Wireless.IEEE_802_15_4.Phy" />
     </Feature>
 
-  </Fragment>  
+  </Fragment>
 </Wix>
diff --git a/setup/Include/mergecrt.wxs b/setup/Include/mergecrt.wxs
@@ -1,20 +1,12 @@
 <?xml version="1.0"?>
 <Include>
     <DirectoryRef Id="TARGETDIR">
-        <Merge Id="CRT90"  Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\Microsoft_VC90_CRT_x86.msm" DiskId="1" />
-        <Merge Id="CRT100"  Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\Microsoft_VC100_CRT_x86.msm" DiskId="1" />
-        <Merge Id="CRT110" Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\Microsoft_VC110_CRT_x86.msm" DiskId="1" />
-        <!--Merge Id="CRT Policy" Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\policy_9_0_Microsoft_VC90_CRT_x86.msm" DiskId="1" /-->
-        <Merge Id="ATL90" Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\Microsoft_VC90_ATL_x86.msm" DiskId="1" />
-        <Merge Id="ATL100" Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\Microsoft_VC100_ATL_x86.msm" DiskId="1" />
-        <Merge Id="ATL110" Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\Microsoft_VC110_ATL_x86.msm" DiskId="1" />
-        <!-- Merge Id="ATL Policy" Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\policy_9_0_Microsoft_VC90_ATL_x86.msm" DiskId="1" /-->
-
+        <Merge Id="CRT140" Language="0" SourceFile="$(env.CommonProgramFiles(x86))\Merge Modules\Microsoft_VC140_CRT_x86.msm" DiskId="1" />
+
+        <!-- Debug modules are not redistributable, but are useful during development and early testing -->
         <?if $(var.BuildFlavor) = "Debug"?>
-        <Merge Id="Debug CRT90" Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\Microsoft_VC90_DebugCRT_x86.msm" DiskId="1" />
-        <Merge Id="Debug CRT100" Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\Microsoft_VC100_DebugCRT_x86.msm" DiskId="1" />
-        <Merge Id="Debug CRT110" Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\Microsoft_VC110_DebugCRT_x86.msm" DiskId="1" />
-        <!-- Merge Id="Debug CRT Policy" Language="0" SourceFile="$(env.SPOROOT)\bin\vcmergemodules\policy_9_0_Microsoft_VC90_DebugCRT_x86.msm" DiskId="1" /-->
+        <Merge Id="Debug CRT140" Language="0" SourceFile="$(env.CommonProgramFiles(x86))\Merge Modules\Microsoft_VC140_DebugCRT_x86.msm" DiskId="1" />
+        <!-- Merge Id="Debug CRT Policy" Language="0" SourceFile="$(env.CommonProgramFiles(x86))\Merge Modules\policy_9_0_Microsoft_VC90_DebugCRT_x86.msm" DiskId="1" /-->
         <?endif?>
     </DirectoryRef>
 </Include>
diff --git a/setup/ProductSDK/Product.wxs b/setup/ProductSDK/Product.wxs
@@ -162,23 +162,11 @@
                  TypicalDefault='install'
                  Display='hidden'
              >
-            <MergeRef Id='CRT90' />
-            <MergeRef Id='CRT100' />
-            <MergeRef Id='CRT110' />
-
-            <!--        <MergeRef Id='CRT Policy' /> -->
+            <MergeRef Id='CRT140' />
 
-            <MergeRef Id='ATL90' />
-            <MergeRef Id='ATL100' />
-            <MergeRef Id='ATL110' />
-
             <!--        <MergeRef Id='ATL Policy' /> -->
-
             <?if $(var.BuildFlavor) = "Debug"?>
-            <MergeRef Id='Debug CRT90' />
-            <MergeRef Id='Debug CRT100' />
-            <MergeRef Id='Debug CRT110' />
-
+            <MergeRef Id='Debug CRT140' />            
             <!--        <MergeRef Id='Debug CRT Policy' /> -->
             <?endif?>
         </Feature>