Sitelet https://github.com/judero01col/GMap.NET/commit/8f88aa5ca21484d6c5cd31119317acb18f9fde58
Skip to content

Commit 8f88aa5

Browse files
judero01coljudero01col
authored
Revert "Updated dependencies and .net framework 4.8"
1 parent ef6856e commit 8f88aa5

21 files changed

Lines changed: 47 additions & 60 deletions

File tree

‎Demo.Testing/App.config‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
1414
</providers>
1515
</entityFramework>
16-
<runtime>
17-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
18-
<dependentAssembly>
19-
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
20-
<bindingRedirect oldVersion="0.0.0.0-1.0.115.5" newVersion="1.0.115.5" />
21-
</dependentAssembly>
22-
</assemblyBinding>
23-
</runtime>
2416
<system.data>
2517
<DbProviderFactories>
2618
<remove invariant="System.Data.SQLite.EF6" />

‎Demo.Testing/Demo.Testing.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
<Reference Include="System" />
4646
<Reference Include="System.ComponentModel.DataAnnotations" />
4747
<Reference Include="System.Core" />
48-
<Reference Include="System.Data.SQLite, Version=1.0.115.5, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\lib\net46\System.Data.SQLite.dll</HintPath>
48+
<Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net46\System.Data.SQLite.dll</HintPath>
5050
</Reference>
51-
<Reference Include="System.Data.SQLite.EF6, Version=1.0.115.5, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
52-
<HintPath>..\packages\System.Data.SQLite.EF6.1.0.115.5\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
51+
<Reference Include="System.Data.SQLite.EF6, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
52+
<HintPath>..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
5353
</Reference>
54-
<Reference Include="System.Data.SQLite.Linq, Version=1.0.115.5, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
55-
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.115.5\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
54+
<Reference Include="System.Data.SQLite.Linq, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
55+
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
5656
</Reference>
5757
<Reference Include="System.Xml.Linq" />
5858
<Reference Include="System.Data.DataSetExtensions" />
@@ -116,8 +116,8 @@
116116
</PropertyGroup>
117117
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
118118
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
119-
<Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
119+
<Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
120120
</Target>
121121
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
122-
<Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
122+
<Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
123123
</Project>

‎Demo.Testing/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="EntityFramework" version="6.4.4" targetFramework="net48" />
4-
<package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.115.5" targetFramework="net48" />
5-
<package id="System.Data.SQLite" version="1.0.115.5" targetFramework="net48" />
6-
<package id="System.Data.SQLite.Core" version="1.0.115.5" targetFramework="net48" />
7-
<package id="System.Data.SQLite.EF6" version="1.0.115.5" targetFramework="net48" />
8-
<package id="System.Data.SQLite.Linq" version="1.0.115.5" targetFramework="net48" />
4+
<package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net48" />
5+
<package id="System.Data.SQLite" version="1.0.113.7" targetFramework="net48" />
6+
<package id="System.Data.SQLite.Core" version="1.0.113.7" targetFramework="net48" />
7+
<package id="System.Data.SQLite.EF6" version="1.0.113.0" targetFramework="net48" />
8+
<package id="System.Data.SQLite.Linq" version="1.0.113.0" targetFramework="net48" />
99
</packages>

‎Demo/Demo.WindowsForms/Demo.WindowsForms.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AssemblyTitle>Demo.WindowsForms</AssemblyTitle>
55
<Description>Demo for GMap.NET.WindowsForms</Description>
66
<Product>Demo.WindowsForms</Product>
7-
<TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
7+
<TargetFrameworks>net46;net5.0-windows</TargetFrameworks>
88
<UseWindowsForms>true</UseWindowsForms>
99
<OutputType>WinExe</OutputType>
1010
<SignAssembly>True</SignAssembly>
@@ -23,7 +23,7 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="System.Data.SQLite" Version="1.0.115.5" />
26+
<PackageReference Include="System.Data.SQLite" Version="1.0.113.7" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎Demo/Demo.WindowsPresentation/Demo.WindowsPresentation.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AssemblyTitle>Demo.WindowsPresentation</AssemblyTitle>
55
<Description>Demo for GMap.NET.WindowsPresentation</Description>
66
<Product>Demo.WindowsPresentation</Product>
7-
<TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
7+
<TargetFrameworks>net46;net5.0-windows</TargetFrameworks>
88
<UseWPF>true</UseWPF>
99
<OutputType>WinExe</OutputType>
1010
<SignAssembly>True</SignAssembly>

‎GMap.NET/GMap.NET.Core/GMap.NET.Core.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AssemblyTitle>GMap.NET.Core</AssemblyTitle>
77
<RootNamespace>GMap.NET</RootNamespace>
88

9-
<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
9+
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
1010
<DefineConstants>MONO_disabled;SQLite;MySQL_disabled;PostgreSQL_disabled;$(DefineConstants)</DefineConstants>
1111

1212
<PackageReleaseNotes>
@@ -18,18 +18,18 @@ https://github.com/judero01col/GMap.NET/blob/master/README.md#release-notes
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
22-
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
23-
<PackageReference Include="System.Data.SQLite" Version="1.0.115.5" />
21+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
22+
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
23+
<PackageReference Include="System.Data.SQLite" Version="1.0.113.7" />
2424
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
2525
</ItemGroup>
2626

2727
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
2828
<PackageReference Include="System.Data.SqlClient">
29-
<Version>4.8.3</Version>
29+
<Version>4.7.0</Version>
3030
</PackageReference>
3131
<PackageReference Include="System.Security.Principal.Windows">
32-
<Version>5.0.0</Version>
32+
<Version>4.6.0</Version>
3333
</PackageReference>
3434
</ItemGroup>
3535

‎GMap.NET/GMap.NET.Windows/GMap.NET.Windows.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AssemblyTitle>GMap.NET.Windows</AssemblyTitle>
88

99
<IncludeBuildOutput>false</IncludeBuildOutput>
10-
<TargetFrameworks>net48</TargetFrameworks>
10+
<TargetFrameworks>net46</TargetFrameworks>
1111

1212
<PackageReleaseNotes>
1313
Library migrated to .Net Core and published in new individual packages

‎GMap.NET/GMap.NET.WindowsForms/GMap.NET.WindowsForms.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Product>GMap.NET.WindowsForms</Product>
66
<AssemblyTitle>GMap.NET.WindowsForms</AssemblyTitle>
77

8-
<TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
8+
<TargetFrameworks>net46;net5.0-windows</TargetFrameworks>
99
<UseWindowsForms>true</UseWindowsForms>
1010
<DefineConstants>ContinuesMapNo;$(DefineConstants)</DefineConstants>
1111

‎GMap.NET/GMap.NET.WindowsPresentation/GMap.NET.WindowsPresentation.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Product>GMap.NET.WindowsPresentation</Product>
66
<AssemblyTitle>GMap.NET.WindowsPresentation</AssemblyTitle>
77

8-
<TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
8+
<TargetFrameworks>net46;net5.0-windows</TargetFrameworks>
99
<UseWPF>true</UseWPF>
1010

1111
<PackageReleaseNotes>

‎Testing/BigMapMaker/BigMapMaker.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net46;net5.0-windows</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
77
</PropertyGroup>

0 commit comments

Comments
 (0)