Merge branch 'master' of github.com:Microsoft/kindscript-microbit

README.md

@@ -11,4 +11,14 @@ Please follow instructions at https://github.com/Microsoft/pxt#running-a-target-
 
 ## Universal Windows App
 
-Open the ``win10/app.sln`` solution with Visual Studio 2015 Update 2 or higher to build it.
+The Windows 10 app is a [Universal Windows Hosted Web App](https://microsoftedge.github.io/WebAppsDocs/en-US/win10/CreateHWA.htm)
+that wraps codemicrobit.com and provides additional features.
+
+### Sideloading
+
+Find the latest build under ``win10/app/AppPackages/latest`` and run the ``Add-AppDevPackage.ps1`` PowerShell script.
+
+### Building
+
+* Install Visual Studio 2015 Update 2 or higher. Make sure the Windows 10 templates are installed.
+* open the ``win10/app.sln`` solution and launch the ``codemicrobit`` project.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-microbit",
-  "version": "0.2.47",
+  "version": "0.2.48",
   "description": "BBC micro:bit target for PXT",
   "keywords": [
     "JavaScript",
@@ -29,6 +29,6 @@
     "typescript": "^1.8.7"
   },
   "dependencies": {
-    "pxt-core": "0.2.49"
+    "pxt-core": "0.2.50"
   }
 }

pxtarget.json

@@ -69,9 +69,9 @@
     },
     "appTheme": {
         "logoUrl": "https://www.microbit.co.uk/",
-        "logo": "./logo.svg",
+        "logo": "./static/logo.svg",
-        "portraitLogo":"./portraitlogo.svg",
+        "portraitLogo":"./static/portraitlogo.svg",
-        "footerLogo": "./footerlogo.svg",
+        "footerLogo": "./static/footerlogo.svg",
         "homeUrl": "https://codemicrobit.com/",
         "embedUrl": "https://codemicrobit.com/",
         "koduUrl": "https://www.kodugamelab.com/bbc-microbit/",

win10/app.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "app", "app\app.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
+Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "codemicrobit", "app\codemicrobit.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

win10/app/BundleArtifacts/neutral.txt

@@ -0,0 +1 @@
+MainPackage=C:\gh\pxt-microbit\win10\app\bin\Debug\codemicrobit_0.1.2.0_AnyCPU_Debug.appx

win10/app/codemicrobit.jsproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|AnyCPU">
@@ -53,9 +53,10 @@
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>$(VersionNumberMajor).$(VersionNumberMinor)</MinimumVisualStudioVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
-    
     <PackageCertificateKeyFile>pxtwinapp_TemporaryKey.pfx</PackageCertificateKeyFile>
-    
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxBundle>Always</AppxBundle>
+    <AppxBundlePlatforms>neutral</AppxBundlePlatforms>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="package.appxmanifest">
@@ -71,9 +72,7 @@
     <Content Include="images\Square44x44Logo.targetsize-24_altform-unplated.png" />
     <Content Include="images\StoreLogo.png" />
     <Content Include="images\Wide310x150Logo.scale-200.png" />
-    
     <None Include="pxtwinapp_TemporaryKey.pfx" />
-    
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
   <!-- To modify your build process, add your task inside one of the targets below then uncomment

win10/app/package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="39122940-ab16-4cd4-a0ce-79a3eb863ecf" Version="0.1.0.0" Publisher="CN=jhalleux" />
+  <Identity Name="39122940-ab16-4cd4-a0ce-79a3eb863ecf" Version="0.1.2.0" Publisher="CN=jhalleux" />
   <mp:PhoneIdentity PhoneProductId="39122940-ab16-4cd4-a0ce-79a3eb863ecf" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>codemicrobitapp</DisplayName>