Skip to content

Commit 4b5f31d

Browse files
committed
Retarget win8 sample to windows 8.1
1 parent db65460 commit 4b5f31d

31 files changed

+60
-51
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
===== TypeScript Sample: Windows 8 Windows store app =====
1+
===== TypeScript Sample: Windows 8.1 Windows store app =====
22

33
=== Overview ===
44

5-
The encyclopedia includes a complete sample app for a Windows 8 app
5+
The encyclopedia includes a complete sample app for a Windows 8.1 app
66
built using TypeScript. The following features of TypeScript are highlighted:
77
- VS project integration: TypeScript compilation integrated into VS build
88
- Typing WinJS and WinRT: Early work on typing these libraries
99
- Mostly JS in TypeScript: Code is mostly the original JS, with a little
1010
TypeScript
1111

1212
=== Running ===
13-
Open encyclopedia\Encyclopedia.sln in Visual Studio 2012
13+
Open encyclopedia\Encyclopedia.sln in Visual Studio 2013
1414
F5

win8/encyclopedia/Encyclopedia/Encyclopedia.jsproj renamed to win8.1/encyclopedia/Encyclopedia/Encyclopedia.jsproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|AnyCPU">
55
<Configuration>Debug</Configuration>
@@ -42,8 +42,10 @@
4242
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
4343
<PropertyGroup>
4444
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
45-
<TargetPlatformVersion>8.0</TargetPlatformVersion>
45+
<TargetPlatformVersion>8.1</TargetPlatformVersion>
4646
<DefaultLanguage>en-US</DefaultLanguage>
47+
<VisualStudioVersion>12.0</VisualStudioVersion>
48+
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
4749
</PropertyGroup>
4850
<ItemGroup>
4951
<AppxManifest Include="package.appxmanifest">
@@ -71,6 +73,8 @@
7173
<TypeScriptCompile Include="js\itemDetailPage.ts" />
7274
<TypeScriptCompile Include="js\groupedItemsPage.ts" />
7375
<TypeScriptCompile Include="js\topic.ts" />
76+
<TypeScriptCompile Include="js\typings\winjs.d.ts" />
77+
<TypeScriptCompile Include="js\typings\winrt.d.ts" />
7478
<TypeScriptCompile Include="js\win.ts" />
7579
<Content Include="js\groupDetailPage.js">
7680
<DependentUpon>groupDetailPage.ts</DependentUpon>
@@ -95,10 +99,10 @@
9599
</Content>
96100
</ItemGroup>
97101
<ItemGroup>
98-
<SDKReference Include="Microsoft.WinJS.1.0, Version=1.0" />
102+
<SDKReference Include="Microsoft.WinJS.2.0, Version=1.0" />
99103
</ItemGroup>
100104
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
101-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.VisualStudio.$(WMSJSProject).targets" />
105+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.jsproj.targets" />
102106
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
103107
<TypeScriptTarget>ES5</TypeScriptTarget>
104108
<TypeScriptIncludeComments>true</TypeScriptIncludeComments>

win8/encyclopedia/Encyclopedia/default.html renamed to win8.1/encyclopedia/Encyclopedia/default.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<title>Encyclopedia</title>
66

77
<!-- WinJS references -->
8-
<link href="//Microsoft.WinJS.1.0/css/ui-light.css" rel="stylesheet" />
9-
<script src="//Microsoft.WinJS.1.0/js/base.js"></script>
10-
<script src="//Microsoft.WinJS.1.0/js/ui.js"></script>
8+
<link href="//Microsoft.WinJS.2.0/css/ui-light.css" rel="stylesheet" />
9+
<script src="//Microsoft.WinJS.2.0/js/base.js"></script>
10+
<script src="//Microsoft.WinJS.2.0/js/ui.js"></script>
1111

1212
<!-- Encyclopedia references -->
1313
<link href="/css/default.css" rel="stylesheet">

win8/encyclopedia/Encyclopedia/html/groupDetailPage.html renamed to win8.1/encyclopedia/Encyclopedia/html/groupDetailPage.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<title>groupDetailPage</title>
66

77
<!-- WinJS references -->
8-
<link href="//Microsoft.WinJS.1.0/css/ui-light.css" rel="stylesheet">
9-
<script src="//Microsoft.WinJS.1.0/js/base.js"></script>
10-
<script src="//Microsoft.WinJS.1.0/js/ui.js"></script>
8+
<link href="//Microsoft.WinJS.2.0/css/ui-light.css" rel="stylesheet">
9+
<script src="//Microsoft.WinJS.2.0/js/base.js"></script>
10+
<script src="//Microsoft.WinJS.2.0/js/ui.js"></script>
1111

1212
<link href="/css/default.css" rel="stylesheet">
1313
<link href="/css/groupDetailPage.css" rel="stylesheet">

win8/encyclopedia/Encyclopedia/html/groupedItemsPage.html renamed to win8.1/encyclopedia/Encyclopedia/html/groupedItemsPage.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<title>groupedItemsPage</title>
66

77
<!-- WinJS references -->
8-
<link href="//Microsoft.WinJS.1.0/css/ui-light.css" rel="stylesheet" />
9-
<script src="//Microsoft.WinJS.1.0/js/base.js"></script>
10-
<script src="//Microsoft.WinJS.1.0/js/ui.js"></script>
8+
<link href="//Microsoft.WinJS.2.0/css/ui-light.css" rel="stylesheet" />
9+
<script src="//Microsoft.WinJS.2.0/js/base.js"></script>
10+
<script src="//Microsoft.WinJS.2.0/js/ui.js"></script>
1111

1212
<link href="/css/default.css" rel="stylesheet">
1313
<link href="/css/groupedItemsPage.css" rel="stylesheet">

win8/encyclopedia/Encyclopedia/html/itemDetailPage.html renamed to win8.1/encyclopedia/Encyclopedia/html/itemDetailPage.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<title>itemDetailPage</title>
66

77
<!-- WinJS references -->
8-
<link href="//Microsoft.WinJS.1.0/css/ui-light.css" rel="stylesheet" />
9-
<script src="//Microsoft.WinJS.1.0/js/base.js"></script>
10-
<script src="//Microsoft.WinJS.1.0/js/ui.js"></script>
8+
<link href="//Microsoft.WinJS.2.0/css/ui-light.css" rel="stylesheet" />
9+
<script src="//Microsoft.WinJS.2.0/js/base.js"></script>
10+
<script src="//Microsoft.WinJS.2.0/js/ui.js"></script>
1111

1212
<link href="/css/default.css" rel="stylesheet">
1313
<link href="/css/itemDetailPage.css" rel="stylesheet">
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
3+
<Identity Name="55019TS.Encyclopedia" Version="1.1.0.5" Publisher="CN=2D965ED7-3EF5-4803-AEC3-26E173EE9D03" />
4+
<Properties>
5+
<DisplayName>Encyclopedia</DisplayName>
6+
<Description>Encyclopedia</Description>
7+
<PublisherDisplayName>TS</PublisherDisplayName>
8+
<Logo>images\ep-storelogo.png</Logo>
9+
</Properties>
10+
<Prerequisites>
11+
<OSMinVersion>6.3.0</OSMinVersion>
12+
<OSMaxVersionTested>6.3.0</OSMaxVersionTested>
13+
</Prerequisites>
14+
<Resources>
15+
<Resource Language="en-US" />
16+
</Resources>
17+
<Applications>
18+
<Application Id="App" StartPage="default.html">
19+
<Extensions>
20+
<Extension Category="windows.search" StartPage="default.html" />
21+
</Extensions>
22+
<m2:VisualElements DisplayName="Encyclopedia" Description="Encyclopedia" BackgroundColor="#0084FF" ForegroundText="light" ToastCapable="false" Square150x150Logo="images\ep-logo.png" Square30x30Logo="images\ep-logo-small.png">
23+
<m2:DefaultTile Wide310x150Logo="images\ep-widetile.png">
24+
<m2:ShowNameOnTiles>
25+
<m2:ShowOn Tile="square150x150Logo" />
26+
<m2:ShowOn Tile="wide310x150Logo" />
27+
</m2:ShowNameOnTiles>
28+
</m2:DefaultTile>
29+
<m2:SplashScreen BackgroundColor="#FFFFFF" Image="images\ep-splashscreen.png" />
30+
</m2:VisualElements>
31+
</Application>
32+
</Applications>
33+
<Capabilities>
34+
<Capability Name="internetClient" />
35+
<DeviceCapability Name="location" />
36+
</Capabilities>
37+
</Package>

win8/encyclopedia/Encyclopedia/package.appxmanifest

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)