Skip to content

Commit 417aecf

Browse files
author
Marc Sallin
committed
Merge pull request #20 from msallin/Support_Multiple_DotNet_Versions
Support multiple dot net versions
2 parents 3059ff6 + a48729b commit 417aecf

File tree

6 files changed

+105
-39
lines changed

6 files changed

+105
-39
lines changed

‎BuildAllConfigurations.proj‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Rebuild" ToolsVersion="4.0">
3+
<ItemGroup>
4+
<ConfigurationList Include="Debug-40" />
5+
<ConfigurationList Include="Debug-45" />
6+
<ConfigurationList Include="Release-40" />
7+
<ConfigurationList Include="Release-45" />
8+
<PlatformList Include="Any CPU" />
9+
<TargetList Include="Build" />
10+
<ProjectList Include="$(MSBuildProjectDirectory)\SQLite.CodeFirst.sln" />
11+
</ItemGroup>
12+
13+
<Target Name="Rebuild" Outputs="%(PlatformList.Identity)">
14+
<PropertyGroup>
15+
<CurrentPlatform>
16+
%(PlatformList.Identity)
17+
</CurrentPlatform>
18+
</PropertyGroup>
19+
<MSBuild Projects="@(ProjectList)"
20+
Properties="Configuration=%(ConfigurationList.Identity);Platform=$(CurrentPlatform);"
21+
Targets="Rebuild"
22+
SkipNonexistentProjects="true" />
23+
</Target>
24+
</Project>

‎SQLite.CodeFirst.Console/SQLite.CodeFirst.Console.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1717
<RestorePackages>true</RestorePackages>
1818
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-40|AnyCPU' OR '$(Configuration)|$(Platform)' == 'Debug-45|AnyCPU' ">
2020
<PlatformTarget>AnyCPU</PlatformTarget>
2121
<DebugSymbols>true</DebugSymbols>
2222
<DebugType>full</DebugType>
@@ -26,7 +26,7 @@
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
2828
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-40|AnyCPU' OR '$(Configuration)|$(Platform)' == 'Release-45|AnyCPU'">
3030
<PlatformTarget>AnyCPU</PlatformTarget>
3131
<DebugType>pdbonly</DebugType>
3232
<Optimize>true</Optimize>

‎SQLite.CodeFirst.sln‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,34 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{01B97A
1616
EndProject
1717
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{7031BD3C-AE76-43CD-91B6-B6BCD823968C}"
1818
ProjectSection(SolutionItems) = preProject
19+
BuildAllConfigurations.proj = BuildAllConfigurations.proj
1920
release_appveyor.yml = release_appveyor.yml
2021
EndProjectSection
2122
EndProject
2223
Global
2324
GlobalSection(SolutionConfigurationPlatforms) = preSolution
24-
Debug|Any CPU = Debug|Any CPU
25-
Release|Any CPU = Release|Any CPU
25+
Debug-40|Any CPU = Debug-40|Any CPU
26+
Debug-45|Any CPU = Debug-45|Any CPU
27+
Release-40|Any CPU = Release-40|Any CPU
28+
Release-45|Any CPU = Release-45|Any CPU
2629
EndGlobalSection
2730
GlobalSection(ProjectConfigurationPlatforms) = postSolution
28-
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29-
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
30-
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release|Any CPU.ActiveCfg = Release|Any CPU
35-
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug-40|Any CPU.ActiveCfg = Debug-40|Any CPU
32+
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug-40|Any CPU.Build.0 = Debug-40|Any CPU
33+
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug-45|Any CPU.ActiveCfg = Debug-45|Any CPU
34+
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug-45|Any CPU.Build.0 = Debug-45|Any CPU
35+
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Release-40|Any CPU.ActiveCfg = Release-40|Any CPU
36+
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Release-40|Any CPU.Build.0 = Release-40|Any CPU
37+
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Release-45|Any CPU.ActiveCfg = Release-45|Any CPU
38+
{50A32FE4-0E13-4213-A373-72523CDF34D9}.Release-45|Any CPU.Build.0 = Release-45|Any CPU
39+
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug-40|Any CPU.ActiveCfg = Debug-40|Any CPU
40+
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug-40|Any CPU.Build.0 = Debug-40|Any CPU
41+
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug-45|Any CPU.ActiveCfg = Debug-45|Any CPU
42+
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug-45|Any CPU.Build.0 = Debug-45|Any CPU
43+
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release-40|Any CPU.ActiveCfg = Release-40|Any CPU
44+
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release-40|Any CPU.Build.0 = Release-40|Any CPU
45+
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release-45|Any CPU.ActiveCfg = Release-45|Any CPU
46+
{DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release-45|Any CPU.Build.0 = Release-45|Any CPU
3647
EndGlobalSection
3748
GlobalSection(SolutionProperties) = preSolution
3849
HideSolutionNode = FALSE

‎SQLite.CodeFirst/SQLite.CodeFirst.csproj‎

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,71 @@
22
<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>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug-45</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{50A32FE4-0E13-4213-A373-72523CDF34D9}</ProjectGuid>
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>SQLite.CodeFirst</RootNamespace>
1111
<AssemblyName>SQLite.CodeFirst</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1312
<FileAlignment>512</FileAlignment>
1413
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1514
<NuGetPackageImportStamp>b4e826ae</NuGetPackageImportStamp>
1615
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1716
<RestorePackages>true</RestorePackages>
1817
<TargetFrameworkProfile />
1918
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19+
<!-- <Debug Configuration> -->
20+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-40|AnyCPU' OR '$(Configuration)|$(Platform)' == 'Debug-45|AnyCPU'">
2121
<PlatformTarget>AnyCPU</PlatformTarget>
2222
<DebugSymbols>true</DebugSymbols>
23-
<DebugType>full</DebugType>
24-
<Optimize>false</Optimize>
25-
<OutputPath>bin\Debug\</OutputPath>
2623
<DefineConstants>DEBUG;TRACE</DefineConstants>
24+
<DebugType>full</DebugType>
2725
<ErrorReport>prompt</ErrorReport>
28-
<WarningLevel>4</WarningLevel>
26+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
27+
</PropertyGroup>
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-40|AnyCPU'">
29+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
30+
<OutputPath>bin\Debug\net40</OutputPath>
2931
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
32+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-45|AnyCPU' ">
33+
<OutputPath>bin\Debug\net45</OutputPath>
34+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
35+
</PropertyGroup>
36+
<!-- </Debug Configuration> -->
37+
<!-- <Release Configuration> -->
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-40|AnyCPU' OR '$(Configuration)|$(Platform)' == 'Release-45|AnyCPU'">
3139
<PlatformTarget>AnyCPU</PlatformTarget>
32-
<DebugType>pdbonly</DebugType>
33-
<Optimize>true</Optimize>
34-
<OutputPath>bin\Release\</OutputPath>
3540
<DefineConstants>TRACE</DefineConstants>
41+
<Optimize>true</Optimize>
42+
<DebugType>pdbonly</DebugType>
3643
<ErrorReport>prompt</ErrorReport>
37-
<WarningLevel>4</WarningLevel>
44+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
45+
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-40|AnyCPU'">
47+
<OutputPath>bin\Release\net40</OutputPath>
48+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
3849
</PropertyGroup>
50+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-45|AnyCPU' ">
51+
<OutputPath>bin\Release\net45</OutputPath>
52+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
53+
</PropertyGroup>
54+
<!-- </Release Configuration> -->
3955
<PropertyGroup>
4056
<StartupObject />
4157
</PropertyGroup>
42-
<ItemGroup>
58+
<!-- TargetFrameworkVersion depended references -->
59+
<ItemGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-40|AnyCPU' OR '$(Configuration)|$(Platform)' == 'Release-40|AnyCPU'">
60+
<Reference Include="EntityFramework">
61+
<HintPath>..\packages\EntityFramework.6.1.2\lib\net40\EntityFramework.dll</HintPath>
62+
</Reference>
63+
</ItemGroup>
64+
<ItemGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-45|AnyCPU' OR '$(Configuration)|$(Platform)' == 'Release-45|AnyCPU'">
4365
<Reference Include="EntityFramework">
4466
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
4567
</Reference>
68+
</ItemGroup>
69+
<ItemGroup>
4670
<Reference Include="System" />
4771
<Reference Include="System.Core" />
4872
<Reference Include="System.Data" />
@@ -91,11 +115,4 @@
91115
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
92116
</Target>
93117
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
94-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
95-
Other similar extension points exist, see Microsoft.Common.targets.
96-
<Target Name="BeforeBuild">
97-
</Target>
98-
<Target Name="AfterBuild">
99-
</Target>
100-
-->
101118
</Project>

‎SQLite.CodeFirst/SQLite.CodeFirst.csproj.nuspec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
</frameworkAssemblies>
2424
</metadata>
2525
<files>
26-
<file src="bin\$configuration$\$id$.dll" target="lib\net45\SQLite.CodeFirst.dll" />
26+
<!-- Exclude all debug stuff -->
27+
<file src="bin\Debug\**\$id$.dll" target="lib" exclude="bin\Debug\**" />
28+
<!-- Include the release dlls -->
29+
<file src="bin\Release\**\$id$.dll" target="lib" />
2730
</files>
2831
</package>

‎release_appveyor.yml‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ branches:
33
only:
44
- master
55
skip_tags: true
6-
configuration: Release
76
platform: Any CPU
87
assembly_info:
98
patch: true
@@ -12,12 +11,24 @@ assembly_info:
1211
assembly_file_version: '{version}'
1312
assembly_informational_version: '{version}'
1413
build:
15-
publish_nuget: true
16-
publish_nuget_symbols: true
14+
project: BuildAllConfigurations.proj
1715
verbosity: normal
16+
after_build:
17+
- ps: >-
18+
Write-Host $env:APPVEYOR_BUILD_FOLDER
19+
20+
cd $env:APPVEYOR_BUILD_FOLDER
21+
22+
cd '.nuget'
23+
24+
./nuget.exe pack '..\SQLite.CodeFirst\SQLite.CodeFirst.csproj' -Properties -Symbols -OutputDirectory '..\SQLite.CodeFirst\bin'
1825
artifacts:
19-
- path: SQLite.CodeFirst\bin\*\SQLite.CodeFirst.dll
20-
name: SQLiteCodeFirst
26+
- path: SQLite.CodeFirst\bin\Debug**\SQLite.CodeFirst.*
27+
name: Debug
28+
- path: SQLite.CodeFirst\bin\Release\**\SQLite.CodeFirst.dll
29+
name: Release
30+
- path: SQLite.CodeFirst\bin\*.nupkg
31+
name: NuPkg
2132
deploy:
2233
- provider: NuGet
2334
api_key:
@@ -30,7 +41,7 @@ deploy:
3041
description: https://www.nuget.org/packages/SQLite.CodeFirst/
3142
auth_token:
3243
secure: e3cqaFy9PzI9TAdZJBIDy97Bfbwa7j0EXe2yw7Ev9aJXK0Q+3mnULqb1VU4P7BWR
33-
artifact: SQLiteCodeFirst
44+
artifact: Release
3445
draft: true
3546
on:
3647
branch: master

0 commit comments

Comments
 (0)