Skip to content

Commit 6410ee2

Browse files
anaisbettsanaisbetts
committed
Upgrade to Windows 8.1
1 parent 1a02c44 commit 6410ee2

File tree

5 files changed

+40
-40
lines changed

5 files changed

+40
-40
lines changed

‎MobileSample-WinRT/MobileSample-WinRT.csproj‎

Lines changed: 6 additions & 3 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
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,6 +15,9 @@
1515
<PackageCertificateKeyFile>MobileSample-WinRT_TemporaryKey.pfx</PackageCertificateKeyFile>
1616
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1717
<RestorePackages>true</RestorePackages>
18+
<TargetPlatformVersion>8.1</TargetPlatformVersion>
19+
<MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
20+
<TargetFrameworkVersion />
1821
</PropertyGroup>
1922
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2023
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -152,8 +155,8 @@
152155
<HintPath>..\ext\winrt\Xamarin.Mobile.dll</HintPath>
153156
</Reference>
154157
</ItemGroup>
155-
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
156-
<VisualStudioVersion>11.0</VisualStudioVersion>
158+
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
159+
<VisualStudioVersion>12.0</VisualStudioVersion>
157160
</PropertyGroup>
158161
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
159162
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />

‎MobileSample-WinRT/Package.appxmanifest‎

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
3-
4-
<Identity Name="7f1344c9-a3c3-4726-bc8b-ec8feec7a00c"
5-
Publisher="CN=Paul"
6-
Version="1.0.0.0" />
7-
2+
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
3+
<Identity Name="7f1344c9-a3c3-4726-bc8b-ec8feec7a00c" Publisher="CN=Paul" Version="1.1.0.0" />
84
<Properties>
95
<DisplayName>MobileSample-WinRT</DisplayName>
106
<PublisherDisplayName>Paul</PublisherDisplayName>
117
<Logo>Assets\StoreLogo.png</Logo>
128
</Properties>
13-
149
<Prerequisites>
15-
<OSMinVersion>6.2.1</OSMinVersion>
16-
<OSMaxVersionTested>6.2.1</OSMaxVersionTested>
10+
<OSMinVersion>6.3.0</OSMinVersion>
11+
<OSMaxVersionTested>6.3.0</OSMaxVersionTested>
1712
</Prerequisites>
18-
1913
<Resources>
20-
<Resource Language="x-generate"/>
14+
<Resource Language="x-generate" />
2115
</Resources>
22-
2316
<Applications>
24-
<Application Id="App"
25-
Executable="$targetnametoken$.exe"
26-
EntryPoint="MobileSample_WinRT.App">
27-
<VisualElements
28-
DisplayName="MobileSample-WinRT"
29-
Logo="Assets\Logo.png"
30-
SmallLogo="Assets\SmallLogo.png"
31-
Description="MobileSample-WinRT"
32-
ForegroundText="light"
33-
BackgroundColor="#464646">
34-
<DefaultTile ShowName="allLogos" />
35-
<SplashScreen Image="Assets\SplashScreen.png" />
36-
</VisualElements>
17+
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="MobileSample_WinRT.App">
18+
<m2:VisualElements DisplayName="MobileSample-WinRT" Description="MobileSample-WinRT" BackgroundColor="#464646" ForegroundText="light" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png">
19+
<m2:DefaultTile>
20+
<m2:ShowNameOnTiles>
21+
<m2:ShowOn Tile="square150x150Logo" />
22+
</m2:ShowNameOnTiles>
23+
</m2:DefaultTile>
24+
<m2:SplashScreen Image="Assets\SplashScreen.png" />
25+
</m2:VisualElements>
3726
</Application>
3827
</Applications>
3928
<Capabilities>

‎ReactiveUI.Events/ReactiveUI.Events_WinRT.csproj‎

Lines changed: 8 additions & 6 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
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,6 +16,9 @@
1616
<ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
19+
<TargetPlatformVersion>8.1</TargetPlatformVersion>
20+
<MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
21+
<TargetFrameworkVersion />
1922
</PropertyGroup>
2023
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2124
<DebugSymbols>true</DebugSymbols>
@@ -68,20 +71,19 @@
6871
<Name>ReactiveUI</Name>
6972
</ProjectReference>
7073
</ItemGroup>
71-
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' ">
72-
<VisualStudioVersion>11.0</VisualStudioVersion>
74+
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
75+
<VisualStudioVersion>12.0</VisualStudioVersion>
7376
</PropertyGroup>
7477
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
7578
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
7679
<PropertyGroup>
7780
<PreBuildEvent>%25SystemRoot%25\Microsoft.NET\Framework\v4.0.30319\msbuild.exe /p:Configuration=Release "$(ProjectDir)EventBuilder.csproj"
78-
"$(ProjectDir)EventBuilder.exe" "$(ProjectDir)\WinMetadata.Win80\Windows.Foundation.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Globalization.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Graphics.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Management.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Media.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Networking.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Security.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Storage.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.System.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.UI.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.UI.Xaml.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Web.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.ApplicationModel.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Data.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Devices.winmd" "$(ProjectDir)Events.mustache" &gt; "$(ProjectDir)Events_WinRT.cs"
81+
"$(ProjectDir)EventBuilder.exe" "$(ProjectDir)\WinMetadata.Win81\Windows.Foundation.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.Globalization.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.Graphics.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.Management.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.Media.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.Networking.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.Security.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.Storage.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.System.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.UI.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.UI.Xaml.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.Web.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.ApplicationModel.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.Data.winmd" "$(ProjectDir)\WinMetadata.Win81\Windows.Devices.winmd" "$(ProjectDir)Events.mustache" &gt; "$(ProjectDir)Events_WinRT.cs"
7982
del "$(ProjectDir)EventBuilder.exe"
8083
del "$(ProjectDir)EventBuilder.pdb"
8184
del "$(ProjectDir)Nustache.Core.dll"
8285
del "$(ProjectDir)Mono.Cecil.dll"
83-
del "$(ProjectDir)Mono.Cecil.pdb"
84-
</PreBuildEvent>
86+
del "$(ProjectDir)Mono.Cecil.pdb"</PreBuildEvent>
8587
</PropertyGroup>
8688
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8789
Other similar extension points exist, see Microsoft.Common.targets.

‎ReactiveUI.Mobile/ReactiveUI.Mobile_WinRT.csproj‎

Lines changed: 6 additions & 3 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
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,6 +16,9 @@
1616
<ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
19+
<TargetPlatformVersion>8.1</TargetPlatformVersion>
20+
<MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
21+
<TargetFrameworkVersion />
1922
</PropertyGroup>
2023
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2124
<DebugSymbols>true</DebugSymbols>
@@ -83,8 +86,8 @@
8386
<Name>ReactiveUI</Name>
8487
</ProjectReference>
8588
</ItemGroup>
86-
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
87-
<VisualStudioVersion>11.0</VisualStudioVersion>
89+
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
90+
<VisualStudioVersion>12.0</VisualStudioVersion>
8891
</PropertyGroup>
8992
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
9093
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />

‎ReactiveUI.Platforms/ReactiveUI.Xaml_WinRT.csproj‎

Lines changed: 6 additions & 3 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
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,6 +16,9 @@
1616
<ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
19+
<TargetPlatformVersion>8.1</TargetPlatformVersion>
20+
<MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
21+
<TargetFrameworkVersion />
1922
</PropertyGroup>
2023
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2124
<DebugSymbols>true</DebugSymbols>
@@ -83,8 +86,8 @@
8386
<ItemGroup>
8487
<Folder Include="Properties\" />
8588
</ItemGroup>
86-
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' ">
87-
<VisualStudioVersion>11.0</VisualStudioVersion>
89+
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
90+
<VisualStudioVersion>12.0</VisualStudioVersion>
8891
</PropertyGroup>
8992
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
9093
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />

0 commit comments

Comments
 (0)