From 84e5dc7c46aeba8d64e78a2f071dcc760d2c754b Mon Sep 17 00:00:00 2001 From: Marc Sallin Date: Fri, 10 Apr 2015 22:36:47 +0200 Subject: [PATCH 1/5] Added Build Configurations for .Net 4.0 and .Net 4.5 --- .../SQLite.CodeFirst.Console.csproj | 4 +- SQLite.CodeFirst.sln | 30 +++++++++----- SQLite.CodeFirst/SQLite.CodeFirst.csproj | 41 ++++++++++++++++--- .../SQLite.CodeFirst.csproj.nuspec | 3 +- 4 files changed, 59 insertions(+), 19 deletions(-) diff --git a/SQLite.CodeFirst.Console/SQLite.CodeFirst.Console.csproj b/SQLite.CodeFirst.Console/SQLite.CodeFirst.Console.csproj index 5b38a4a..4aa8b42 100644 --- a/SQLite.CodeFirst.Console/SQLite.CodeFirst.Console.csproj +++ b/SQLite.CodeFirst.Console/SQLite.CodeFirst.Console.csproj @@ -16,7 +16,7 @@ ..\ true - + AnyCPU true full @@ -26,7 +26,7 @@ prompt 4 - + AnyCPU pdbonly true diff --git a/SQLite.CodeFirst.sln b/SQLite.CodeFirst.sln index b0b52ac..3fbd5ed 100644 --- a/SQLite.CodeFirst.sln +++ b/SQLite.CodeFirst.sln @@ -21,18 +21,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{7031BD3C EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug-40|Any CPU = Debug-40|Any CPU + Debug-45|Any CPU = Debug-45|Any CPU + Release-40|Any CPU = Release-40|Any CPU + Release-45|Any CPU = Release-45|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50A32FE4-0E13-4213-A373-72523CDF34D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50A32FE4-0E13-4213-A373-72523CDF34D9}.Release|Any CPU.Build.0 = Release|Any CPU - {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release|Any CPU.Build.0 = Release|Any CPU + {50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug-40|Any CPU.ActiveCfg = Debug-40|Any CPU + {50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug-40|Any CPU.Build.0 = Debug-40|Any CPU + {50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug-45|Any CPU.ActiveCfg = Debug-45|Any CPU + {50A32FE4-0E13-4213-A373-72523CDF34D9}.Debug-45|Any CPU.Build.0 = Debug-45|Any CPU + {50A32FE4-0E13-4213-A373-72523CDF34D9}.Release-40|Any CPU.ActiveCfg = Release-40|Any CPU + {50A32FE4-0E13-4213-A373-72523CDF34D9}.Release-40|Any CPU.Build.0 = Release-40|Any CPU + {50A32FE4-0E13-4213-A373-72523CDF34D9}.Release-45|Any CPU.ActiveCfg = Release-45|Any CPU + {50A32FE4-0E13-4213-A373-72523CDF34D9}.Release-45|Any CPU.Build.0 = Release-45|Any CPU + {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug-40|Any CPU.ActiveCfg = Debug-40|Any CPU + {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug-40|Any CPU.Build.0 = Debug-40|Any CPU + {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug-45|Any CPU.ActiveCfg = Debug-45|Any CPU + {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Debug-45|Any CPU.Build.0 = Debug-45|Any CPU + {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release-40|Any CPU.ActiveCfg = Release-40|Any CPU + {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release-40|Any CPU.Build.0 = Release-40|Any CPU + {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release-45|Any CPU.ActiveCfg = Release-45|Any CPU + {DEDABD86-6EA0-4673-A858-A4F71958F51D}.Release-45|Any CPU.Build.0 = Release-45|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SQLite.CodeFirst/SQLite.CodeFirst.csproj b/SQLite.CodeFirst/SQLite.CodeFirst.csproj index 188c83a..e0de474 100644 --- a/SQLite.CodeFirst/SQLite.CodeFirst.csproj +++ b/SQLite.CodeFirst/SQLite.CodeFirst.csproj @@ -9,7 +9,6 @@ Properties SQLite.CodeFirst SQLite.CodeFirst - v4.5.2 512 true b4e826ae @@ -17,32 +16,62 @@ true - + AnyCPU true full false - bin\Debug\ + bin\Debug-45\ DEBUG;TRACE prompt 4 + v4.5 - + AnyCPU pdbonly true - bin\Release\ + bin\Release-45\ TRACE prompt 4 + v4.5 - + + true + bin\Debug-40\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + v4.0 + bin\Debug-40\ + + + bin\Release-40\ + TRACE + true + pdbonly + AnyCPU + prompt + v4.0 + MinimumRecommendedRules.ruleset + + + + ..\packages\EntityFramework.6.1.2\lib\net40\EntityFramework.dll + + + ..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll + + diff --git a/SQLite.CodeFirst/SQLite.CodeFirst.csproj.nuspec b/SQLite.CodeFirst/SQLite.CodeFirst.csproj.nuspec index d8f0de6..67468dc 100644 --- a/SQLite.CodeFirst/SQLite.CodeFirst.csproj.nuspec +++ b/SQLite.CodeFirst/SQLite.CodeFirst.csproj.nuspec @@ -23,6 +23,7 @@ - + + \ No newline at end of file From bb3cabaa864860ce82e80d62c89b11c1aba055ed Mon Sep 17 00:00:00 2001 From: Marc Sallin Date: Sun, 12 Apr 2015 12:05:18 +0200 Subject: [PATCH 2/5] Added BuildAllConfigurations.proj --- BuildAllConfigurations.proj | 24 +++++++++++++ SQLite.CodeFirst.sln | 5 +++ SQLite.CodeFirst/SQLite.CodeFirst.csproj | 46 ++++++++++++------------ 3 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 BuildAllConfigurations.proj diff --git a/BuildAllConfigurations.proj b/BuildAllConfigurations.proj new file mode 100644 index 0000000..3a31715 --- /dev/null +++ b/BuildAllConfigurations.proj @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + %(PlatformList.Identity) + + + + + \ No newline at end of file diff --git a/SQLite.CodeFirst.sln b/SQLite.CodeFirst.sln index 3fbd5ed..d5315e8 100644 --- a/SQLite.CodeFirst.sln +++ b/SQLite.CodeFirst.sln @@ -19,6 +19,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{7031BD3C release_appveyor.yml = release_appveyor.yml EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C3AEBA35-BAAE-43B6-B698-65CD15EB5C2B}" + ProjectSection(SolutionItems) = preProject + BuildAllConfigurations.proj = BuildAllConfigurations.proj + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug-40|Any CPU = Debug-40|Any CPU diff --git a/SQLite.CodeFirst/SQLite.CodeFirst.csproj b/SQLite.CodeFirst/SQLite.CodeFirst.csproj index e0de474..b105234 100644 --- a/SQLite.CodeFirst/SQLite.CodeFirst.csproj +++ b/SQLite.CodeFirst/SQLite.CodeFirst.csproj @@ -2,7 +2,7 @@ - Debug + Debug-45 AnyCPU {50A32FE4-0E13-4213-A373-72523CDF34D9} Library @@ -16,6 +16,18 @@ true + + + true + bin\Debug-40\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + v4.0 + bin\Debug-40\ + AnyCPU true @@ -27,6 +39,17 @@ 4 v4.5 + + + bin\Release-40\ + TRACE + true + pdbonly + AnyCPU + prompt + v4.0 + MinimumRecommendedRules.ruleset + AnyCPU pdbonly @@ -40,27 +63,6 @@ - - true - bin\Debug-40\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - v4.0 - bin\Debug-40\ - - - bin\Release-40\ - TRACE - true - pdbonly - AnyCPU - prompt - v4.0 - MinimumRecommendedRules.ruleset - ..\packages\EntityFramework.6.1.2\lib\net40\EntityFramework.dll From 5ff6c3cf8ccfb62f96ead51515326c9cb3bb8f05 Mon Sep 17 00:00:00 2001 From: Marc Sallin Date: Sun, 12 Apr 2015 17:18:13 +0200 Subject: [PATCH 3/5] Added SQLite.CodeFirst.csproj.nuspec to the top of the solution. --- SQLite.CodeFirst.csproj.nuspec | 29 +++++++++++++++++++++++++++++ SQLite.CodeFirst.sln | 8 +++----- 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 SQLite.CodeFirst.csproj.nuspec diff --git a/SQLite.CodeFirst.csproj.nuspec b/SQLite.CodeFirst.csproj.nuspec new file mode 100644 index 0000000..13538ff --- /dev/null +++ b/SQLite.CodeFirst.csproj.nuspec @@ -0,0 +1,29 @@ + + + + $id$ + $version$ + $author$ + $author$ + https://github.com/msallin/SQLiteCodeFirst/blob/master/LICENSE + https://github.com/msallin/SQLiteCodeFirst + false + $description$ + Creates a SQLite Database from Code, using Entity Framework CodeFirst. + + Copyright (C) Marc Sallin + SQLite EntityFramework EF CodeFirst + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SQLite.CodeFirst.sln b/SQLite.CodeFirst.sln index d5315e8..082337f 100644 --- a/SQLite.CodeFirst.sln +++ b/SQLite.CodeFirst.sln @@ -15,13 +15,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{01B97A EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{7031BD3C-AE76-43CD-91B6-B6BCD823968C}" - ProjectSection(SolutionItems) = preProject - release_appveyor.yml = release_appveyor.yml - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C3AEBA35-BAAE-43B6-B698-65CD15EB5C2B}" ProjectSection(SolutionItems) = preProject BuildAllConfigurations.proj = BuildAllConfigurations.proj + release_appveyor.yml = release_appveyor.yml + ReleaseBuild.proj = ReleaseBuild.proj + SQLite.CodeFirst.csproj.nuspec = SQLite.CodeFirst.csproj.nuspec EndProjectSection EndProject Global From 8248cce8dcd08476daaf95b04ba7958830ea7520 Mon Sep 17 00:00:00 2001 From: Marc Sallin Date: Sun, 12 Apr 2015 18:42:03 +0200 Subject: [PATCH 4/5] Adjusted nuspec-file. --- SQLite.CodeFirst.csproj.nuspec | 29 ---------- SQLite.CodeFirst.sln | 2 - SQLite.CodeFirst/SQLite.CodeFirst.csproj | 54 +++++++------------ .../SQLite.CodeFirst.csproj.nuspec | 6 ++- 4 files changed, 24 insertions(+), 67 deletions(-) delete mode 100644 SQLite.CodeFirst.csproj.nuspec diff --git a/SQLite.CodeFirst.csproj.nuspec b/SQLite.CodeFirst.csproj.nuspec deleted file mode 100644 index 13538ff..0000000 --- a/SQLite.CodeFirst.csproj.nuspec +++ /dev/null @@ -1,29 +0,0 @@ - - - - $id$ - $version$ - $author$ - $author$ - https://github.com/msallin/SQLiteCodeFirst/blob/master/LICENSE - https://github.com/msallin/SQLiteCodeFirst - false - $description$ - Creates a SQLite Database from Code, using Entity Framework CodeFirst. - - Copyright (C) Marc Sallin - SQLite EntityFramework EF CodeFirst - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SQLite.CodeFirst.sln b/SQLite.CodeFirst.sln index 082337f..b32906a 100644 --- a/SQLite.CodeFirst.sln +++ b/SQLite.CodeFirst.sln @@ -18,8 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{7031BD3C ProjectSection(SolutionItems) = preProject BuildAllConfigurations.proj = BuildAllConfigurations.proj release_appveyor.yml = release_appveyor.yml - ReleaseBuild.proj = ReleaseBuild.proj - SQLite.CodeFirst.csproj.nuspec = SQLite.CodeFirst.csproj.nuspec EndProjectSection EndProject Global diff --git a/SQLite.CodeFirst/SQLite.CodeFirst.csproj b/SQLite.CodeFirst/SQLite.CodeFirst.csproj index b105234..4b50c6f 100644 --- a/SQLite.CodeFirst/SQLite.CodeFirst.csproj +++ b/SQLite.CodeFirst/SQLite.CodeFirst.csproj @@ -16,53 +16,46 @@ true - - + + + AnyCPU true - bin\Debug-40\ DEBUG;TRACE full - AnyCPU prompt MinimumRecommendedRules.ruleset + + v4.0 - bin\Debug-40\ + bin\Debug\net40 - AnyCPU - true - full - false - bin\Debug-45\ - DEBUG;TRACE - prompt - 4 - v4.5 + bin\Debug\net45 + v4.5 - - - bin\Release-40\ + + + + AnyCPU TRACE true pdbonly - AnyCPU prompt - v4.0 MinimumRecommendedRules.ruleset + + bin\Release\net40 + v4.0 + - AnyCPU - pdbonly - true - bin\Release-45\ - TRACE - prompt - 4 - v4.5 + bin\Release\net45 + v4.5 + + ..\packages\EntityFramework.6.1.2\lib\net40\EntityFramework.dll @@ -122,11 +115,4 @@ - \ No newline at end of file diff --git a/SQLite.CodeFirst/SQLite.CodeFirst.csproj.nuspec b/SQLite.CodeFirst/SQLite.CodeFirst.csproj.nuspec index 67468dc..f34f826 100644 --- a/SQLite.CodeFirst/SQLite.CodeFirst.csproj.nuspec +++ b/SQLite.CodeFirst/SQLite.CodeFirst.csproj.nuspec @@ -23,7 +23,9 @@ - - + + + + \ No newline at end of file From a48729bf89a1da6f3a504aee7fce9dd2f4996be8 Mon Sep 17 00:00:00 2001 From: Marc Sallin Date: Sun, 12 Apr 2015 20:16:03 +0200 Subject: [PATCH 5/5] Updated release_appveyor.yml --- release_appveyor.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/release_appveyor.yml b/release_appveyor.yml index 46c37bb..7a2d816 100644 --- a/release_appveyor.yml +++ b/release_appveyor.yml @@ -3,7 +3,6 @@ branches: only: - master skip_tags: true -configuration: Release platform: Any CPU assembly_info: patch: true @@ -12,12 +11,24 @@ assembly_info: assembly_file_version: '{version}' assembly_informational_version: '{version}' build: - publish_nuget: true - publish_nuget_symbols: true + project: BuildAllConfigurations.proj verbosity: normal +after_build: +- ps: >- + Write-Host $env:APPVEYOR_BUILD_FOLDER + + cd $env:APPVEYOR_BUILD_FOLDER + + cd '.nuget' + + ./nuget.exe pack '..\SQLite.CodeFirst\SQLite.CodeFirst.csproj' -Properties -Symbols -OutputDirectory '..\SQLite.CodeFirst\bin' artifacts: -- path: SQLite.CodeFirst\bin\*\SQLite.CodeFirst.dll - name: SQLiteCodeFirst +- path: SQLite.CodeFirst\bin\Debug**\SQLite.CodeFirst.* + name: Debug +- path: SQLite.CodeFirst\bin\Release\**\SQLite.CodeFirst.dll + name: Release +- path: SQLite.CodeFirst\bin\*.nupkg + name: NuPkg deploy: - provider: NuGet api_key: @@ -30,7 +41,7 @@ deploy: description: https://www.nuget.org/packages/SQLite.CodeFirst/ auth_token: secure: e3cqaFy9PzI9TAdZJBIDy97Bfbwa7j0EXe2yw7Ev9aJXK0Q+3mnULqb1VU4P7BWR - artifact: SQLiteCodeFirst + artifact: Release draft: true on: branch: master