mirror of
https://github.com/ClemensFischer/XAML-Map-Control.git
synced 2026-05-07 13:37:47 +00:00
Version 2.5.0:
- moved tile rect calculation from MapBase to TileLayer - added TileLayer.ZoomLevelOffset property - Windows Universal sample application in solution MapControl VS2015
This commit is contained in:
parent
36a8600faf
commit
98cdc95c5d
80 changed files with 16033 additions and 456 deletions
|
|
@ -23,7 +23,7 @@
|
|||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>..\bin\Debug\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG;WINDOWS_RUNTIME</DefineConstants>
|
||||
<DefineConstants>TRACE;DEBUG;NETFX_CORE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
<DebugType>none</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>..\bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE;WINDOWS_RUNTIME</DefineConstants>
|
||||
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
|
|
@ -169,17 +169,16 @@
|
|||
<Link>MapControl.snk</Link>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<TargetPlatform Include="Windows, Version=8.1" />
|
||||
<TargetPlatform Include="WindowsPhoneApp, Version=8.1" />
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<ItemGroup>
|
||||
<Page Include="Themes\Generic.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<TargetPlatform Include="Windows, Version=8.1" />
|
||||
<TargetPlatform Include="WindowsPhoneApp, Version=8.1" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0' ">
|
||||
<VisualStudioVersion>12.0</VisualStudioVersion>
|
||||
</PropertyGroup>
|
||||
|
|
@ -198,8 +197,7 @@
|
|||
</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>copy "$(ProjectDir)MapControl.WinRT.xr.xml" "$(TargetDir)"</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
|
|||
61
MapControl/WinRT/MapControl.WinRT.xr.xml
Normal file
61
MapControl/WinRT/MapControl.WinRT.xr.xml
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Roots>
|
||||
<Roots.RootTypes>
|
||||
<RootType FullName="Windows.UI.Xaml.ResourceDictionary" />
|
||||
<RootType FullName="MapControl.MapItemsControl" />
|
||||
<RootType FullName="Windows.UI.Xaml.Controls.Control">
|
||||
<RootProperty Name="Template" />
|
||||
<RootProperty Name="HorizontalContentAlignment" />
|
||||
<RootProperty Name="VerticalContentAlignment" />
|
||||
<RootProperty Name="Padding" />
|
||||
<RootProperty Name="Foreground" />
|
||||
<RootProperty Name="Background" />
|
||||
</RootType>
|
||||
<RootType FullName="Windows.UI.Xaml.Controls.ItemsControl">
|
||||
<RootProperty Name="ItemsPanel" />
|
||||
</RootType>
|
||||
<RootType FullName="MapControl.MapItem" />
|
||||
<RootType FullName="Windows.UI.Xaml.FrameworkElement">
|
||||
<RootProperty Name="HorizontalAlignment" />
|
||||
<RootProperty Name="VerticalAlignment" />
|
||||
</RootType>
|
||||
<RootType FullName="MapControl.Pushpin" />
|
||||
<RootType FullName="Windows.UI.Xaml.Setter">
|
||||
<RootProperty Name="Property" />
|
||||
<RootProperty Name="Value" />
|
||||
</RootType>
|
||||
<RootType FullName="Windows.UI.Xaml.Controls.ControlTemplate">
|
||||
<RootProperty Name="TargetType" />
|
||||
<RootProperty Name="Template" />
|
||||
</RootType>
|
||||
<RootType FullName="Windows.UI.Xaml.Controls.Grid">
|
||||
<RootProperty Name="RowDefinitions" />
|
||||
<RootProperty Name="Children" />
|
||||
<RootMethod Name="GetRow" />
|
||||
<RootMethod Name="SetRow" />
|
||||
</RootType>
|
||||
<RootType FullName="Windows.UI.Xaml.Controls.RowDefinition">
|
||||
<RootProperty Name="Height" />
|
||||
</RootType>
|
||||
<RootType FullName="Windows.UI.Xaml.Shapes.Rectangle">
|
||||
<RootProperty Name="Fill" />
|
||||
</RootType>
|
||||
<RootType FullName="Windows.UI.Xaml.Shapes.Path">
|
||||
<RootProperty Name="Fill" />
|
||||
<RootProperty Name="Data" />
|
||||
</RootType>
|
||||
<RootType FullName="Windows.UI.Xaml.Controls.ContentPresenter">
|
||||
<RootProperty Name="Content" />
|
||||
<RootProperty Name="ContentTemplate" />
|
||||
<RootProperty Name="Margin" />
|
||||
<RootProperty Name="HorizontalAlignment" />
|
||||
<RootProperty Name="VerticalAlignment" />
|
||||
</RootType>
|
||||
<RootType FullName="Microsoft.Xaml.Tools.DirectUI.ProxyTypes.TemplateBindingExtension" />
|
||||
<RootType FullName="Windows.UI.Xaml.Controls.ItemsPanelTemplate">
|
||||
<RootProperty Name="Template" />
|
||||
</RootType>
|
||||
<RootType FullName="MapControl.MapPanel" />
|
||||
<RootType FullName="Windows.UI.Xaml.Controls.ItemsPresenter" />
|
||||
</Roots.RootTypes>
|
||||
</Roots>
|
||||
|
|
@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
|
|||
[assembly: AssemblyCompany("Clemens Fischer")]
|
||||
[assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyVersion("2.4.12")]
|
||||
[assembly: AssemblyFileVersion("2.4.12")]
|
||||
[assembly: AssemblyVersion("2.5.0")]
|
||||
[assembly: AssemblyFileVersion("2.5.0")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
[assembly: ComVisible(false)]
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
The Visual Studio Project for Windows Runtime resides in a separate folder
|
||||
MapControl/WinRT, because it needs to have its own Themes/Generic.xaml file.
|
||||
Output is generated to ../bin.
|
||||
Output is generated to ../bin.
|
||||
|
||||
This folder also contains the file MapControl.WinRT.xr.xml, which overwrites
|
||||
the generated file in the output folder. This is to remove the XML namespace
|
||||
declaration on the <Roots> element, which prevents a .NET Native build of a
|
||||
Universal Windows App that uses the MapControl.WinRT portable library.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue