ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added target framework net6.0-windows

Browse source
This commit is contained in:
Clemens 2021-11-09 19:59:52 +01:00
parent 4717d55084
commit 8c4952f83b
10 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
FileDbCache/WPF/FileDbCache.WPF.csproj
View file

@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks> <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<RootNamespace>MapControl.Caching</RootNamespace> <RootNamespace>MapControl.Caching</RootNamespace>
<AssemblyName>FileDbCache.WPF</AssemblyName> <AssemblyName>FileDbCache.WPF</AssemblyName>
@ -37,12 +36,17 @@
<Compile Include="..\Shared\*" /> <Compile Include="..\Shared\*" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'netcoreapp3.1'"> <ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
<PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
<PackageReference Include="FileDb.Standard" Version="7.4.4" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows' or '$(TargetFramework)'=='netcoreapp3.1'">
<PackageReference Include="System.Runtime.Caching" Version="5.0.0" /> <PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
<PackageReference Include="FileDb.Standard" Version="7.4.4" /> <PackageReference Include="FileDb.Standard" Version="7.4.4" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net462'"> <ItemGroup Condition="'$(TargetFramework)'=='net48' or '$(TargetFramework)'=='net462'">
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<PackageReference Include="FileDb.NET" Version="7.4.3" /> <PackageReference Include="FileDb.NET" Version="7.4.3" />
</ItemGroup> </ItemGroup>

2
MBTiles/UWP/MBTiles.UWP.csproj
View file

@ -57,7 +57,7 @@
<Version>6.2.13</Version> <Version>6.2.13</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Data.SQLite.Core"> <PackageReference Include="System.Data.SQLite.Core">
<Version>1.0.115</Version> <Version>1.0.115.5</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

5
MBTiles/WPF/MBTiles.WPF.csproj
View file

@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks> <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<RootNamespace>MapControl.MBTiles</RootNamespace> <RootNamespace>MapControl.MBTiles</RootNamespace>
<AssemblyName>MBTiles.WPF</AssemblyName> <AssemblyName>MBTiles.WPF</AssemblyName>
@ -38,7 +37,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115" /> <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
MBTiles/WinUI/MBTiles.WinUI.csproj
View file

@ -38,7 +38,7 @@
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5" /> <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.5" /> <PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.5" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.5" /> <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.5" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115" /> <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
MapImages/WPF/MapImages.WPF.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks> <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<RootNamespace>MapControl.Images</RootNamespace> <RootNamespace>MapControl.Images</RootNamespace>
<AssemblyName>MapImages.WPF</AssemblyName> <AssemblyName>MapImages.WPF</AssemblyName>
@ -36,7 +36,7 @@
<Compile Include="..\Shared\*" /> <Compile Include="..\Shared\*" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net462'"> <ItemGroup Condition="'$(TargetFramework)'=='net48' or '$(TargetFramework)'=='net462'">
<Reference Include="System.IO.Compression" /> <Reference Include="System.IO.Compression" />
</ItemGroup> </ItemGroup>

3
MapProjections/WPF/MapProjections.WPF.csproj
View file

@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks> <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<RootNamespace>MapControl.Projections</RootNamespace> <RootNamespace>MapControl.Projections</RootNamespace>
<AssemblyName>MapProjections.WPF</AssemblyName> <AssemblyName>MapProjections.WPF</AssemblyName>

2
SQLiteCache/UWP/SQLiteCache.UWP.csproj
View file

@ -52,7 +52,7 @@
<Version>6.2.13</Version> <Version>6.2.13</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Data.SQLite.Core"> <PackageReference Include="System.Data.SQLite.Core">
<Version>1.0.115</Version> <Version>1.0.115.5</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

13
SQLiteCache/WPF/SQLiteCache.WPF.csproj
View file

@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks> <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<RootNamespace>MapControl.Caching</RootNamespace> <RootNamespace>MapControl.Caching</RootNamespace>
<AssemblyName>SQLiteCache.WPF</AssemblyName> <AssemblyName>SQLiteCache.WPF</AssemblyName>
@ -37,15 +36,19 @@
<Compile Include="..\Shared\*" /> <Compile Include="..\Shared\*" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'netcoreapp3.1'"> <ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
<PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows' or '$(TargetFramework)'=='netcoreapp3.1'">
<PackageReference Include="System.Runtime.Caching" Version="5.0.0" /> <PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net462'"> <ItemGroup Condition="'$(TargetFramework)'=='net48' or '$(TargetFramework)'=='net462'">
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115" /> <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
View file

@ -38,7 +38,7 @@
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5" /> <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.5" /> <PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.5" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.5" /> <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.5" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115" /> <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
SampleApps/WpfApplication/WpfApplication.csproj
View file

@ -31,7 +31,7 @@
<Resource Include="..\Shared\10_535_330.jpg" Link="10_535_330.jpg" /> <Resource Include="..\Shared\10_535_330.jpg" Link="10_535_330.jpg" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'"> <ItemGroup Condition="'$(TargetFramework)'=='net48'">
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
</ItemGroup> </ItemGroup>