Skip to content

Commit 44444e9

Browse files
lukespragglukespragg
committed
Update project files and add netstandard
1 parent b921384 commit 44444e9

6 files changed

Lines changed: 51 additions & 24 deletions

File tree

LICENSE.md renamed to LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2017 Oxide Team and Contributors
3+
Copyright (c) 2013-2020 Oxide Team and Contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Oxide.SQLite.sln‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.29613.14
44
MinimumVisualStudioVersion = 15.0
5-
Project("{A368D19F-85B0-4AB4-9782-3FDEA33D33D1}") = "Oxide.SQLite", "src\Oxide.SQLite.csproj", "{C54EA613-C5FD-4ACD-8AC4-79063B08CF5A}"
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oxide.SQLite", "src\Oxide.SQLite.csproj", "{C54EA613-C5FD-4ACD-8AC4-79063B08CF5A}"
66
EndProject
77
Global
88
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,4 +15,10 @@ Global
1515
{C54EA613-C5FD-4ACD-8AC4-79063B08CF5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
1616
{C54EA613-C5FD-4ACD-8AC4-79063B08CF5A}.Release|Any CPU.Build.0 = Release|Any CPU
1717
EndGlobalSection
18+
GlobalSection(SolutionProperties) = preSolution
19+
HideSolutionNode = FALSE
20+
EndGlobalSection
21+
GlobalSection(ExtensibilityGlobals) = postSolution
22+
SolutionGuid = {4296AECA-524F-4C96-BEA4-28EF3AB05B5C}
23+
EndGlobalSection
1824
EndGlobal

‎netfx.props‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<!-- Check and set if a .NET SDK 2.0 project targeting .NET 3.5 or .NET 4.x on Mono using 'dotnet build' -->
4+
<TargetIsMono Condition="('$(TargetFramework)' == 'net35' OR $(TargetFramework.StartsWith('net4'))) AND '$(OS)' == 'Unix'">True</TargetIsMono>
5+
6+
<!-- Look in the standard install locations -->
7+
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'True' AND Exists('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono</BaseFrameworkPathOverrideForMono>
8+
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'True' AND Exists('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono>
9+
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'True' AND Exists('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono>
10+
11+
<!-- If we found Mono reference assemblies, then use them -->
12+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net35'">$(BaseFrameworkPathOverrideForMono)/2.0-api</FrameworkPathOverride>
13+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net40'">$(BaseFrameworkPathOverrideForMono)/4.0-api</FrameworkPathOverride>
14+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net45'">$(BaseFrameworkPathOverrideForMono)/4.5-api</FrameworkPathOverride>
15+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net451'">$(BaseFrameworkPathOverrideForMono)/4.5.1-api</FrameworkPathOverride>
16+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net452'">$(BaseFrameworkPathOverrideForMono)/4.5.2-api</FrameworkPathOverride>
17+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net46'">$(BaseFrameworkPathOverrideForMono)/4.6-api</FrameworkPathOverride>
18+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net461'">$(BaseFrameworkPathOverrideForMono)/4.6.1-api</FrameworkPathOverride>
19+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net462'">$(BaseFrameworkPathOverrideForMono)/4.6.2-api</FrameworkPathOverride>
20+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
21+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net471'">$(BaseFrameworkPathOverrideForMono)/4.7.1-api</FrameworkPathOverride>
22+
<EnableFrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">True</EnableFrameworkPathOverride>
23+
24+
<!-- Workaround for targeting .NET 3.5 with dotnet CLI https://github.com/Microsoft/msbuild/issues/1333#issuecomment-296346352 -->
25+
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35' AND '$(OS)' == 'Windows_NT'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
26+
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35' AND '$(OS)' == 'OSX'">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/2.0-api</FrameworkPathOverride>
27+
28+
<!-- Add the Facades directory. Not sure how else to do this. Necessary at least for .NET 4.5 -->
29+
<AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
30+
</PropertyGroup>
31+
</Project>

‎nuget.config‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<config>
4-
<add key="globalPackagesFolder" value="packages" />
5-
</config>
63
<packageRestore>
74
<add key="enabled" value="True" />
85
<add key="automatic" value="True" />
@@ -11,7 +8,6 @@
118
<add key="All" value="(Aggregate source)" />
129
</activePackageSource>
1310
<packageSources>
14-
<add key="Oxide" value="https://www.myget.org/f/oxide" />
15-
<add key="Local" value="%USERPROFILE%\.nuget\packages" />
11+
<add key="Oxide" value="https://www.myget.org/f/oxide/api/v3/index.json" />
1612
</packageSources>
1713
</configuration>

‎resources/icon.png‎

392 Bytes
Loading

‎src/Oxide.SQLite.csproj‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
4+
<Import Project="..\netfx.props" />
45
<PropertyGroup>
56
<Version>2.0.0</Version>
67
<AssemblyName>Oxide.SQLite</AssemblyName>
7-
<Authors>Oxide and Contributors</Authors>
8+
<Authors>Oxide Team and Contributors</Authors>
9+
<Copyright>(c) 2013-$([System.DateTime]::Now.Year) $(Authors)</Copyright>
810
<Description>SQLite database support for the Oxide modding framework</Description>
911
<RepositoryUrl>https://github.com/OxideMod/Oxide.SQLite</RepositoryUrl>
10-
<PackageLicenseUrl>https://github.com/OxideMod/Oxide.SQLite/blob/develop/LICENSE.md</PackageLicenseUrl>
11-
<PackageProjectUrl>https://github.com/OxideMod/Oxide.SQLite</PackageProjectUrl>
12-
<PackageIconUrl>https://avatars1.githubusercontent.com/u/10712027?s=64</PackageIconUrl>
13-
<Copyright>Copyright (c) 2014-$([System.DateTime]::Now.Year) $(Authors)</Copyright>
14-
<PackageTags>api framework gaming modding database sqlite</PackageTags>
15-
<TargetFrameworks>net461;net45;net40;net35</TargetFrameworks>
12+
<PackageIconUrl>icon.png</PackageIconUrl>
13+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
14+
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
15+
<TargetFrameworks>net35;net40;net45;net46;netstandard2.0;netstandard2.1</TargetFrameworks>
1616
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
17-
<!--
18-
Workaround for targeting net35 with dotnet CLI
19-
https://github.com/Microsoft/msbuild/issues/1333#issuecomment-296346352
20-
-->
21-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35' And '$(OS)' == 'Windows_NT'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
22-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35' And '$(OS)' == 'OSX'">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/2.0-api</FrameworkPathOverride>
23-
<ThisAssemblyNamespace>Oxide.Core.SQLite</ThisAssemblyNamespace>
17+
<NoWarn>NU1701</NoWarn>
2418
</PropertyGroup>
2519
<ItemGroup>
26-
<PackageReference Include="GitInfo" Version="2.0.*" />
2720
<PackageReference Include="Oxide.Core" Version="2.0.*" />
2821
<Reference Include="System.Data.SQLite">
2922
<HintPath>Dependencies\System.Data.SQLite.dll</HintPath>
3023
</Reference>
3124
<Content Include="Dependencies\*.*" PackagePath="lib\any" />
3225
<Content Include="Dependencies\x64\*.*" PackagePath="lib\any\x64" />
3326
<Content Include="Dependencies\x86\*.*" PackagePath="lib\any\x86" />
27+
<None Include="..\resources\icon.png" Pack="true" PackagePath="\" />
3428
</ItemGroup>
3529
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
3630
<Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">

0 commit comments

Comments
 (0)